aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | [ticket/14274] Include user functions during installerMatt Friedman2015-11-051-0/+5
|/ / / / | | | | | | | | | | | | PHPBB3-14274
* | | | Merge pull request #4010 from Elsensee/ticket/14264Máté Bartus2015-11-058-67/+11
|\ \ \ \ | |/ / / |/| | | [ticket/14264] Don't use constants as return values
| * | | [ticket/14264] Don't use constants as return valuesOliver Schramm2015-11-038-67/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0310-21/+83
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-281-4/+0
| | | | | | | | | | | | | | | | PHPBB3-14044
| * | | [ticket/14044] Try to fix missing table prefixMate Bartus2015-10-281-0/+4
| | | | | | | | | | | | | | | | 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-224-12/+34
| | | | | | | | | | | | | | | | PHPBB3-14044
* | | | Merge pull request #3971 from VSEphpbb/ticket/14237Oliver Schramm2015-10-2917-73/+112
|\ \ \ \ | |_|/ / |/| | | | | | | [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-1317-76/+115
| | | | | | | | | | | | | | | | 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
| * | [ticket/14258] Add event into auth::login before session creationPaul Sohier2015-10-241-0/+20
| | | | | | | | | | | | | | | | | | | | | Add a new event in the login method just before the session create, so extensions can do some additional validation during login. PHPBB3-14258
* | | Merge branch '3.1.x'Mate Bartus2015-10-211-1/+1
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/13976] Fix comment typo in salted_md5.php
| * | Merge pull request #3997 from CHItA/ticket/13976Máté Bartus2015-10-211-1/+1
| |\ \ | | | | | | | | [ticket/13976] Fix comment typo in salted_md5.php
| | * | [ticket/13976] Fix comment typo in salted_md5.phpSumanai2015-10-211-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13976
* | | | Merge pull request #3794 from CHItA/ticket/14039Tristan Darricau2015-10-1957-169/+3733
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14039] Refactoring the updater * CHItA/ticket/14039: [ticket/14039] Use update helper to include files in container factory [ticket/14039] Fix inclusion logic in update helper [ticket/14039] Fix folder creation and deleted binary file issue [ticket/14039] Fix file check for deleted files [ticket/14039] Fix acp link [ticket/14039] Fix ACP link generation [ticket/14039] Fix constants for the updater [ticket/14039] Include phpBB constants on startup [ticket/14039] Fix migrator's language calls [ticket/14039] Fix misunderstandable comment in the archive file updater [ticket/14039] Use shared language service in the container factory [ticket/14039] Fix filesystem file updater's mkdir usage [ticket/14039] Only show log container when it has content [ticket/14039] Use compatibility globals from the update package [ticket/14039] Use http_exception instead of die() [ticket/14039] Fix T_TEMPLATE_PATH constant [ticket/14039] Fix language constants and comments [ticket/14039] Revamp updater
| * | | | [ticket/14039] Use update helper to include files in container factoryMate Bartus2015-10-191-24/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Fix inclusion logic in update helperMate Bartus2015-10-191-6/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Fix folder creation and deleted binary file issueMate Bartus2015-10-182-1/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Fix file check for deleted filesMate Bartus2015-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Fix acp linkMate Bartus2015-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Fix ACP link generationMate Bartus2015-10-181-17/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Fix constants for the updaterMate Bartus2015-10-181-1/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Fix migrator's language callsMate Bartus2015-10-182-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Fix misunderstandable comment in the archive file updaterMate Bartus2015-10-181-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Use shared language service in the container factoryMate Bartus2015-10-181-4/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Fix filesystem file updater's mkdir usageMate Bartus2015-10-181-16/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Use compatibility globals from the update packageMate Bartus2015-10-181-1/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Use http_exception instead of die()Mate Bartus2015-10-181-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Fix T_TEMPLATE_PATH constantMate Bartus2015-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Fix language constants and commentsMate Bartus2015-10-182-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
| * | | | [ticket/14039] Revamp updaterMate Bartus2015-10-1757-145/+3703
| | | | | | | | | | | | | | | | | | | | PHPBB3-14039
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-191-2/+4
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13799] Split lines in HTML files for better readability [ticket/13799] Add missing space before checked attribute [ticket/13799] Correctly urlencode category and show selected avatar [ticket/13799] Do not rawurlencode category in gallery avatar
| * | | Merge pull request #3647 from marc1706/ticket/13799Tristan Darricau2015-10-191-2/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13799] Do not rawurlencode category in gallery avatar * marc1706/ticket/13799: [ticket/13799] Split lines in HTML files for better readability [ticket/13799] Add missing space before checked attribute [ticket/13799] Correctly urlencode category and show selected avatar [ticket/13799] Do not rawurlencode category in gallery avatar
| | * | | [ticket/13799] Correctly urlencode category and show selected avatarMarc Alexander2015-05-301-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13799
| | * | | [ticket/13799] Do not rawurlencode category in gallery avatarMarc Alexander2015-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the directory seperator will incorrectly be transformed to its HTML replacement. PHPBB3-13799
* | | | | Merge branch '3.1.x'Marc Alexander2015-10-178-9/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/notification/type/bookmark.php phpBB/phpbb/notification/type/post.php phpBB/phpbb/notification/type/quote.php
| * | | | [ticket/13892] Replace other uses of self with static.Cesar G2015-10-157-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-13892
| * | | | [ticket/13892] Respect "Someone reports a post" notification setting.Cesar G2015-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | report_post inherits from post_in_queue, therefore using self:: instead of static:: results in the incorrect notification type being used to determine which users to exclude from the notification. PHPBB3-13892
* | | | | [ticket/13789] Upgrade reCaptcha plugin to 2.0 API.Cesar G2015-10-141-117/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-13789