aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [ticket/13225] Use passwords manager instead of phpbb_hash in migrationMarc Alexander2014-10-261-1/+4
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13225
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-261-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13223] Fix USERNAME email template variable in notification
| * | | | [ticket/13223] Fix USERNAME email template variable in notificationrxu2014-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | admin_activate_user.php notification type is assigning usernames to email template variables using user_loader->get_username() in 'no_profile' mode, which in its turn calls get_username_string() function in 'no_profile' mode. This causes HTML markup in emails for username colour. PHPBB3-13223
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-264-122/+151
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13221] Add bot_update as a dependency to gold [ticket/13221] Perform bot updates after user table changes
| * | | | [ticket/13221] Add bot_update as a dependency to goldJoas Schilling2014-10-261-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13221
| * | | | [ticket/13221] Perform bot updates after user table changesJoas Schilling2014-10-263-122/+150
| | | | | | | | | | | | | | | | | | | | PHPBB3-13221
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-251-0/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0] Add 3.1.0 gold release migration
| * | | | [prep-release-3.1.0] Add 3.1.0 gold release migrationNils Adermann2014-10-251-0/+31
| | | | |
| * | | | Merge commit '078e0c1e440f7f906b670348e8da00141e245876' into prep-release-3.1.0Nils Adermann2014-10-257-33/+325
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '078e0c1e440f7f906b670348e8da00141e245876': [ticket/13211] Move console migrator output handler back to console folder [ticket/13211] Also use log wrapper output handler for console migrations [ticket/13211] Move console migrator output handler to db folder [ticket/13211] Add log wrapper for writing database updater to log file [ticket/13126] Add missing use statement [ticket/13126] Fix tests [ticket/13126] Change messages verbosity levels [ticket/13126] Move migrator_output_handler to an interface [ticket/13126] Extends migrator_output_handler instead of using a closure [ticket/13126] Improve the feedback when running the migrations
* | \ \ \ \ Merge branch 'develop-ascraeus' into developNils Adermann2014-10-257-33/+325
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13211] Move console migrator output handler back to console folder [ticket/13211] Also use log wrapper output handler for console migrations [ticket/13211] Move console migrator output handler to db folder [ticket/13211] Add log wrapper for writing database updater to log file [ticket/13126] Add missing use statement [ticket/13126] Fix tests [ticket/13126] Change messages verbosity levels [ticket/13126] Move migrator_output_handler to an interface [ticket/13126] Extends migrator_output_handler instead of using a closure [ticket/13126] Improve the feedback when running the migrations
| * | | | | Merge pull request #3060 from marc1706/ticket/13211Nils Adermann2014-10-257-33/+325
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / [ticket/13211] Add log wrapper for writing database updater to log file
| | * | | [ticket/13211] Move console migrator output handler back to console folderMarc Alexander2014-10-252-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13211
| | * | | [ticket/13211] Also use log wrapper output handler for console migrationsMarc Alexander2014-10-252-9/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-13211
| | * | | [ticket/13211] Move console migrator output handler to db folderMarc Alexander2014-10-242-3/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13211
| | * | | [ticket/13211] Add log wrapper for writing database updater to log fileMarc Alexander2014-10-241-0/+95
| | | | | | | | | | | | | | | | | | | | PHPBB3-13211
| | * | | Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211Marc Alexander2014-10-246-32/+225
| | |\ \ \
| | | * | | [ticket/13126] Add missing use statementTristan Darricau2014-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13126
| | | * | | [ticket/13126] Fix testsTristan Darricau2014-10-203-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13126
| | | * | | [ticket/13126] Change messages verbosity levelsTristan Darricau2014-10-203-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13126
| | | * | | [ticket/13126] Move migrator_output_handler to an interfaceTristan Darricau2014-10-204-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13126
| | | * | | [ticket/13126] Extends migrator_output_handler instead of using a closureTristan Darricau2014-10-164-45/+124
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13126
| | | * | | [ticket/13126] Improve the feedback when running the migrationsTristan Darricau2014-10-143-32/+130
| | | |/ / | | | | | | | | | | | | | | | PHPBB3-13126
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-251-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13210] Use the correct config value
| * | | | [ticket/13210] Use the correct config valueOliver Schramm2014-10-251-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-13210
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-231-0/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | [prep-release-3.1.0-RC6] Add migration for 3.1.0-RC6Joas Schilling2014-10-231-0/+31
| | | |
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-2211-12/+37
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13203] Fix passwords manager tests [ticket/13203] Use string_compare method in passwords drivers [ticket/13203] Add method for byte by byte comparison to drivers helper
| * | | [ticket/13203] Use string_compare method in passwords driversMarc Alexander2014-10-2210-12/+17
| | | | | | | | | | | | | | | | PHPBB3-13203
| * | | [ticket/13203] Add method for byte by byte comparison to drivers helperMarc Alexander2014-10-221-0/+20
| | |/ | |/| | | | | | | PHPBB3-13203
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-201-9/+9
|\ \ \ | |/ /
| * | Merge pull request #3040 from nickvergessen/ticket/13138-ascJoas Schilling2014-10-201-9/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [3.1] Ticket/13138 Only use cookie data when we do not force a user_id Conflicts: phpBB/phpbb/session.php
| | * | Merge branch 'ticket/13138-2' into ticket/13138-ascJoas Schilling2014-10-161-26/+29
| | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/session.php
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-201-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13188] Correctly format string concatenation [ticket/13188] Add missing where clause to post_id query in sphinx index
| * | | Merge pull request #3048 from naderman/ticket/13188Nils Adermann2014-10-201-0/+1
| |\ \ \ | | | | | | | | | | [ticket/13188] Add missing where clause to post_id query in sphinx index
| | * | | [ticket/13188] Correctly format string concatenationNils Adermann2014-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13188
| | * | | [ticket/13188] Add missing where clause to post_id query in sphinx indexNils Adermann2014-10-201-0/+1
| | |/ / | | | | | | | | | | | | PHPBB3-13188
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-201-26/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13138] Do not use cookie data and autologin while forcing a user_id
| * | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2014-10-201-26/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13138] Do not use cookie data and autologin while forcing a user_id Conflicts: phpBB/phpbb/session.php
* | | | Merge branch 'develop-ascraeus' into developDhruv2014-10-191-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | # By Nils Adermann # Via Dhruv Goel (1) and Nils Adermann (1) * develop-ascraeus: [ticket/13181] Replace database credentials with placeholders in sphinx conf
| * | | [ticket/13181] Replace database credentials with placeholders in sphinx confNils Adermann2014-10-181-2/+2
| |/ / | | | | | | | | | PHPBB3-13181
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-151-7/+7
|\ \ \ | |/ /
| * | Merge pull request #3024 from marc1706/ticket/13124Joas Schilling2014-10-151-7/+7
| |\ \ | | |/ | |/| | | | [ticket/13124] Also trim spaces in front of comments except for first line
| | * [ticket/13124] Also trim spaces in front of comments except for first lineMarc Alexander2014-10-061-7/+7
| | | | | | | | | | | | PHPBB3-13124
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-071-0/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | [prep-release-3.1.0-RC5] Add migration for 3.1.0-RC5Joas Schilling2014-10-071-0/+33
| | |
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-061-2/+14
|\ \ \ | |/ /
| * | Merge pull request #3016 from Nicofuma/ticket/11224-ascraeusJoas Schilling2014-10-061-2/+14
| |\ \ | | |/ | |/| | | | [ticket/11224][ascraeus] SQL cache destroy does not destroy queries to tables joined
| | * [ticket/11224] Revert Revert "Merge pull request #2460 from ticket/11224"Tristan Darricau2014-10-031-2/+14
| | | | | | | | | | | | This reverts commit 40cd7570e6f4da7cc60d83a3e99c72a2fb99e3f7.
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-061-8/+70
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"
| * | Merge pull request #3017 from nickvergessen/ticket/13033Nils Adermann2014-10-061-8/+70
| |\ \ | | | | | | | | [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 17:04:42 +0000