aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'ticket/bantu/9068' into develop-olympusAndreas Fischer2010-07-221-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9068: [ticket/9068] Added a missing comma in acp load settings explanation text.
| * | | | | | | | | [ticket/9068] Added a missing comma in acp load settings explanation text.Nick Anderegg2010-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9068
* | | | | | | | | | Merge branch 'ticket/bantu/9744' into develop-olympusAndreas Fischer2010-07-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9744: [ticket/9744] Fix mistyped word 'then' in FAQ. It should be 'than'.
| * | | | | | | | | | [ticket/9744] Fix mistyped word 'then' in FAQ. It should be 'than'.Andreas Fischer2010-07-221-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9744
* | | | | | | | | | Merge branch 'ticket/t-backoff/9099' into develop-olympusAndreas Fischer2010-07-221-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/t-backoff/9099: [ticket/9099] Add missing commas in acp language.
| * | | | | | | | | | [ticket/9099] Add missing commas in acp language.Tabitha Backoff2010-07-211-3/+3
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9099
* | | | | | | | | | Merge branch 'ticket/jellydoughnut/9727' into develop-olympusAndreas Fischer2010-07-221-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | / / / / / / | | |_|/ / / / / / | |/| | | | | | | * ticket/jellydoughnut/9727: [ticket/9727] Smiley Path replacement in feeds is too generic
| * | | | | | | | [ticket/9727] Smiley Path replacement in feeds is too genericJosh Woody2010-07-181-2/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The smiley path replacement in the feeds was too broad: any post content containing "./" was changed to the fully qualified board URL. This broke CSS for example. PHPBB3-9727
* | | | | | | | Merge branch 'ticket/kellanved/9504' into develop-olympusAndreas Fischer2010-07-151-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/kellanved/9504: [ticket/9504] Allow whitespaces in gallery avatars
| * | | | | | | | [ticket/9504] Allow whitespaces in gallery avatarsHenry Sudhof2010-07-151-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gallery avatars are discovered on the server filesystem; to allow linking to the images, the filenames are urlencoded before being written to the database. However, getimagesize needs the decoded filename as input. PHPBB3-9504
* | | | | | | | [ticket/9658] Optimize topic splitting.rxu2010-07-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split topics takes too long in some cases because of wrong variables or arrays values types adjustment. Cast values representing topic and forum ids as int. PHPBB3-9658
* | | | | | | | Merge branch 'ticket/nickvergessen/7720' into develop-olympusAndreas Fischer2010-07-1414-63/+71
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/7720: [ticket/7720] Fix alternative image-description for unread posts.
| * | | | | | | [ticket/7720] Fix alternative image-description for unread posts.Joas Schilling2010-07-1414-63/+71
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the wrong word "new" to "unread" as that is, what we show with the red-icons, not whether the post is new or not. Language variables were kept for backwards compatibility. PHPBB3-7720
* | | | | | | Merge branch 'ticket/ckwalsh/9715' into develop-olympusAndreas Fischer2010-07-121-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/ckwalsh/9715: [ticket/9715] Better email regex [ticket/9715] Extend email unit tests
| * | | | | | | [ticket/9715] Better email regexCullen Walsh2010-07-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using email regex created by James Watts and Francisco Jose Martin Moreno. This passes many more tests for RFC valid emails. PHPBB3-9715
* | | | | | | | Merge branch 'ticket/naderman/9140' into develop-olympusAndreas Fischer2010-07-121-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/naderman/9140: [ticket/9140] Check current board version in incremental update packages
| * | | | | | | | [ticket/9140] Check current board version in incremental update packagesGabriel Vazquez2010-07-121-0/+11
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we do not want to limit the updater functionality we only display a prominent warning when the current board version does not match the version the update files are meant to update from. PHPBB3-9140
* | | | | | | | Merge branch 'ticket/nickvergessen/9531' into develop-olympusAndreas Fischer2010-07-126-4/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9531: [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"
| * | | | | | | | [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"Joas Schilling2010-07-116-4/+16
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When quoting from the topic-review the statement "Author wrote:" is missing. The fix for this was not complete: Now it's backwards compatibile and uses the LA_ for the language variables. PHPBB3-9531
* | | | | | | | Merge branch 'ticket/adamreyher/9012' into develop-olympusAndreas Fischer2010-07-111-0/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * ticket/adamreyher/9012: [ticket/9012] Adjust shadow topic title to the title at the time it was moved.
| * | | | | | | [ticket/9012] Adjust shadow topic title to the title at the time it was moved.Adam Reyher2010-07-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved topics which have their title changed in the new forum will now show the old title in the original viewforum instead of the new title. PHPBB3-9012
* | | | | | | | Merge branch 'ticket/jellydoughnut/9637' into develop-olympusAndreas Fischer2010-07-1110-25/+52
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9637: [ticket/9637] Do not cache SQL server version in all cases
| * | | | | | | | [ticket/9637] Do not cache SQL server version in all casesJosh Woody2010-07-1110-25/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the existing cache is global, there is no way to differentiate between each of two databases which may be two different DBAL objects pointing to servers with wildly different versions of an RDBMS. phpBB only has this situation in the UCF, thus only one file changed outside the DBAL. I have added a second optional parameter, $use_cache to each of the implementations of dbal::sql_server_info() PHPBB3-9637
* | | | | | | | | [ticket/9629] Allow style.php to retrieve its session ID from cookiesJosh Woody2010-07-112-8/+15
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | style.php takes a session ID to ensure it gets the right language for a user, but that session ID is always passed in GET. This allows change allows the SID to be read from the cookie, and theoretically makes it friendlier for caching engines like Varnish. PHPBB3-9629
* | | | | | | | Merge branch 'ticket/nickvergessen/9678' into develop-olympusAndreas Fischer2010-07-101-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9678: [ticket/9678] Flash attachments are not displayed in subsilver2.
| * | | | | | | | [ticket/9678] Flash attachments are not displayed in subsilver2.Joas Schilling2010-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9678
* | | | | | | | | Merge branch 'ticket/nickvergessen/9677' into develop-olympusAndreas Fischer2010-07-101-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9677: [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.
| * | | | | | | | | [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.Joas Schilling2010-07-081-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9677
* | | | | | | | | Merge branch 'ticket/jellydoughnut/9650' into develop-olympusAndreas Fischer2010-07-103-3/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9650: [ticket/9650] Do not allow banning the anonymous user by username
| * | | | | | | | [ticket/9650] Do not allow banning the anonymous user by usernameJosh Woody2010-07-083-3/+10
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Banning anonymous can result in bad things, like not being able to log in. However, it was possible until now. PHPBB3-9650
* | | | | | | | 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