aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11883] Only output the migration time, not totalNathan Guse2013-10-041-3/+3
| | | | PHPBB3-11883
* [ticket/11883] Report completed data step in migration as "Installing Data"Nathan2013-10-023-6/+20
| | | | PHPBB3-11883
* Merge remote-tracking branch 'nickvergessen/ticket/11691' into developDhruv2013-10-024-19/+63
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11691: [ticket/11691] Fix conversion test [ticket/11691] Fix table names and arguments/docs [ticket/11691] Move purge code into new function [ticket/11691] Fix typo in comment [ticket/11691] Add order by to the query [ticket/11691] Fix some minor comments [ticket/11691] Fix some more problems with softdelete update [ticket/11691] Change detection of effectively_installed() [ticket/11691] Stagger user notification reconversion even more [ticket/11691] Stagger the convertion of soft delete updates
| * [ticket/11691] Fix conversion testJoas Schilling2013-10-011-1/+1
| | | | | | | | PHPBB3-11691
| * [ticket/11691] Fix table names and arguments/docsJoas Schilling2013-09-261-8/+8
| | | | | | | | PHPBB3-11691
| * [ticket/11691] Move purge code into new functionJoas Schilling2013-09-261-7/+7
| | | | | | | | PHPBB3-11691
| * [ticket/11691] Fix typo in commentJoas Schilling2013-09-261-1/+1
| | | | | | | | PHPBB3-11691
| * [ticket/11691] Add order by to the queryJoas Schilling2013-09-261-1/+2
| | | | | | | | PHPBB3-11691
| * [ticket/11691] Fix some minor commentsJoas Schilling2013-09-261-4/+3
| | | | | | | | PHPBB3-11691
| * [ticket/11691] Fix some more problems with softdelete updateJoas Schilling2013-09-261-4/+9
| | | | | | | | | | | | | | | | * wrong order of arguments on sql_query_limit * avoid "BIGINT UNSIGNED value is out of range" errors * increase limit for the loop PHPBB3-11691
| * [ticket/11691] Change detection of effectively_installed()Joas Schilling2013-09-261-1/+3
| | | | | | | | | | | | | | When start is set for a migration, it is not yet effectively installed. So we just continue doing it... PHPBB3-11691
| * [ticket/11691] Stagger user notification reconversion even moreJoas Schilling2013-09-261-7/+24
| | | | | | | | PHPBB3-11691
| * [ticket/11691] Stagger the convertion of soft delete updatesJoas Schilling2013-09-261-3/+23
| | | | | | | | PHPBB3-11691
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-10-020-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11879] Replace .live() with .on() Conflicts: phpBB/styles/prosilver/template/forum_fn.js
| * \ Merge remote-tracking branch 'cyberalien/ticket/11879' into develop-olympusAndreas Fischer2013-10-021-1/+1
| |\ \ | | | | | | | | | | | | | | | | * cyberalien/ticket/11879: [ticket/11879] Replace .live() with .on()
| | * | [ticket/11879] Replace .live() with .on()Vjacheslav Trushkin2013-10-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11879
* | | | Merge pull request #1744 from EXreaction/ticket/11878Joas Schilling2013-10-011-2/+2
|\ \ \ \ | | | | | | | | | | [ticket/11878] Missing leading \ in dependencies in soft_delete_mcp_modules
| * | | | [ticket/11878] Missing leading \ in dependencies in soft_delete_mcp_modulesNathan Guse2013-10-021-2/+2
|/ / / / | | | | | | | | | | | | PHPBB3-11878
* | | | Merge pull request #1735 from nickvergessen/ticket/11852Nathan Guse2013-09-3027-292/+285
|\ \ \ \ | | | | | | | | | | Ticket/11852 filesystem class must not depend on a web request
| * | | | [ticket/11852] Add class fileJoas Schilling2013-09-271-0/+175
| | | | | | | | | | | | | | | | | | | | PHPBB3-11852
| * | | | [ticket/11852] Move tests to folder with new class nameJoas Schilling2013-09-261-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11852
| * | | | [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-2626-290/+108
| | | | | | | | | | | | | | | | | | | | PHPBB3-11852
* | | | | Merge branch 'develop-olympus' into developNils Adermann2013-09-303-15/+18
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11876] Replace MD5 with SHA256. [ticket/11876] Move checksum generation from build PHP files to phing build.xml
| * | | | [ticket/11876] Replace MD5 with SHA256.Andreas Fischer2013-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11876
| * | | | [ticket/11876] Move checksum generation from build PHP files to phing build.xmlAndreas Fischer2013-09-303-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also removes paths from the checksum files. PHPBB3-11876
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-301-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. Conflicts: build/build.xml
| * | | | [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
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.12] Update changelog for 3.0.12 release. [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources.
| * | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-283-0/+16
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Update changelog for 3.0.12 release. [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources.
| | * | | [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: [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources.
| | | * | | [ticket/11873] Add unit test for large password input.Joas Schilling2013-09-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The password should be rejected quite fast. PHPBB3-11873
| | | * | | [ticket/11873] Do not hash very large passwords in order to safe resources.Joas Schilling2013-09-281-0/+7
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-11873
* | | | | Merge remote-tracking branch 'Marc/ticket/11862' into developJoas Schilling2013-09-271-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11862: [ticket/11862] Correct var names in user_delete() events due to prune-users
| * | | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-271-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fix comments after incorrect merge of previous PR. PHPBB3-11862
* | | | | Merge remote-tracking branch 'Marc/ticket/11862' into developJoas Schilling2013-09-271-8/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11862: [ticket/11862] Correct var names in user_delete() events due to prune-users
| * | | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-251-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prune-users feature modified the names of the used variables in this function. However, the variable names for the two events in this function were not changed to reflect that. This patch will take care of it. PHPBB3-11862
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-271-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag. [prep-release-3.0.12] Bumping version number for 3.0.12 final. Conflicts: build/build.xml phpBB/install/database_update.php
| * | | | | [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: [prep-release-3.0.12] Bumping version number for 3.0.12 final. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * | | | [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
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11864] Do not call exit after display_progress_bar in acp_forums
| * | | | | Merge remote-tracking branch 'marc1706/ticket/11864' into develop-olympusAndreas Fischer2013-09-261-1/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11864: [ticket/11864] Do not call exit after display_progress_bar in acp_forums
| | * | | | | [ticket/11864] Do not call exit after display_progress_bar in acp_forumsMarc Alexander2013-09-251-1/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The progress bar is called with the method display_progress_bar() in the acp_forums files. This method then call adm_page_footer() which also calls exit_handler(). Therefore, the exit; in acp_forums after $this->display_progress_bar() is obsolete and shouldn't exist in the first place. PHPBB3-11864
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/11868' into developAndreas Fischer2013-09-264-7/+59
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11868: [ticket/11868] Add @depends to test [ticket/11868] Add functional test for registration [ticket/11868] Replace phpbb_request_interface references
| * | | | | [ticket/11868] Add @depends to testVjacheslav Trushkin2013-09-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11868
| * | | | | Merge pull request #3 from nickvergessen/ticket/cyberalien/11868Vjacheslav Trushkin2013-09-261-0/+49
| |\ \ \ \ \ | | | | | | | | | | | | | | Ticket/cyberalien/11868
| | * | | | | [ticket/11868] Add functional test for registrationJoas Schilling2013-09-261-0/+49
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11868
| * | | | | [ticket/11868] Replace phpbb_request_interface referencesVjacheslav Trushkin2013-09-263-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11868
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/11816-2' into developJoas Schilling2013-09-263-5/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | * EXreaction/ticket/11816-2: [ticket/11816] Fix multiple parenthesis as well before $VARs in templates
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-17 12:35:41 +0000