aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10561] All users can choose deactivated styles (fixed).Hari Sankar R2012-04-032-1/+20
| | | | | | | | A form exploit enabled the users to select a deactivated style. Fixed with extra check on submit, with a new function styles_verify to check if the selected style is activated or not. PHPBB3-10561
* Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympusIgor Wiedler2012-03-312-1/+9
|\ | | | | | | | | | | * Dickyf/ticket/10675: [Ticket/10675] Correct language string ATTACH_DISK_FULL [ticket/10675] Add disk full language string when posting attachments
| * [Ticket/10675] Correct language string ATTACH_DISK_FULLRichard Foote2012-03-311-1/+1
| | | | | | | | | | | | Add period to ATTACH_DISK_FULL language string PHPBB3-10675
| * [ticket/10675] Add disk full language string when posting attachmentsRichard Foote2012-03-192-1/+9
| | | | | | | | | | | | | | Add language string visible by admins only for when the disk does not have enough free space to upload attachments. PHPBB3-10675
* | Merge pull request #668 from unknownbliss/feature/events-dispatcher-olympusIgor Wiedler2012-03-301-0/+1
|\ \ | | | | | | Feature/events dispatcher olympus
| * | [feature/event-dispatcher] Adding composer.phar to .gitignore for olympusMichael Cullum2012-03-301-0/+1
| | | | | | | | | | | | | | | | | | To keep the .gitignore's the same. PHPBB3-9550
* | | Merge branch 'unknownbliss/feature/events-dispatcher-olympus' into ↵David King2012-03-301-0/+1
|\ \ \ | | | | | | | | | | | | develop-olympus
| * | | [feature/events-dispatcher] Adding phpBB/vendor to .gitignoreMichael Cullum2012-03-211-0/+1
| | | | | | | | | | | | | | | | PHPBB3-9550
* | | | Merge branch 'harderthanfire/ticket/10129' into develop-olympusDavid King2012-03-292-10/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/10129] Remove apostrophes and plurals in ACP user management -> ↵HTF2012-03-242-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | permissions language file as per ticket. PHPBB3-10129
* | | | Merge remote-tracking branch 'janschejbal/ticket/10730' into develop-olympusOleg Pudeyev2012-03-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * janschejbal/ticket/10730: [ticket/10730] Added label tag around "select" text in post splitting UI
| * | | | [ticket/10730] Added label tag around "select" text in post splitting UIJan Schejbal2012-03-291-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added label tags around the "select" text in the post splitting UI in the MCP. Had to add IDs based on the post ID to the select boxes to allow label to work. Tested in Firefox and Chrome. PHPBB3-10730
* | | | Merge remote-tracking branch 'Dickyf/ticket/10708' into develop-olympusAndreas Fischer2012-03-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * Dickyf/ticket/10708: [ticket/10708] Check converted passwords for multi-byte characters
| * | | | [ticket/10708] Check converted passwords for multi-byte charactersRichard Foote2012-03-191-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Check for multi-byte characters in converted passwords. PHPBB3-10708
* | | | Merge pull request #664 from imkingdavid/ticket/10732Igor Wiedler2012-03-281-0/+2
|\ \ \ \ | | | | | | | | | | [ticket/10732] Add config_dev.php and config_test.php to .gitignore
| * | | | [ticket/10732] Add config_dev.php and config_test.php to .gitignoreDavid King2012-03-281-0/+2
|/ / / / | | | | | | | | | | | | PHPBB3-10732
* | | | Merge remote-tracking branch 'unknownbliss/ticket/10694' into develop-olympusAndreas Fischer2012-03-261-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * unknownbliss/ticket/10694: [ticket/10694] Adjusting details link to 5.3 announcement [ticket/10694] Update PHP warning to 5.3.2
| * | | | [ticket/10694] Adjusting details link to 5.3 announcementMichael Cullum2012-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10694
| * | | | [ticket/10694] Update PHP warning to 5.3.2Michael Cullum2012-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10694
* | | | | Merge remote-tracking branch 'unknownbliss/ticket/10723' into develop-olympusAndreas Fischer2012-03-242-14/+14
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | * unknownbliss/ticket/10723: [ticket/10723] Stop Travis running all tests on sqlite
| * | | | [ticket/10723] Stop Travis running all tests on sqliteMichael Cullum2012-03-232-14/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | Correct information so all tests don't run on sqlite PHPBB3-10723
* | | | Merge remote-tracking branch 'rxu/ticket/10684' into develop-olympusAndreas Fischer2012-03-223-37/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10684: [ticket/10684] Adjust function and parameter name, minor changes. [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter [ticket/10684] Remove intval mapping for array keys [ticket/10684] Adjust pm_notifications() to handle stale bans [ticket/10684] Cast user_id to integer [ticket/10684] Refactor $sql_ignore_users array update [ticket/10684] Remove isset() for $sql_ignore_users update [ticket/10684] Fix 2 typos in comment lines. [ticket/10684] Send notifications for users with stale bans
| * | | | [ticket/10684] Adjust function and parameter name, minor changes.rxu2012-03-223-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-10684
| * | | | [ticket/10684] Rename function phpbb_get_banned_users_ids() parameterrxu2012-03-121-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10684
| * | | | [ticket/10684] Remove intval mapping for array keysrxu2012-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP manual for arrays http://php.net/manual/en/language.types.array.php states that the following key cast will occur: Strings containing valid integers will be cast to the integer type. E.g. the key "8" will actually be stored under 8. Thus, no intval mapping for numeric array keys is needed. PHPBB3-10684
| * | | | [ticket/10684] Adjust pm_notifications() to handle stale bansrxu2012-03-122-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add parameter (array) to the function phpbb_get_banned_users_ids() - Fix function pm_notification() to handle users with stale bans PHPBB3-10684
| * | | | [ticket/10684] Cast user_id to integerrxu2012-03-111-5/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-10684
| * | | | [ticket/10684] Refactor $sql_ignore_users array updaterxu2012-03-101-10/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10684
| * | | | [ticket/10684] Remove isset() for $sql_ignore_users updaterxu2012-03-091-4/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10684
| * | | | [ticket/10684] Fix 2 typos in comment lines.rxu2012-03-092-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10684
| * | | | [ticket/10684] Send notifications for users with stale bansrxu2012-03-082-17/+48
| | | | | | | | | | | | | | | | | | | | PHPBB3-10684
* | | | | Merge remote-tracking branch 'github-unknownbliss/task/travis' into ↵Nils Adermann2012-03-221-3/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-unknownbliss/task/travis: [task/travis] Refactor php version check for dbunit install
| * | | | | [task/travis] Refactor php version check for dbunit installMichael Cullum2012-03-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10718
* | | | | | Merge remote-tracking branch 'github-unknownbliss/task/travis' into ↵Nils Adermann2012-03-222-0/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-unknownbliss/task/travis: [task/travis] Exclude functional and slow tests
| * | | | | [task/travis] Exclude functional and slow testsMichael Cullum2012-03-222-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10718
* | | | | | Merge remote-tracking branch 'github-unknownbliss/task/travis' into ↵Nils Adermann2012-03-224-0/+92
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-unknownbliss/task/travis: [task/travis] Some more small travis fixes [task/travis] Rename travis phpunit config files [task/travis] Fixing some travis issues [task/travis] Add automated testing to readme [task/travis] Removing development information [task/travis] Adding Travis Continuous Intergration Support
| * | | | | [task/travis] Some more small travis fixesMichael Cullum2012-03-222-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10718
| * | | | | [task/travis] Rename travis phpunit config filesMichael Cullum2012-03-223-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10718
| * | | | | [task/travis] Fixing some travis issuesMichael Cullum2012-03-222-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10718
| * | | | | [task/travis] Add automated testing to readmeMichael Cullum2012-03-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10718
| * | | | | [task/travis] Removing development informationMichael Cullum2012-03-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10718
| * | | | | [task/travis] Adding Travis Continuous Intergration SupportMichael Cullum2012-03-223-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10718
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10717' into develop-olympusAndreas Fischer2012-03-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10717: [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
| * | | | | | [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.htmlJoas Schilling2012-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10717
* | | | | | | Merge remote-tracking branch 'p/task/php54-olympus' into develop-olympusAndreas Fischer2012-03-221-1/+17
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * p/task/php54-olympus: [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4. [task/php54] Refactor error_reporting call slightly.
| * | | | | | [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.Oleg Pudeyev2012-03-151-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot use static in Olympus because it must be PHP 4 compatible. Therefore disable E_STRICT for Olympus. This commit should be reverted for Ascraeus. PHPBB3-10615
| * | | | | | [task/php54] Refactor error_reporting call slightly.Oleg Pudeyev2012-03-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate error level assignment into a variable in this commit so that the only difference between Olympus and Ascraeus is the addition of logic altering $level. PHPBB3-10615
* | | | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/10691' into develop-olympusAndreas Fischer2012-03-191-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10691: [ticket/10691] Fixed the speed of creating search index
| * | | | | | [ticket/10691] Fixed the speed of creating search indexDhruv Goel2012-03-191-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $time is now initialized after each batch iteration. Speed for each batch iteration of creating search index is fixed. PHPBB3-10691
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympusOleg Pudeyev2012-03-163-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8636: [ticket/8636] Add resync option to topic_view moderation page