1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

9713 Commits

Author SHA1 Message Date
rxu
f1d5005797 [ticket/9613] Implement a load switch for unread posts search feature.
Since unread posts search can produce a high server load in certain
circumstances, we implement a switch for ACP "Load settings" to have an option
to disable this type of search.

PHPBB3-9613
2010-08-29 16:09:09 +02:00
Andreas Fischer
dbe8fb6488 Merge branch 'ticket/rxu/9117' into develop-olympus
* ticket/rxu/9117:
  [ticket/9117] Wrong redirection after login.
2010-08-28 23:25:30 +02:00
Andreas Fischer
098ff47602 Merge branch 'ticket/cs278/7369' into develop-olympus
* ticket/cs278/7369:
  [ticket/7369] CPF date should always render the users selection.
2010-08-28 23:25:21 +02:00
Andreas Fischer
250c04c8d5 Merge branch 'ticket/nickvergessen/7296' into develop-olympus
* ticket/nickvergessen/7296:
  [ticket/7296] Exporting styles to tar creates corrupted archives.
2010-08-28 23:25:14 +02:00
Andreas Fischer
dfd3c4a5df Merge branch 'ticket/nickvergessen/9519' into develop-olympus
* ticket/nickvergessen/9519:
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
2010-08-28 23:25:05 +02:00
Andreas Fischer
3c02a1cff7 Merge branch 'ticket/jellydoughnut/9772' into develop-olympus
* ticket/jellydoughnut/9772:
  [ticket/9772] Unify permissions for sending email when board_email_form is off
2010-08-28 23:24:55 +02:00
rxu
c71236ff4d [ticket/9117] Wrong redirection after login.
Go easy way for now - just place S_LOGIN_REDIRECT before S_HIDDEN_FIELDS so
the last value override the previous one.

PHPBB3-9117
2010-08-28 23:16:00 +02:00
Josh Woody
2a59e6d486 [ticket/9772] Unify permissions for sending email when board_email_form is off
Sending email via memberlist.php was limited to users having u_sendemail. When
board_email_form is disabled, no such requirement was enforced.  This is now
changed.

PHPBB3-9772
2010-08-28 15:49:47 -05:00
Chris Smith
50c6af0216 [ticket/7369] CPF date should always render the users selection.
CPF render code was incorrectly adding the users timezone offset instead
of removing it to compensate for the addition made in user::format_date().

PHPBB3-7369
2010-08-23 06:24:13 +01:00
Andreas Fischer
cd46b39967 Merge branch 'ticket/jellydoughnut/9646' into develop-olympus
* ticket/jellydoughnut/9646:
  [ticket/9646] Honor CSS comments in @import statements
2010-08-22 21:50:17 +02:00
Chris Smith
e4a1f08364 Merge branch 'ticket/nickvergessen/7260' into develop-olympus
* ticket/nickvergessen/7260:
  [ticket/7260] Don't delete poll if one exists and editing user lacks permission
2010-08-22 19:39:46 +01:00
Joas Schilling
aa4519fb44 [ticket/7260] Don't delete poll if one exists and editing user lacks permission
PHPBB3-7260
2010-08-22 19:30:43 +01:00
Joas Schilling
3cbcff56b2 [ticket/7296] Exporting styles to tar creates corrupted archives.
Add the folders to the archive before putting the files inside, seems to break
the tar-archives.

PHPBB3-7296
2010-08-22 11:16:19 -04:00
Andreas Fischer
9731f2492f Merge branch 'ticket/nickvergessen/7716' into develop-olympus
* ticket/nickvergessen/7716:
  [ticket/7716] Data too long for column 'message_subject'
2010-08-21 21:27:07 +02:00
Andreas Fischer
32bffe1a32 Revert "[ticket/7716] Data too long for column 'message_subject'"
This reverts commit 91a60aa878e703ff9af714e0316828216d3dcfa3.
2010-08-21 21:25:34 +02:00
Andreas Fischer
7474b69175 Merge branch 'ticket/nickvergessen/7716' into develop-olympus
* ticket/nickvergessen/7716:
  [ticket/7716] Data too long for column 'message_subject'
2010-08-21 21:19:12 +02:00
Joas Schilling
2455a744e6 [ticket/7716] Data too long for column 'message_subject'
PHPBB3-7716
2010-08-21 15:14:16 -04:00
Andreas Fischer
81db8a8644 Merge branch 'ticket/nickvergessen/9104' into develop-olympus
* ticket/nickvergessen/9104:
  [ticket/9104] Safari does not display box headers correctly in the ACP.
2010-08-21 20:32:45 +02:00
Andreas Fischer
4222510e9c Merge branch 'ticket/cs278/7332' into develop-olympus
* ticket/cs278/7332:
  [ticket/7332] Redirect users back to post details when performing actions.
  [ticket/7332] Collapse post details content down to a maximum of 300px heigh
2010-08-21 20:30:33 +02:00
Josh Woody
c3a5fd30ee [ticket/9646] Honor CSS comments in @import statements
Add a basic CSS comment parser that allows comments to prevent loading an
@import statement. For simplicity, only whitespace is allowed between /* and
the @import. Also adjust regex to not parse improper quotation marks.

PHPBB3-9646
PHPBB3-8169
2010-08-20 16:02:58 -05:00
Andreas Fischer
bcf4f4fbdf Merge branch 'ticket/cs278/7972' into develop-olympus
* ticket/cs278/7972:
  [ticket/7972] Copying topics in the MCP now indexes the new topic.
2010-08-20 22:25:20 +02:00
Andreas Fischer
34c3732856 Merge branch 'ticket/nickvergessen/9635' into develop-olympus
* ticket/nickvergessen/9635:
  [ticket/9635] Useless parameter $data['post_time'] in function submit_post.
2010-08-20 22:15:15 +02:00
Andreas Fischer
31144ed4c5 Merge branch 'ticket/nickvergessen/9782' into develop-olympus
* ticket/nickvergessen/9782:
  [ticket/9782] Board disable radio set on when server load high
2010-08-20 22:11:04 +02:00
Chris Smith
de8c334aeb Merge branch 'ticket/bantu/9780' into develop-olympus
* ticket/bantu/9780:
  [ticket/9780] Adding unit tests for gen_rand_string().
  [ticket/9780] Add length check back to gen_rand_string().
2010-08-20 20:56:17 +01:00
Andreas Fischer
e09d6c6d71 [ticket/9780] Adding unit tests for gen_rand_string().
PHPBB3-9780
2010-08-20 21:36:56 +02:00
Joas Schilling
d533121741 [ticket/9780] Add length check back to gen_rand_string().
PHPBB3-9780
2010-08-20 20:11:36 +02:00
Chris Smith
b73d45ffc8 [ticket/7972] Copying topics in the MCP now indexes the new topic.
PHPBB3-7972
2010-08-20 13:59:21 -04:00
Joas Schilling
932b35ab7a [ticket/9782] Board disable radio set on when server load high
PHPBB3-9782
2010-08-20 13:41:06 -04:00
Joas Schilling
cc9a1952d9 [ticket/9635] Useless parameter $data['post_time'] in function submit_post.
PHPBB3-9635
2010-08-19 23:48:25 -04:00
Joas Schilling
5e330044b8 [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
In the ACM-Modules we need to check whether the function is loaded, before we
use it, as this is not the case from download/file.php in avatar-mode.

PHPBB3-9519
2010-08-19 12:30:24 -04:00
Chris Smith
0ee49ca432 Merge branch 'ticket/bantu/9777' into develop-olympus
* ticket/bantu/9777:
  [ticket/9777] Print error message in pre-commit hook when php is not installed.
2010-08-19 17:26:35 +01:00
Joas Schilling
44125f5533 [ticket/9104] Safari does not display box headers correctly in the ACP.
PHPBB3-9104
2010-08-19 12:22:18 -04:00
Josh Woody
3eb01d50cb Merge branch 'ticket/bantu/9702' into develop-olympus
* ticket/bantu/9702:
  [ticket/9702] Take user's timezone settings into account when banning Until ->
2010-08-19 10:56:34 -05:00
Josh Woody
f0aaecd6cc Merge branch 'ticket/bantu/9599' into develop-olympus
* ticket/bantu/9599:
  [ticket/9599] Reimplement phpbb_checkdnsrr() function.
  [ticket/9599] Adding tests for phpbb_checkdnsrr().
  [ticket/9599] Adding network function tests.
2010-08-19 10:53:10 -05:00
Josh Woody
6343e67fab Merge branch 'ticket/bantu/9534' into develop-olympus
* ticket/bantu/9534:
  [ticket/9534] Update function documentation for user_ipwhois().
  [ticket/9534] Adding support for IPv6 addresses in user_ipwhois().
2010-08-19 10:48:41 -05:00
Oleg Pudeyev
90d8fc7e86 [ticket/9777] Print error message in pre-commit hook when php is not installed.
PHPBB3-9777
2010-08-19 17:44:54 +02:00
Josh Woody
5eb175cefd Merge branch 'ticket/bantu/9694' into develop-olympus
* ticket/bantu/9694:
  [ticket/9694] Call error_reporting() in download/file.php when in avatar mode.
  [ticket/9694] Make sure string offset 0 exists to avoid E_NOTICE message.
2010-08-19 10:26:49 -05:00
Josh Woody
68744484c8 Merge branch 'ticket/bantu/9167' into develop-olympus
* ticket/bantu/9167:
  [ticket/9167] Detect and remove any dead left over shadow topics on update.
  [ticket/9167] Remove shadow topics from remaining forums when deleting a forum

Conflicts:
	phpBB/install/database_update.php
2010-08-19 10:09:32 -05:00
Joas Schilling
91a60aa878 [ticket/7716] Data too long for column 'message_subject'
PHPBB3-7716
2010-08-19 11:00:42 -04:00
Josh Woody
25c579c00d Merge branch 'ticket/bantu/9612' into develop-olympus
* ticket/bantu/9612:
  [ticket/9612] Introduce new function gen_rand_string_friendly().
2010-08-19 09:11:36 -05:00
Josh Woody
46d2d97a37 Merge branch 'ticket/bantu/9611' into develop-olympus
* ticket/bantu/9611:
  [ticket/9611] Make length of activation keys variable between 6 and 10.
2010-08-19 09:03:45 -05:00
Joas Schilling
89b35f7ab9 [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
PHPBB3-9519
2010-08-13 17:10:35 +02:00
Joas Schilling
884cc2ac9b [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
includes/functions_convert.php and install/install_convert.php tested by Dicky.

PHPBB3-9519
2010-08-13 16:40:56 +02:00
Joas Schilling
4c95ed0eeb [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
acm_memory.php is untested. install/install_convert.php and
includes/functions_convert.php are going to be tested and committed afterwards.

PHPBB3-9519
2010-08-10 16:11:39 +02:00
Andreas Fischer
64e6faa877 Merge branch 'ticket/cs278/9771' into develop-olympus
* ticket/cs278/9771:
  [ticket/9771] Remove query string parameters that have no name.
2010-08-10 16:05:45 +02:00
Andreas Fischer
59a0bcd38f Merge branch 'ticket/cs278/9761' into develop-olympus
* ticket/cs278/9761:
  [ticket/9761] Reworded quote nesting depth ACP option to match the behaviour
2010-08-10 16:05:18 +02:00
Andreas Fischer
d66aadc33f Merge branch 'ticket/cs278/9760' into develop-olympus
* ticket/cs278/9760:
  [ticket/9760] Remove unrestricted wildcards from search terms.
2010-08-10 16:04:49 +02:00
Andreas Fischer
19599b4c69 Merge branch 'ticket/nickvergessen/9743' into develop-olympus
* ticket/nickvergessen/9743:
  [ticket/9743] Fix background of top2-class in prosilver for RTL-languages.
2010-08-10 16:03:56 +02:00
Andreas Fischer
19d9d12339 Merge branch 'ticket/rxu/6747' into develop-olympus
* ticket/rxu/6747:
  [ticket/9747] Improve word censor.
2010-08-10 16:00:28 +02:00
Andreas Fischer
1778b53f12 Merge branch 'task/cs278/git-tools' into develop-olympus
* task/cs278/git-tools:
  [task/git-tools] Ignore git commit message comments
  [task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
  [task/git-tools] Vastly expanded commit-msg hook.
  [task/git-tools] Beginnings of a syntax checking hook.
  [task/git-tools] Append ticket identifier to commit message prior to editing.
  [task/git-tools] add install and uninstall scripts for hooks
  [task/git-tools] move ticket id appending to commit-msg hook
  [task/git-tools] append ticket id to git log message
2010-08-10 15:50:53 +02:00