aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [feature/sql-bool-builder] Fixing typos in previous commitbrunoais2015-11-121-2/+2
| | | | PHPBB3-13652
* [feature/sql-bool-builder] Changing syntax pt3. Don't use magic numbersbrunoais2015-11-111-15/+24
| | | | PHPBB3-13652
* [feature/sql-bool-builder] Changing syntaxbrunoais2015-11-111-5/+5
| | | | | | Changing the syntax used to the one Nicofuma suggested. PHPBB3-13652
* Merge pull request #4025 from marc1706/ticket/14280Máté Bartus2015-11-101-0/+8
|\ | | | | [ticket/14280] Add missing language strings for version check
| * [ticket/14280] Add missing language strings for version checkMarc Alexander2015-11-101-0/+8
| | | | | | | | PHPBB3-14280
* | Merge branch '3.1.x'Marc Alexander2015-11-1012-14/+270
|\ \ | |/ |/|
| * Merge pull request #3930 from rxu/ticket/14201Marc Alexander2015-11-1012-14/+270
| |\ | | | | | | | | | [ticket/14201] Add multiple ACP template events
| | * [ticket/14201] Add events.md descriptions, fix accidentally swapped eventsrxu2015-10-1210-16/+260
| | | | | | | | | | | | PHPBB3-14201
| | * [ticket/14201] Add more template events to ACPrxu2015-09-268-7/+15
| | | | | | | | | | | | PHPBB3-14201
| | * [ticket/14201] Add events to acp_users.html, permission_forum_copy.htmlrxu2015-09-262-2/+4
| | | | | | | | | | | | PHPBB3-14201
| | * [ticket/14201] Add template events to acp_permissions.htmlrxu2015-09-261-5/+7
| | | | | | | | | | | | PHPBB3-14201
* | | [ticket/14278] Check if user_id is set and fall back to ANONYMOUSMarc Alexander2015-11-091-1/+1
| | | | | | | | | | | | PHPBB3-14278
* | | [ticket/14277] Fix CSMate Bartus2015-11-091-2/+1
| | | | | | | | | | | | PHPBB3-14277
* | | [ticket/14277] Use user_id if availableMate Bartus2015-11-091-1/+1
| | | | | | | | | | | | PHPBB3-14277
* | | [ticket/14277] Fix undefined index error in migrationsMate Bartus2015-11-082-2/+15
| | | | | | | | | | | | PHPBB3-14277
* | | Merge pull request #4019 from prototech/ticket/14273Marc Alexander2015-11-062-7/+1
|\ \ \ | | | | | | | | | | | | [ticket/14273] Remove unused core.root_path dependency in files.upload service
| * | | [ticket/14273] Remove unused core.root_path dependency in files.upload serviceCesar G2015-11-052-7/+1
| | | | | | | | | | | | | | | | PHPBB3-14273
* | | | Merge pull request #4020 from VSEphpbb/ticket/14274Oliver Schramm2015-11-061-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14274] Include user functions during installer
| * | | | [ticket/14274] Include user functions during installerMatt Friedman2015-11-051-0/+5
| |/ / / | | | | | | | | | | | | PHPBB3-14274
* | | | Merge branch '3.1.x'Oliver Schramm2015-11-062-12/+60
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: phpBB/includes/acp/acp_captcha.php
| * | Merge pull request #3975 from prototech/ticket/11971Oliver Schramm2015-11-062-12/+60
| |\ \ | | | | | | | | | | | | [ticket/11971] Validate "Spambot countermeasures" settings before saving
| | * | [ticket/11971] Validate "Spambot countermeasures" settings before saving.Cesar G2015-10-142-12/+60
| | | | | | | | | | | | | | | | PHPBB3-11971
* | | | Merge pull request #4010 from Elsensee/ticket/14264Máté Bartus2015-11-059-67/+18
|\ \ \ \ | | | | | | | | | | [ticket/14264] Don't use constants as return values
| * | | | [ticket/14264] Don't use constants as return valuesOliver Schramm2015-11-039-67/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent BC breaking in the future if we decide to get rid of constants. PHPBB3-14264
* | | | | Merge pull request #3995 from CHItA/ticket/14044Tristan Darricau2015-11-0336-10095/+405
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14044] Deduplicate the installers * CHItA/ticket/14044: [ticket/14044] Add config as global in notify user [ticket/14044] Fix language selection data loss [ticket/14044] Patch language::set_fallback_array() [ticket/14044] Fix tests [ticket/14044] Fix wrong descriptions in install [ticket/14044] Solve missing email template error [ticket/14044] global $table_prefix in constants.php [ticket/14044] Try to fix missing table prefix [ticket/14044] Use the correct language file version [ticket/14044] Automatically trigger rollback on insert in transaction [ticket/14044] Use empty instead of !count [ticket/14044] Fix Sqlite error in tests [ticket/14044] Deduplicate the installers
| * | | | [ticket/14044] Add config as global in notify userMate Bartus2015-11-031-2/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-14044
| * | | | [ticket/14044] Fix language selection data lossMate Bartus2015-10-304-3/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-14044
| * | | | [ticket/14044] Patch language::set_fallback_array()Mate Bartus2015-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14044
| * | | | [ticket/14044] Fix wrong descriptions in installMate Bartus2015-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14044
| * | | | [ticket/14044] Solve missing email template errorMate Bartus2015-10-282-1/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-14044
| * | | | [ticket/14044] global $table_prefix in constants.phpMate Bartus2015-10-282-4/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14044
| * | | | [ticket/14044] Try to fix missing table prefixMate Bartus2015-10-281-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-14044
| * | | | [ticket/14044] Use the correct language file versionMate Bartus2015-10-281-13/+109
| | | | | | | | | | | | | | | | | | | | PHPBB3-14044
| * | | | [ticket/14044] Automatically trigger rollback on insert in transactionMarc Alexander2015-10-232-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will cause the sqlite3 driver to automatically rollback transactions if an insert fails during a transaction. Other dbms trigger a rollback inside the sql_error() function with a rollback command. However, this manual rollback command might fail on sqlite3 due to ongoing queries. With this change, sqlite3 itself will abort any ongoing queries and initiate the rollback automatically. Since manually triggered rollbacks will fail after the rollback was started automatically, we catch exceptions output by the exec() command during rollback and any exception that might be thrown by fetchArray() due to aborted queries. PHPBB3-14044
| * | | | [ticket/14044] Use empty instead of !countMate Bartus2015-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14044
| * | | | [ticket/14044] Fix Sqlite error in testsMarc Alexander2015-10-232-5/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-14044
| * | | | [ticket/14044] Deduplicate the installersMate Bartus2015-10-2229-10077/+248
| | | | | | | | | | | | | | | | | | | | PHPBB3-14044
* | | | | Merge branch '3.1.x'Marc Alexander2015-11-031-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4012 from RMcGirr83/ticket_14228Marc Alexander2015-11-031-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14228] Vertical align of numbers in polls
| | * | | | [ticket/14228] Vertical align of numbers in pollsRichard McGirr2015-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14228
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-11-021-2/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13831] Store provided reason when deleting from Mod. Queue module.
| * | | | | Merge pull request #3983 from prototech/ticket/13831Andreas Fischer2015-11-021-2/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13831] Store provided reason when deleting from Mod. Queue module. * prototech/ticket/13831: [ticket/13831] Store provided reason when deleting from Mod. Queue module.
| | * | | | [ticket/13831] Store provided reason when deleting from Mod. Queue module.Cesar G2015-10-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13831
* | | | | | [ticket/14265] Make all tables available in containerOliver Schramm2015-11-011-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14265
* | | | | | Merge pull request #3971 from VSEphpbb/ticket/14237Oliver Schramm2015-10-2918-73/+114
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14237] Use $language class for notifications
| * | | | | | [ticket/14237] Consistent references to classes in docblocksMatt Friedman2015-10-141-3/+3
| | | | | | | | | | | | | | | | | | | | | PHPBB3-14237
| * | | | | | [ticket/14237] Use $language class for notificationsMatt Friedman2015-10-1318-76/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14237
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-10-241-0/+19
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | [ticket/14258] Add event into auth::login before session creationPaul Sohier2015-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo PHPBB3-14258
| * | | | | | [ticket/14258] Add event into auth::login before session creationPaul Sohier2015-10-241-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update comments regarding variables. PHPBB3-14258