| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-10-25 | 7 | -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/13211 | Nils Adermann | 2014-10-25 | 7 | -33/+325 |
| | |\ | | | | | | | [ticket/13211] Add log wrapper for writing database updater to log file | ||||
| | | * | [ticket/13211] Move console migrator output handler back to console folder | Marc Alexander | 2014-10-25 | 2 | -2/+3 |
| | | | | | | | | | | | | | PHPBB3-13211 | ||||
| | | * | [ticket/13211] Also use log wrapper output handler for console migrations | Marc Alexander | 2014-10-25 | 2 | -9/+13 |
| | | | | | | | | | | | | | PHPBB3-13211 | ||||
| | | * | [ticket/13211] Move console migrator output handler to db folder | Marc Alexander | 2014-10-24 | 2 | -3/+2 |
| | | | | | | | | | | | | | PHPBB3-13211 | ||||
| | | * | [ticket/13211] Add log wrapper for writing database updater to log file | Marc Alexander | 2014-10-24 | 1 | -0/+95 |
| | | | | | | | | | | | | | PHPBB3-13211 | ||||
| | | * | Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211 | Marc Alexander | 2014-10-24 | 6 | -32/+225 |
| | | |\ | |||||
| | | | * | [ticket/13126] Add missing use statement | Tristan Darricau | 2014-10-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-13126 | ||||
| | | | * | [ticket/13126] Fix tests | Tristan Darricau | 2014-10-20 | 3 | -12/+11 |
| | | | | | | | | | | | | | | | | | PHPBB3-13126 | ||||
| | | | * | [ticket/13126] Change messages verbosity levels | Tristan Darricau | 2014-10-20 | 3 | -7/+7 |
| | | | | | | | | | | | | | | | | | PHPBB3-13126 | ||||
| | | | * | [ticket/13126] Move migrator_output_handler to an interface | Tristan Darricau | 2014-10-20 | 4 | -17/+33 |
| | | | | | | | | | | | | | | | | | PHPBB3-13126 | ||||
| | | | * | [ticket/13126] Extends migrator_output_handler instead of using a closure | Tristan Darricau | 2014-10-16 | 4 | -45/+124 |
| | | | | | | | | | | | | | | | | | PHPBB3-13126 | ||||
| | | | * | [ticket/13126] Improve the feedback when running the migrations | Tristan Darricau | 2014-10-14 | 3 | -32/+130 |
| | | | | | | | | | | | | | | | | | PHPBB3-13126 | ||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Andreas Fischer | 2014-10-25 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | * develop-ascraeus: [ticket/13210] Use the correct config value | ||||
| | * | | | [ticket/13210] Use the correct config value | Oliver Schramm | 2014-10-25 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | PHPBB3-13210 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-23 | 1 | -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-RC6 | Joas Schilling | 2014-10-23 | 1 | -0/+31 |
| | | | | |||||
| * | | | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-10-22 | 11 | -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 drivers | Marc Alexander | 2014-10-22 | 10 | -12/+17 |
| | | | | | | | | | | | | | PHPBB3-13203 | ||||
| | * | | [ticket/13203] Add method for byte by byte comparison to drivers helper | Marc Alexander | 2014-10-22 | 1 | -0/+20 |
| | | | | | | | | | | | | | PHPBB3-13203 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-20 | 1 | -9/+9 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #3040 from nickvergessen/ticket/13138-asc | Joas Schilling | 2014-10-20 | 1 | -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-asc | Joas Schilling | 2014-10-16 | 1 | -26/+29 |
| | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/session.php | ||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-10-20 | 1 | -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/13188 | Nils Adermann | 2014-10-20 | 1 | -0/+1 |
| | |\ \ \ | | | | | | | | | | | [ticket/13188] Add missing where clause to post_id query in sphinx index | ||||
| | | * | | | [ticket/13188] Correctly format string concatenation | Nils Adermann | 2014-10-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13188 | ||||
| | | * | | | [ticket/13188] Add missing where clause to post_id query in sphinx index | Nils Adermann | 2014-10-20 | 1 | -0/+1 |
| | | |/ / | | | | | | | | | | | | | PHPBB3-13188 | ||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-10-20 | 1 | -26/+29 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | * develop-ascraeus: [ticket/13138] Do not use cookie data and autologin while forcing a user_id | ||||
| | * | | | Merge branch 'develop-olympus' into develop-ascraeus | Nils Adermann | 2014-10-20 | 1 | -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 develop | Dhruv | 2014-10-19 | 1 | -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 conf | Nils Adermann | 2014-10-18 | 1 | -2/+2 |
| | |/ / | | | | | | | | | | PHPBB3-13181 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-15 | 1 | -7/+7 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #3024 from marc1706/ticket/13124 | Joas Schilling | 2014-10-15 | 1 | -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 line | Marc Alexander | 2014-10-06 | 1 | -7/+7 |
| | | | | | | | | | | | | | PHPBB3-13124 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-07 | 1 | -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-RC5 | Joas Schilling | 2014-10-07 | 1 | -0/+33 |
| | | | | |||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-06 | 1 | -2/+14 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #3016 from Nicofuma/ticket/11224-ascraeus | Joas Schilling | 2014-10-06 | 1 | -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 Darricau | 2014-10-03 | 1 | -2/+14 |
| | | | | | | | | | | | | | This reverts commit 40cd7570e6f4da7cc60d83a3e99c72a2fb99e3f7. | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-10-06 | 1 | -8/+70 |
| |\ \ \ | |/ / | | | | | | | | | | * develop-ascraeus: [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'" | ||||
| | * | | Merge pull request #3017 from nickvergessen/ticket/13033 | Nils Adermann | 2014-10-06 | 1 | -8/+70 |
| | |\ \ | | | | | | | | | [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'" | ||||
| | | * | | [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'" | Joas Schilling | 2014-10-02 | 1 | -8/+70 |
| | | |/ | | | | | | | | | | | | | | | | Caused by the solution of PHPBB3-12990 PHPBB3-13033 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-10-05 | 1 | -0/+2 |
| |\ \ \ | |/ / | |||||
| | * | | [ticket/12368] Always clean the cache prior to run the migrations | Tristan Darricau | 2014-10-05 | 1 | -0/+2 |
| | | | | | | | | | | | | | PHPBB3-12368 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-02 | 1 | -4/+42 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #2947 from rxu/ticket/13059 | Joas Schilling | 2014-10-02 | 1 | -4/+42 |
| | |\ \ | | |/ | |/| | | | | [ticket/13059] Add core event to generate_page_link() | ||||
| | | * | [ticket/13059] Add core event to generate_page_link() | rxu | 2014-10-01 | 1 | -4/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Add core event to generate_page_link() to allow overriding/modifying pagination URLs. Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=45905 PHPBB3-13059 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-01 | 1 | -14/+2 |
| |\ \ \ | |/ / | |||||
| | * | | [ticket/11224] Revert "Merge pull request #2460 from Nicofuma/ticket/11224" | Joas Schilling | 2014-10-01 | 1 | -14/+2 |
| | | | | | | | | | | | | | | | | | | | | | | This reverts commit d26436944173d1fa28a1abd96bca861381246860, reversing changes made to 75fcfb1c1d68f1632e7beae3f59699ddff8e5292. PHPBB3-11224 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-01 | 1 | -0/+51 |
| |\ \ \ | |/ / | |||||
 |
index : forums | |
| The forums.mageia.org Website | Maat [maat] |
| aboutsummaryrefslogtreecommitdiffstats |