aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-073-9/+47
|\ | | | | | | | | | | | | * develop-ascraeus: [ticket/12873] Add migration to rename the index [ticket/12873] Don not touch the existing migrations [ticket/12873] Test the good identifier in \phpbb\db\tools
| * Merge pull request #2761 from Nicofuma/ticket/12873Joas Schilling2014-08-073-9/+47
| |\ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12873] Test the correct identifier in \phpbb\db\tools * Nicofuma/ticket/12873: [ticket/12873] Add migration to rename the index [ticket/12873] Don not touch the existing migrations [ticket/12873] Test the good identifier in \phpbb\db\tools
| | * [ticket/12873] Add migration to rename the indexTristan Darricau2014-08-072-8/+46
| | | | | | | | | | | | PHPBB3-12873
| | * [ticket/12873] Don not touch the existing migrationsTristan Darricau2014-08-071-1/+1
| | | | | | | | | | | | PHPBB3-12873
| | * [ticket/12873] Test the good identifier in \phpbb\db\toolsTristan Darricau2014-07-203-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | We need to rename the index key because with the default prefix (phpbb_) this key has a length of 31. And because we don't accept the keys longer than 30 characters we should ensure that by default no key is longer than 30 characters. PHPBB3-12873
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-0710-33/+49
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12738] Update constructor docblock [ticket/12738] Add $config to constructor in notification test [ticket/12738] Fix tests with new config object injection [ticket/12738] Inject config object into content_visibility class [ticket/11528] Move related code from functions_posting to function
| * | Merge pull request #2623 from dhruvgoel92/ticket/12738Tristan Darricau2014-08-0710-33/+49
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12738] Move related code from functions_posting to function * dhruvgoel92/ticket/12738: [ticket/12738] Update constructor docblock [ticket/12738] Add $config to constructor in notification test [ticket/12738] Fix tests with new config object injection [ticket/12738] Inject config object into content_visibility class [ticket/11528] Move related code from functions_posting to function
| | * | [ticket/12738] Update constructor docblockDhruv2014-07-211-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12738
| | * | [ticket/12738] Add $config to constructor in notification testDhruv2014-06-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12738
| | * | [ticket/12738] Fix tests with new config object injectionDhruv2014-06-206-8/+15
| | | | | | | | | | | | | | | | PHPBB3-12738
| | * | [ticket/12738] Inject config object into content_visibility classDhruv2014-06-202-5/+13
| | | | | | | | | | | | | | | | PHPBB3-12738
| | * | [ticket/11528] Move related code from functions_posting to functionDhruv2014-06-192-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move related code from functions_posting to remove_post_from_statistic() in content_visibility.php PHPBB3-11528
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-071-4/+39
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/12776] Add section about 3.0.x to 3.1.x update to INSTALL.html
| * | | Merge remote-tracking branch 'github-nickvergessen/ticket/12776' into ↵Nils Adermann2014-08-071-4/+39
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12776: [ticket/12776] Add section about 3.0.x to 3.1.x update to INSTALL.html
| | * | | [ticket/12776] Add section about 3.0.x to 3.1.x update to INSTALL.htmlJoas Schilling2014-08-071-4/+39
| | | | | | | | | | | | | | | | | | | | PHPBB3-12776
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-073-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12826] Add optional root namespace indicator for consistency. [ticket/12826] Add mandatory root namespace indicator to exception catching.
| * | | | Merge pull request #2812 from bantu/ticket/12826Joas Schilling2014-08-073-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12826] Add root namespace indicator to exception catching. * bantu/ticket/12826: [ticket/12826] Add optional root namespace indicator for consistency. [ticket/12826] Add mandatory root namespace indicator to exception catching.
| | * | | | [ticket/12826] Add optional root namespace indicator for consistency.Andreas Fischer2014-08-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12826
| | * | | | [ticket/12826] Add mandatory root namespace indicator to exception catching.Andreas Fischer2014-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12826
* | | | | | Merge branch 'develop-ascraeus' into developCesar G2014-08-076-12/+22
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12832] Remove old .quick-links icon reference [ticket/12832] Remove unnecessary attr and classes [ticket/12832] Add footer links to quick-links [ticket/12832] Make .small-icon styling uniform
| * | | | | Merge remote-tracking branch 'PayBas/ticket/12832' into develop-ascraeusCesar G2014-08-076-12/+22
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12832: [ticket/12832] Remove old .quick-links icon reference [ticket/12832] Remove unnecessary attr and classes [ticket/12832] Add footer links to quick-links [ticket/12832] Make .small-icon styling uniform
| | * | | | | [ticket/12832] Remove old .quick-links icon referencePayBas2014-07-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12832
| | * | | | | [ticket/12832] Remove unnecessary attr and classesPayBas2014-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12832
| | * | | | | [ticket/12832] Add footer links to quick-linksPayBas2014-07-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12832
| | * | | | | [ticket/12832] Make .small-icon styling uniformPayBas2014-07-074-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12832
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-074-15/+98
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12838] Simplify normal special rank array creation [ticket/12838] Update RC2 to RC3 [ticket/12838] Update events.md to RC3 [ticket/12838] Allow for extra columns in cache obtain_ranks() [ticket/12838] Add raw row-data to acp_ranks core event [ticket/12838] Simplify special rank template conditional [ticket/12838] Add core events to acp_ranks.php [ticket/12838] Update events.md [ticket/12838] Add _before versions [ticket/12838] Add template events to acp_ranks.html
| * | | | | | Merge pull request #2720 from PayBas/ticket/12838Joas Schilling2014-08-074-15/+98
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12838] Add ACP events to acp_ranks * PayBas/ticket/12838: [ticket/12838] Simplify normal special rank array creation [ticket/12838] Update RC2 to RC3 [ticket/12838] Update events.md to RC3 [ticket/12838] Allow for extra columns in cache obtain_ranks() [ticket/12838] Add raw row-data to acp_ranks core event [ticket/12838] Simplify special rank template conditional [ticket/12838] Add core events to acp_ranks.php [ticket/12838] Update events.md [ticket/12838] Add _before versions [ticket/12838] Add template events to acp_ranks.html
| | * | | | | | [ticket/12838] Simplify normal special rank array creationPayBas2014-08-071-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| | * | | | | | [ticket/12838] Update RC2 to RC3PayBas2014-07-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| | * | | | | | [ticket/12838] Update events.md to RC3PayBas2014-07-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| | * | | | | | [ticket/12838] Allow for extra columns in cache obtain_ranks()PayBas2014-07-101-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| | * | | | | | [ticket/12838] Add raw row-data to acp_ranks core eventPayBas2014-07-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| | * | | | | | [ticket/12838] Simplify special rank template conditionalPayBas2014-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| | * | | | | | [ticket/12838] Add core events to acp_ranks.phpPayBas2014-07-101-5/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| | * | | | | | [ticket/12838] Update events.mdPayBas2014-07-101-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| | * | | | | | [ticket/12838] Add _before versionsPayBas2014-07-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| | * | | | | | [ticket/12838] Add template events to acp_ranks.htmlPayBas2014-07-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-073-22/+63
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12920] Add missing comma [ticket/12920] Update composer.lock file after update nothing [ticket/12920] Fix sh syntax error in post-update-cmd script [ticket/12920] Remove incorrect @ from self.version reference in composer.json [ticket/12920] Output warning message about vendor cleaning target [ticket/12920] Turn phpBB composer.json into publishable full version [ticket/12920] Add require for minimum php version [ticket/12920] Add composer.json for phpbb/phpbb-core library
| * | | | | | | Merge pull request #2813 from naderman/ticket/12920Joas Schilling2014-08-073-22/+63
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12920] Add composer.json to phpBB/phpbb and fix the one in phpBB/ * naderman/ticket/12920: [ticket/12920] Add missing comma [ticket/12920] Update composer.lock file after update nothing [ticket/12920] Fix sh syntax error in post-update-cmd script [ticket/12920] Remove incorrect @ from self.version reference in composer.json [ticket/12920] Output warning message about vendor cleaning target [ticket/12920] Turn phpBB composer.json into publishable full version [ticket/12920] Add require for minimum php version [ticket/12920] Add composer.json for phpbb/phpbb-core library
| | * | | | | | [ticket/12920] Add missing commaNils Adermann2014-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| | * | | | | | [ticket/12920] Update composer.lock file after update nothingNils Adermann2014-08-071-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| | * | | | | | [ticket/12920] Fix sh syntax error in post-update-cmd scriptNils Adermann2014-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| | * | | | | | [ticket/12920] Remove incorrect @ from self.version reference in composer.jsonNils Adermann2014-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| | * | | | | | [ticket/12920] Output warning message about vendor cleaning targetNils Adermann2014-08-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| | * | | | | | [ticket/12920] Turn phpBB composer.json into publishable full versionNils Adermann2014-08-071-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| | * | | | | | [ticket/12920] Add require for minimum php versionNils Adermann2014-08-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| | * | | | | | [ticket/12920] Add composer.json for phpbb/phpbb-core libraryNils Adermann2014-08-071-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-071-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12918] Load class fileupload in fileupload_remote_test.php.
| * | | | | | | Merge pull request #2811 from bantu/ticket/12918Joas Schilling2014-08-071-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12918] Load class fileupload in fileupload_remote_test.php. * bantu/ticket/12918: [ticket/12918] Load class fileupload in fileupload_remote_test.php.
| | * | | | | | | [ticket/12918] Load class fileupload in fileupload_remote_test.php.Andreas Fischer2014-08-071-0/+2
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-12918