aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.Joas Schilling2010-07-081-0/+1
| | | | PHPBB3-9677
* Merge branch 'ticket/p/9570' into develop-olympusAndreas Fischer2010-07-082-2/+3
|\ | | | | | | | | * ticket/p/9570: [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
| * [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.Oleg Pudeyev2010-07-062-2/+3
| | | | | | | | PHPBB3-9570
* | Merge branch 'ticket/p/9589' into develop-olympusAndreas Fischer2010-07-081-0/+70
|\ \ | | | | | | | | | | | | * ticket/p/9589: [ticket/9589] Added sample nginx configuration file for phpbb.
| * | [ticket/9589] Added sample nginx configuration file for phpbb.Oleg Pudeyev2010-06-101-0/+70
| | | | | | | | | | | | PHPBB3-9589
* | | Merge branch 'ticket/bantu/9451' into develop-olympusAndreas Fischer2010-07-083-4/+7
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9451: [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
| * | | [ticket/9451] Add optional $can_upload parameter to avatar_process_user().Thatbitextra2010-07-073-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid unnecessary overhead in avatar_process_user() by optionally passing in the value of $can_upload. PHPBB3-9451
* | | | Merge branch 'ticket/jellydoughnut/9690' into develop-olympusAndreas Fischer2010-07-082-0/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9690: [ticket/9690] Add forthcoming Bing Bot to list of recognized bots
| * | | | [ticket/9690] Add forthcoming Bing Bot to list of recognized botsJosh Woody2010-07-072-0/+53
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Microsoft will rename MSN Bot to Bing Bot later this year, and change its user agent. This updates phpBB to be aware of Bing Bot PHPBB3-9690
* | | | Merge branch 'ticket/evil3/9704' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/evil3/9704: [ticket/9704] Fix minor typo in coding guidelines.
| * | | | [ticket/9704] Fix minor typo in coding guidelines.Igor Wiedler2010-07-081-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-9704
* | | | Merge branch 'ticket/nickvergessen/9578' into develop-olympusAndreas Fischer2010-07-082-1/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9578: [ticket/9578] ACP Posting tab is missing "Post settings" module.
| * | | | [ticket/9578] ACP Posting tab is missing "Post settings" module.Joas Schilling2010-05-282-1/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-9578
* | | | | Merge branch 'ticket/nickvergessen/9628' into develop-olympusAndreas Fischer2010-07-081-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9628: [ticket/9628] _add_module 'after'-parameter does not work correctly.
| * | | | | [ticket/9628] _add_module 'after'-parameter does not work correctly.Joas Schilling2010-05-281-1/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The modules were grouped by left_id so num_modules is always one (hopefully), but the number of rows is the actual value we'd like to know. Removing the GROUP BY resolves the issue. PHPBB3-9628
* | | | | Merge branch 'ticket/jellydoughnut/9695' into develop-olympusAndreas Fischer2010-07-082-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9695: [ticket/9695] Correct the improper display of user input in mcp_ban.php
| * | | | | [ticket/9695] Correct the improper display of user input in mcp_ban.phpJosh Woody2010-07-012-5/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Correct the improper display of "ban_reason" and "ban_give_reason" in mcp_ban.php PHPBB3-9695
* | | | | Merge branch 'ticket/nickvergessen/9697' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9697: [ticket/9697] Backlink broken when the select parent forum does not exist.
| * | | | | [ticket/9697] Backlink broken when the select parent forum does not exist.Joas Schilling2010-07-021-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-9697
* | | | | Merge branch 'ticket/jellydoughnut/9703' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9703: [ticket/9703] Correct database leak where deleting user did not rm some PM data
| * | | | | [ticket/9703] Correct database leak where deleting user did not rm some PM dataJosh Woody2010-07-031-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Users' PM rules and PM folders were being left intact when deleting them. PHPBB3-9703
* | | | | [ticket/9712] Future dates can be formatted as 'less than one minute ago'Chris Smith2010-07-071-2/+2
| |_|/ / |/| | | | | | | | | | | PHPBB3-9712
* | | | [ticket/9659] Signature options in set_user_optionsRichard Foote2010-07-061-0/+3
|/ / / | | | | | | | | | | | | | | | The phpBB3 defaults are being used. PHPBB3-9659
* | | Merge branch 'ticket/bantu/9655' into develop-olympusAndreas Fischer2010-06-201-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9655: [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
| * | | [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.Andreas Fischer2010-06-141-2/+2
| | |/ | |/| | | | | | | PHPBB3-9655
* | | Merge branch 'ticket/bantu/9665' into develop-olympusAndreas Fischer2010-06-202-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9665: [ticket/9665] Allow preview of signature when it is the string "0".
| * | | [ticket/9665] Allow preview of signature when it is the string "0".Andreas Fischer2010-06-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since only the SIGNATURE_PREVIEW parameter is evaluated in the templates <!-- IF SIGNATURE_PREVIEW --> will not allow the signature to be "0". <!-- IF SIGNATURE_PREVIEW != '' --> however does allow "0". PHPBB3-9665
* | | | Merge branch 'ticket/bantu/9656' into develop-olympusAndreas Fischer2010-06-201-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9656: [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
| * | | | [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.Andreas Fischer2010-06-201-2/+2
| | |/ / | |/| | | | | | | | | | PHPBB3-9656
* | | | Merge branch 'ticket/bantu/9653' into develop-olympusAndreas Fischer2010-06-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9653: [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
| * | | | [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signaturesAndreas Fischer2010-06-201-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-9653
* | | | Merge branch 'ticket/bantu/9643' into develop-olympusAndreas Fischer2010-06-201-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9643: [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
| * | | | [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.Andreas Fischer2010-06-081-1/+4
| |/ / / | | | | | | | | | | | | PHPBB3-9643
* | | | Merge branch 'ticket/bantu/9112' into develop-olympusAndreas Fischer2010-06-201-0/+7
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * ticket/bantu/9112: [ticket/9112] Make sure current user can see most active forum/topic.
| * | | [ticket/9112] Make sure current user can see most active forum/topic.Andreas Fischer2010-06-151-0/+7
| | | | | | | | | | | | | | | | PHPBB3-9112
* | | | Merge branch 'ticket/jellydoughnut/9132' into develop-olympusAndreas Fischer2010-06-171-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9132: [ticket/9132] Oracle CLOB support is broken, preventing storage of long strings
| * | | | [ticket/9132] Oracle CLOB support is broken, preventing storage of long stringsJosh Woody2010-06-131-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | This reverts Oracle support to the state it was in prior to phpBB 3.0.6. That is, storage of long strings works again (e.g. posts > 4 KB), but the database backup/restore functionality is broken. We feel that the ability to store long strings is more important than the DB restore, since Oracle 10g itself provides tools for backing up databases. PHPBB3-9132
* | | | Merge branch 'ticket/rxu/9606' into develop-olympusAndreas Fischer2010-06-172-15/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9606: [ticket/9606] Optimize unread search option.
| * | | | [ticket/9606] Optimize unread search option.rxu2010-05-172-15/+11
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Get rid of redundant SQL query in search.php that should increase performance slightly. PHPBB3-9606
* | | | [ticket/9587] Replace '0px' with '0'.Andreas Fischer2010-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This has been introduced by merge of c7a25c58b893fc72ffb3746374ece9de1d388531, which was not supposed to be merged. 1b2a65333b5be1f6086bbd1d438e061041bd2b75 was supposed to be merged instead. PHPBB3-9587
* | | | Merge branch 'ticket/nickvergessen/9605' into develop-olympusAndreas Fischer2010-06-171-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9605: [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
| * | | | [ticket/9605] Wrong class added to topiclist, when there's no announcement ↵Joas Schilling2010-06-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | topic. Compare the topic_type on their real value, to ensure there is no MOD causing problems, because of a new topic-type. PHPBB3-9605
* | | | | Merge branch 'ticket/nickvergessen/9605' into develop-olympusAndreas Fischer2010-06-171-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * ticket/nickvergessen/9605: [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
| * | | | [ticket/9605] Wrong class added to topiclist, when there's no announcement ↵Joas Schilling2010-05-241-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | topic. Just added a check whether the type is announcement or higher. PHPBB3-9605
* | | | Merge branch 'ticket/nickvergessen/9587' into develop-olympusAndreas Fischer2010-06-171-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9587: [ticket/9587] Prosilver overrides reCaptcha class.
| * | | | [ticket/9587] Prosilver overrides reCaptcha class.Joas Schilling2010-05-241-0/+5
| |/ / / | | | | | | | | | | | | PHPBB3-9587
* | | | Merge branch 'ticket/jellydoughnut/9633' into develop-olympusAndreas Fischer2010-06-151-0/+1
|\ \ \ \
| * | | | [ticket/9633] Newly Registered Group Colour not used in "Our Newest Member"Josh Woody2010-06-011-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | Due to an oversight, the default group was not properly checked in the user_add function. This fix corrects the check. No other changes are needed because they go direct to the database, this one used an array in memory. PHPBB3-9633
* | | | [ticket/9623] Proper UTF8 encoding for usernames in pruning sectionJosh Woody2010-06-151-4/+4
| |_|/ |/| | | | | | | | | | | | | | The username textboxes were not being properly encoded in UTF8. PHPBB3-9623
* | | Merge branch 'feature/notify_status' into develop-olympusNils Adermann2010-05-301-1/+0
|\ \ \ | | | | | | | | | | | | | | | | * feature/notify_status: [ticket/9179] Remove unnecessary newline.