aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/bantu/9611' into develop-olympusJosh Woody2010-08-194-14/+4
|\ | | | | | | | | * ticket/bantu/9611: [ticket/9611] Make length of activation keys variable between 6 and 10.
| * [ticket/9611] Make length of activation keys variable between 6 and 10.Andreas Fischer2010-05-174-14/+4
| | | | | | | | PHPBB3-9611
* | Merge branch 'ticket/cs278/9771' into develop-olympusAndreas Fischer2010-08-101-0/+5
|\ \ | | | | | | | | | | | | * ticket/cs278/9771: [ticket/9771] Remove query string parameters that have no name.
| * | [ticket/9771] Remove query string parameters that have no name.Chris Smith2010-08-081-0/+5
| | | | | | | | | | | | PHPBB3-9771
* | | Merge branch 'ticket/cs278/9761' into develop-olympusAndreas Fischer2010-08-101-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * ticket/cs278/9761: [ticket/9761] Reworded quote nesting depth ACP option to match the behaviour
| * | | [ticket/9761] Reworded quote nesting depth ACP option to match the behaviourPatrick W2010-07-121-2/+2
| |/ / | | | | | | | | | | | | | | | | | | The nesting depth applies per quote block, not per post which the previous label and description indicated. PHPBB3-9761
* | | Merge branch 'ticket/cs278/9760' into develop-olympusAndreas Fischer2010-08-101-1/+12
|\ \ \ | | | | | | | | | | | | | | | | * ticket/cs278/9760: [ticket/9760] Remove unrestricted wildcards from search terms.
| * | | [ticket/9760] Remove unrestricted wildcards from search terms.Chris Smith2010-08-081-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wildcards without any further result restrictions will cause phpBB to search for everything, potentially allowing a DoS attack against the DB server by any user who can use the search system. PHPBB3-9760
* | | | Merge branch 'ticket/nickvergessen/9743' into develop-olympusAndreas Fischer2010-08-101-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9743: [ticket/9743] Fix background of top2-class in prosilver for RTL-languages.
| * | | | [ticket/9743] Fix background of top2-class in prosilver for RTL-languages.Joas Schilling2010-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9743
* | | | | Merge branch 'ticket/rxu/6747' into develop-olympusAndreas Fischer2010-08-101-1/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | * ticket/rxu/6747: [ticket/9747] Improve word censor.
| * | | | [ticket/9747] Improve word censor.rxu2010-07-251-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better handling of the asterisk inside censor pattern like 'bad*word' etc. PHPBB3-9747
* | | | | Merge branch 'ticket/jellydoughnut/9757' into develop-olympusAndreas Fischer2010-07-313-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9757: [ticket/9757] Fix empty template variable {HISTORY_TITLE}
| * | | | | [ticket/9757] Fix empty template variable {HISTORY_TITLE}Josh Woody2010-07-293-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The template variable {HISTORY_TITLE} was always being set to the empty string. It is now filled with the title of the currently displayed message. It is not showed in prosilver or subsilver2 for aesthetic reasons (title is already prominent) PHPBB3-9757
* | | | | Merge branch 'ticket/jellydoughnut/9499' into develop-olympusAndreas Fischer2010-07-313-11/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9499: [ticket/9499] Unify definition of dE() and other javascript functions
| * | | | | [ticket/9499] Unify definition of dE() and other javascript functionsJosh Woody2010-07-263-11/+22
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dE() was defined differently in the ACP and in prosilver. Other javascript in editor.js files has also been unified (taking the prosilver implementation as cannonical) PHPBB3-9499
* | | | | Merge branch 'ticket/kellanved/9521' into develop-olympusAndreas Fischer2010-07-311-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/kellanved/9521: [ticket/9521] Fix error reporting for the native SQL Server plugin.
| * | | | | [ticket/9521] Fix error reporting for the native SQL Server plugin.Henry Sudhof2010-07-311-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native SQL Server plugin used to return an error string when calling sql_error. However, some error condition checks are done using is_array. This patch wraps the error into an array to follow the error logic used elsewhere. PHPBB3-9521
* | | | | | Merge branch 'ticket/jellydoughnut/9679' into develop-olympusAndreas Fischer2010-07-311-8/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9679: [ticket/9679] phpBB offers to notify poster even if notification is disabled
| * | | | | | [ticket/9679] phpBB offers to notify poster even if notification is disabledJosh Woody2010-07-291-8/+11
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "notify user" check box would not do anything if checked in this case, but it was still presented. The checkbox is now only shown if there are notification options enabled. PHPBB3-9679
* | | | | | Merge branch 'ticket/jellydoughnut/9722' into develop-olympusAndreas Fischer2010-07-311-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9722: [ticket/9722] Adjust "New Topic" title attribute for consistency in prosilver
| * | | | | | [ticket/9722] Adjust "New Topic" title attribute for consistency in prosilverJosh Woody2010-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Title attribute was being applied to a <div> at the top of the page and to an <a> at the bottom of the page. Now both being applied to the <div>. PHPBB3-9722
* | | | | | | Merge branch 'ticket/jellydoughnut/9749' into develop-olympusAndreas Fischer2010-07-311-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9749: [ticket/9749] Fulltext mysql unexpected behavior on entering a dash in query
| * | | | | | | [ticket/9749] Fulltext mysql unexpected behavior on entering a dash in queryJosh Woody2010-07-291-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Fulltext_mysql class had different behavior when a dash was entered in the search query than the fulltext_native class. Specifically, a dash was automatically turned into boolean NOT even when the user wanted to search for legitimate hyphenated words like farty-pants PHPBB3-9749
* | | | | | | Merge branch 'ticket/jellydoughnut/9559' into develop-olympusAndreas Fischer2010-07-311-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9559: [ticket/9559] Do not override queue package size in the case of an overflow
| * | | | | | | [ticket/9559] Do not override queue package size in the case of an overflowJosh Woody2010-07-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts r8025 to includes/functions_messenger.php. That code caused problems on hosters with email limits less than package_size*2.5. And it isn't desirable in general to over-ride the admin's configuration options. PHPBB3-9559
* | | | | | | | Merge branch 'task/evil3/set-permissions' into develop-olympusAndreas Fischer2010-07-291-0/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * task/evil3/set-permissions: [task/set-permissions] shell script to set file permissions
| * | | | | | | [task/set-permissions] shell script to set file permissionsIgor Wiedler2010-06-281-0/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-9689
* | | | | | | 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