aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2013-10-020-0/+0
|\
| * Merge remote-tracking branch 'cyberalien/ticket/11879' into develop-olympusAndreas Fischer2013-10-021-1/+1
| |\
| | * [ticket/11879] Replace .live() with .on()Vjacheslav Trushkin2013-10-021-1/+1
* | | Merge pull request #1744 from EXreaction/ticket/11878Joas Schilling2013-10-011-2/+2
|\ \ \
| * | | [ticket/11878] Missing leading \ in dependencies in soft_delete_mcp_modulesNathan Guse2013-10-021-2/+2
|/ / /
* | | Merge pull request #1735 from nickvergessen/ticket/11852Nathan Guse2013-09-3027-292/+285
|\ \ \
| * | | [ticket/11852] Add class fileJoas Schilling2013-09-271-0/+175
| * | | [ticket/11852] Move tests to folder with new class nameJoas Schilling2013-09-261-2/+2
| * | | [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-2626-290/+108
* | | | Merge branch 'develop-olympus' into developNils Adermann2013-09-303-15/+18
|\ \ \ \ | | |/ / | |/| |
| * | | [ticket/11876] Replace MD5 with SHA256.Andreas Fischer2013-09-301-1/+1
| * | | [ticket/11876] Move checksum generation from build PHP files to phing build.xmlAndreas Fischer2013-09-303-15/+18
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-301-1/+1
|\ \ \ \ | |/ / /
| * | | [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.Andreas Fischer2013-09-301-1/+1
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-283-0/+16
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-283-0/+16
| |\ \ \ | | |_|/ | |/| |
| | * | [prep-release-3.0.12] Update changelog for 3.0.12 release.Andreas Fischer2013-09-281-0/+1
| | * | Merge branch 'ticket/11873' into prep-release-3.0.12Andreas Fischer2013-09-282-0/+15
| | |\ \
| | | * | [ticket/11873] Add unit test for large password input.Joas Schilling2013-09-281-0/+8
| | | * | [ticket/11873] Do not hash very large passwords in order to safe resources.Joas Schilling2013-09-281-0/+7
| | |/ /
* | | | Merge remote-tracking branch 'Marc/ticket/11862' into developJoas Schilling2013-09-271-2/+2
|\ \ \ \
| * | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-271-2/+2
|/ / / /
* | | | Merge remote-tracking branch 'Marc/ticket/11862' into developJoas Schilling2013-09-271-8/+10
|\ \ \ \
| * | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-251-8/+10
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-271-2/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.Andreas Fischer2013-09-271-3/+3
| * | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-272-2/+8
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [prep-release-3.0.12] Bumping version number for 3.0.12 final.Andreas Fischer2013-09-274-5/+11
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-261-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'marc1706/ticket/11864' into develop-olympusAndreas Fischer2013-09-261-1/+0
| |\ \ \ \
| | * | | | [ticket/11864] Do not call exit after display_progress_bar in acp_forumsMarc Alexander2013-09-251-1/+0
| |/ / / /
* | | | | Merge remote-tracking branch 'cyberalien/ticket/11868' into developAndreas Fischer2013-09-264-7/+59
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | [ticket/11868] Add @depends to testVjacheslav Trushkin2013-09-261-0/+3
| * | | | Merge pull request #3 from nickvergessen/ticket/cyberalien/11868Vjacheslav Trushkin2013-09-261-0/+49
| |\ \ \ \
| | * | | | [ticket/11868] Add functional test for registrationJoas Schilling2013-09-261-0/+49
| |/ / / /
| * | | | [ticket/11868] Replace phpbb_request_interface referencesVjacheslav Trushkin2013-09-263-7/+7
* | | | | Merge remote-tracking branch 'EXreaction/ticket/11816-2' into developJoas Schilling2013-09-263-5/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/11816] Fix multiple parenthesis as well before $VARs in templatesNathan Guse2013-09-193-5/+8
* | | | | Merge pull request #1733 from nickvergessen/ticket/11866David King2013-09-258-34/+10
|\ \ \ \ \
| * | | | | [ticket/11866] Only single backslash in .md filesJoas Schilling2013-09-261-1/+1
| * | | | | [ticket/11866] Remove outdated and broken develop scriptJoas Schilling2013-09-261-24/+0
| * | | | | [ticket/11866] More namespacesJoas Schilling2013-09-262-5/+5
| * | | | | [ticket/11866] Update some occurances of phpbb_db_ to new NamespaceJoas Schilling2013-09-265-5/+5
* | | | | | Merge pull request #1732 from nickvergessen/ticket/11865David King2013-09-252-3/+3
|\ \ \ \ \ \
| * | | | | | [ticket/11865] Convert old class name to namespaced versionJoas Schilling2013-09-261-1/+1
| * | | | | | [ticket/11865] Add bbcodes to functional posting testsJoas Schilling2013-09-261-2/+2
| |/ / / / /
* | | | | | Merge pull request #1673 from nickvergessen/ticket/11805Nathan Guse2013-09-254-13/+170
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/11805] Move page-url generating code into a new functionJoas Schilling2013-09-251-28/+29
| * | | | | [ticket/11805] Rename test to match the function nameJoas Schilling2013-09-251-1/+1
| * | | | | [ticket/11805] Add unit tests for paginationJoas Schilling2013-09-252-0/+123