| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-10-25 | 1 | -1/+27 |
| |\ | | | | | | | | | | | | | * develop-ascraeus: [ticket/13207] Add notification manager mock to user_add method in tests [ticket/13207] Move default user notifications settings to user_add() [ticket/13207] Add default subscription options for newly registered users | ||||
| | * | [ticket/13207] Move default user notifications settings to user_add() | Marc Alexander | 2014-10-25 | 2 | -14/+18 |
| | | | | | | | | | PHPBB3-13207 | ||||
| | * | [ticket/13207] Add default subscription options for newly registered users | Marc Alexander | 2014-10-25 | 2 | -2/+24 |
| | | | | | | | | | PHPBB3-13207 | ||||
| | * | [ticket/13215] Update Symfony components to v2.3.21. | Andreas Fischer | 2014-10-25 | 1 | -75/+76 |
| | | | | | | | | | PHPBB3-13215 | ||||
| | * | Merge commit '078e0c1e440f7f906b670348e8da00141e245876' into prep-release-3.1.0 | Nils Adermann | 2014-10-25 | 10 | -57/+332 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 develop | Nils Adermann | 2014-10-25 | 10 | -57/+332 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 10 | -57/+332 |
| | |\ \ \ | | |/ / | |/| / | | |/ | [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 | 3 | -9/+14 |
| | | | | | | | | | | | | | 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 | 2 | -1/+96 |
| | | | | | | | | | | | | | PHPBB3-13211 | ||||
| | | * | Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211 | Marc Alexander | 2014-10-24 | 8 | -56/+231 |
| | | |\ | |||||
| | | | * | [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 | 5 | -57/+125 |
| | | | | | | | | | | | | | | | | | PHPBB3-13126 | ||||
| | | | * | [ticket/13126] Improve the feedback when running the migrations | Tristan Darricau | 2014-10-14 | 5 | -56/+147 |
| | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | Merge pull request #3061 from Elsensee/ticket/13210 | Andreas Fischer | 2014-10-25 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13210] Use the correct config value * Elsensee/ticket/13210: [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 | Andreas Fischer | 2014-10-25 | 2 | -35/+38 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13208] Add security issues to the final changelog [prep-release-3.1.0] Prepare Changelog [prep-release-3.1.0] Update version to 3.1.0 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] Prepare Changelog | Joas Schilling | 2014-10-23 | 1 | -34/+37 |
| | | | | | |||||
| | * | | | [prep-release-3.1.0] Update version to 3.1.0 | Joas Schilling | 2014-10-23 | 5 | -7/+7 |
| | |/ / | |||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-23 | 4 | -35/+103 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | 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] Update phpBB Version for RC7 development | Joas Schilling | 2014-10-23 | 2 | -2/+2 |
| | | | | |||||
| | * | | [prep-release-3.1.0-RC6] Add changelog for 3.1.0-RC6 | Joas Schilling | 2014-10-23 | 1 | -0/+35 |
| | | | | |||||
| | * | | [prep-release-3.1.0-RC6] Prepare Changelog | Joas Schilling | 2014-10-23 | 1 | -33/+36 |
| | | | | |||||
| | * | | [prep-release-3.1.0-RC6] Add migration for 3.1.0-RC6 | Joas Schilling | 2014-10-23 | 1 | -0/+31 |
| | | | | |||||
| | * | | [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6 | Joas Schilling | 2014-10-23 | 5 | -7/+7 |
| | | | | |||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-10-23 | 1 | -5/+14 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #3 from phpbb/ticket/security-161 | Joas Schilling | 2014-10-23 | 1 | -5/+14 |
| | |\ \ | | | | | | | | | | | | | [ticket/security-161] Add form token to styles management form. | ||||
| | | * | | [ticket/security-161] Add form token to styles management form. | Cesar G | 2014-10-22 | 1 | -5/+14 |
| | | | | | | | | | | | | | | | | | SECURITY-161 | ||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-10-22 | 4 | -1/+44 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge pull request #3058 from naderman/ticket/13205 | Marc Alexander | 2014-10-22 | 4 | -1/+44 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/13205] Add a mark all messages read link to PM folders | ||||
| | | * | | | [ticket/13205] Explicitly cast ids to integers and reformat SQL | Nils Adermann | 2014-10-22 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13205 | ||||
| | | * | | | [ticket/13205] Remove superfluous newline | Nils Adermann | 2014-10-22 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13205 | ||||
| | | * | | | [ticket/13205] Add a mark all messages read link to PM folders | Nils Adermann | 2014-10-22 | 4 | -1/+45 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13205 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-10-22 | 1 | -2/+7 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/security-159] Only show first 8 characters of login keys in UCP | ||||
| | * | | | | [ticket/security-159] Only show first 8 characters of login keys in UCP | Marc Alexander | 2014-10-22 | 1 | -2/+7 |
| | |/ / / | | | | | | | | | | | | | SECURITY-159 | ||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Nils Adermann | 2014-10-22 | 12 | -12/+38 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | * 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 | 11 | -12/+18 |
| | | | | | | | | | | | | | | | | | 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 | Marc Alexander | 2014-10-21 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'develop-olympus' into develop-ascraeus | Marc Alexander | 2014-10-21 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/docs/AUTHORS | ||||
| | | * | | | [ticket/12120] Remove EXreaction from active authors | Joas Schilling | 2014-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12120 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-10-21 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge pull request #3053 from Senky/ticket/13194 | Marc Alexander | 2014-10-21 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13194] BBCode isn't parsed when issuing a warning for a post | ||||
| | | * | | | | [ticket/13194] Use correct array to access bbcode_bitfield | Jakub Senko | 2014-10-21 | 1 | -1/+1 |
| | | | |_|/ | | |/| | | | | | | | | | | | | PHPBB3-13194 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-10-21 | 1 | -32/+44 |
| |\ \ \ \ \ | |/ / / / | |||||
 |
index : forums | |
| The forums.mageia.org Website | Maat [maat] |
| aboutsummaryrefslogtreecommitdiffstats |