aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1704 from dhruvgoel92/ticket/11344Nathan Guse2013-10-031-0/+42
|\ | | | | [ticket/11344] Add migration to remove acp_style_components module in 3.1
| * [ticket/11344] Upgrade migration to namespacesDhruv2013-10-031-2/+4
| | | | | | | | PHPBB3-11344
| * [ticket/11344] Fix url of licenseDhruv2013-10-031-1/+1
| | | | | | | | PHPBB3-11344
| * [ticket/11344] Add migration to remove acp_style_components module in 3.1Dhruv2013-10-031-0/+40
| | | | | | | | PHPBB3-11344
* | Merge branch 'develop-olympus' into developNathan Guse2013-10-032-0/+110
|\ \ | | | | | | | | | | | | * develop-olympus: [ticket/11877] Create package links and checksums for announcement via script.
| * \ Merge remote-tracking branch 'remotes/bantu/ticket/11877' into develop-olympusNathan Guse2013-10-032-0/+110
| |\ \ | | | | | | | | | | | | | | | | * remotes/bantu/ticket/11877: [ticket/11877] Create package links and checksums for announcement via script.
| | * | [ticket/11877] Create package links and checksums for announcement via script.Andreas Fischer2013-10-012-0/+110
| | | | | | | | | | | | | | | | PHPBB3-11877
* | | | Merge pull request #1654 from rechosen/ticket/11786Nathan Guse2013-10-037-17/+17
|\ \ \ \ | | | | | | | | | | [ticket/11786] Fix various defects in PHPDoc in-code documentation
| * | | | [ticket/11786] Fix indentation in the PHPDoc of core.group_delete_user_beforerechosen2013-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The core.group_delete_user_before event had bad indentation in its PHPDoc. Fixed. PHPBB3-11786
| * | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786rechosen2013-09-23241-5537/+8041
| |\ \ \ \
| * | | | | [ticket/11786] Further improve wording in phpbb/notification/type/quote.phprechosen2013-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further improve wording in phpbb/notification/type/quote.php per suggestion of imkingdavid. PHPBB3-11786
| * | | | | [ticket/11786] s/@return void/@return null in content_visibility.phprechosen2013-08-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file phpbb/content_visibility.php still contained a few instances of '@return void' in its PHPDoc blocks, fixed. Thanks to JoshyPHP for reporting. PHPBB3-11786
| * | | | | [ticket/11786] Fix PHPDoc documentation of a few eventsrechosen2013-08-133-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some PHPDoc errors I noticed while working on the karma extension. Mostly spacing issues or omitted characters, though there was one description that made no sense at all. PHPBB3-11786
| * | | | | [ticket/11786] Fix typo and ugly English in the notification system PHPDocrechosen2013-08-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The notification system contained two PHPDoc lines that needed improvement. PHPBB3-11786
* | | | | | Merge pull request #1746 from EXreaction/ticket/11882David King2013-10-032-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/11882] Incorrect dependency in signature module auth migration
| * | | | | | [ticket/11882] If dependency is incorrect/unfulfillable, throw an errorNathan2013-10-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11882
| * | | | | | [ticket/11882] Incorrect dependency in signature module auth migrationNathan2013-10-021-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-11882
* | | | | | Merge pull request #1726 from EXreaction/ticket/11850David King2013-10-038-44/+141
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix $user->page on pages through the controller
| * | | | | | [ticket/11850] More namespacesNathan Guse2013-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11850
| * | | | | | [ticket/11850] More namespacesNathan Guse2013-09-303-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11850
| * | | | | | [ticket/11850] Fix testsNathan Guse2013-09-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11850
| * | | | | | [ticket/11850] Need symfony request and filesystem setup globally for sessionNathan Guse2013-09-302-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11850
| * | | | | | [ticket/11850] Update for namespacesNathan Guse2013-09-303-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11850
| * | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850Nathan Guse2013-09-30503-2454/+3546
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nils Adermann (68) and others # Via Andreas Fischer (12) and others * 'develop' of github.com:phpbb/phpbb3: (102 commits) [ticket/11876] Replace MD5 with SHA256. [ticket/11876] Move checksum generation from build PHP files to phing build.xml [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. [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. [ticket/11862] Correct var names in user_delete() events due to prune-users [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. [ticket/11852] Add class file [ticket/11852] Move tests to folder with new class name [ticket/11852] Split filesystem and path_helper into 2 classes [ticket/11868] Add @depends to test [ticket/11868] Add functional test for registration [ticket/11868] Replace phpbb_request_interface references [ticket/11866] Only single backslash in .md files [ticket/11866] Remove outdated and broken develop script [ticket/11866] More namespaces [ticket/11866] Update some occurances of phpbb_db_ to new Namespace [ticket/11865] Convert old class name to namespaced version ... Conflicts: tests/security/extract_current_page_test.php tests/session/testable_facade.php
| * | | | | | | [ticket/11850] Fix extract current page testNathan Guse2013-09-192-11/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11850
| * | | | | | | [ticket/11850] Add test for outside of the phpBB directoryNathan Guse2013-09-181-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11850
| * | | | | | | [ticket/11850] page_name contains controller request rather than query stringNathan Guse2013-09-174-33/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing tests PHPBB3-11850
| * | | | | | | [ticket/11850] Fix $user->page on pages through the controllerNathan Guse2013-09-171-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11850
* | | | | | | | Merge pull request #1736 from bantu/ticket/11870Nathan Guse2013-10-033-6/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | [ticket/11870] No longer exclude search/fulltext_*.php from code coverag...
| * | | | | | | [ticket/11870] No longer exclude search/fulltext_*.php from code coverage.Andreas Fischer2013-09-263-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11870
* | | | | | | | 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