aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'nickvergessen/ticket/11605' into developAndreas Fischer2013-06-111-31/+8
|\ | | | | | | | | | | * nickvergessen/ticket/11605: [ticket/11605] Remove unused copied_files property [ticket/11605] Use empty_dir to better delete files and dirs of extensions
| * [ticket/11605] Remove unused copied_files propertyJoas Schilling2013-06-111-8/+2
| | | | | | | | PHPBB3-11605
| * [ticket/11605] Use empty_dir to better delete files and dirs of extensionsJoas Schilling2013-06-111-23/+6
| | | | | | | | PHPBB3-11605
* | Merge remote-tracking branch 'nickvergessen/ticket/11599' into developAndreas Fischer2013-06-111-17/+42
|\ \ | |/ |/| | | | | * nickvergessen/ticket/11599: [ticket/11599] Copy the forums into a static array for later reuse
| * [ticket/11599] Copy the forums into a static array for later reuseJoas Schilling2013-06-111-17/+42
|/ | | | PHPBB3-11599
* Merge remote-tracking branch 'marc1706/ticket/11602' into developAndreas Fischer2013-06-112-2/+2
|\ | | | | | | | | * marc1706/ticket/11602: [ticket/11602] Do not call localize_errors() if avatars are disabled
| * [ticket/11602] Do not call localize_errors() if avatars are disabledMarc Alexander2013-06-112-2/+2
| | | | | | | | | | | | | | The avatar manager's method localize_errors() shouldn't be called if avatars are disabled in the config. PHPBB3-11602
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-112-3/+39
|\ \ | | | | | | | | | | | | | | | * develop-olympus: [ticket/11601] Add protected method for database sync and call it [ticket/11601] Split post_setup_synchronisation logic from xml parsing
| * \ Merge remote-tracking branch 'nickvergessen/ticket/11601' into develop-olympusAndreas Fischer2013-06-112-3/+39
| |\ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11601: [ticket/11601] Add protected method for database sync and call it [ticket/11601] Split post_setup_synchronisation logic from xml parsing
| | * | [ticket/11601] Add protected method for database sync and call itJoas Schilling2013-06-111-0/+15
| | | | | | | | | | | | | | | | PHPBB3-11601
| | * | [ticket/11601] Split post_setup_synchronisation logic from xml parsingJoas Schilling2013-06-111-3/+24
| | | | | | | | | | | | | | | | PHPBB3-11601
* | | | Merge remote-tracking branch 'nickvergessen/ticket/11550' into developAndreas Fischer2013-06-116-194/+88
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11550: [ticket/11550] Specify a valid path so it's clearer that it must be a path [ticket/11550] Move comments to correct function [ticket/11550] We use a different fixture set for extension_acp_test.php [ticket/11550] Fixtures should only be directories not files [ticket/11550] Use new functionality from the test case helpers [ticket/11550] Move functionality for copying/restoring to test case helpers [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
| * | | [ticket/11550] Specify a valid path so it's clearer that it must be a pathJoas Schilling2013-06-112-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11550
| * | | [ticket/11550] Move comments to correct functionJoas Schilling2013-06-116-40/+8
| | | | | | | | | | | | | | | | PHPBB3-11550
| * | | [ticket/11550] We use a different fixture set for extension_acp_test.phpJoas Schilling2013-06-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11550
| * | | [ticket/11550] Fixtures should only be directories not filesJoas Schilling2013-06-081-4/+3
| | | | | | | | | | | | | | | | PHPBB3-11550
| * | | [ticket/11550] Use new functionality from the test case helpersJoas Schilling2013-06-086-159/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of duplicating the extension copy code, it is now in the helpers. So we remove the code from existing tests. PHPBB3-11550
| * | | [ticket/11550] Move functionality for copying/restoring to test case helpersJoas Schilling2013-06-081-0/+44
| | | | | | | | | | | | | | | | PHPBB3-11550
| * | | [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.phpJoas Schilling2013-06-081-1/+4
| | | | | | | | | | | | | | | | PHPBB3-11550
* | | | Merge remote-tracking branch 'remotes/nickv/ticket/11481' into developNathan Guse2013-06-0715-1171/+1542
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11481: [ticket/11481] Move prepended slash from calls into function [ticket/11481] Remove globals and use dependency injection instead [ticket/11481] Use container for all classes and inject dependencies [ticket/11481] Move functions from feed into helper class [ticket/11481] Move active topics feed to own file [ticket/11481] Move topics feed to own file [ticket/11481] Move news feed to own file [ticket/11481] Move forums feed to own file [ticket/11481] Move topic feed to own file [ticket/11481] Move forum feed to own file [ticket/11481] Move overall feed to own file [ticket/11481] Move feed topic base to own file [ticket/11481] Move feed post base to own file [ticket/11481] Move feed base to own file [ticket/11481] Move feed factory to own file
| * | | | [ticket/11481] Move prepended slash from calls into functionJoas Schilling2013-06-066-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Remove globals and use dependency injection insteadJoas Schilling2013-06-0612-125/+157
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Use container for all classes and inject dependenciesJoas Schilling2013-06-069-34/+139
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Move functions from feed into helper classJoas Schilling2013-06-063-109/+167
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Move active topics feed to own fileJoas Schilling2013-06-062-123/+139
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Move topics feed to own fileJoas Schilling2013-06-062-77/+93
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Move news feed to own fileJoas Schilling2013-06-062-99/+115
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Move forums feed to own fileJoas Schilling2013-06-062-62/+78
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Move topic feed to own fileJoas Schilling2013-06-062-98/+114
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Move forum feed to own fileJoas Schilling2013-06-062-129/+145
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Move overall feed to own fileJoas Schilling2013-06-062-83/+99
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Move feed topic base to own fileJoas Schilling2013-06-062-45/+61
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Move feed post base to own fileJoas Schilling2013-06-062-43/+59
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Move feed base to own fileJoas Schilling2013-06-062-214/+230
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | [ticket/11481] Move feed factory to own fileJoas Schilling2013-06-062-88/+104
| | | | | | | | | | | | | | | | | | | | PHPBB3-11481
* | | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-06-070-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | * develop-olympus:
| * | | | Merge remote-tracking branch 'remotes/nickv/ticket/11543' into develop-olympusNathaniel Guse2013-06-072-0/+359
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11543: [ticket/11543] Add more users so #hidden <> #normal [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count()
* | | | | Merge remote-tracking branch 'remotes/nickv/ticket/develop/11543' into developNathaniel Guse2013-06-073-0/+353
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/develop/11543: [ticket/11543] Add more users so #hidden <> #normal [ticket/develop/11543] Use plurals in develop [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count()
| * | | | Merge branch 'ticket/11543' into ticket/develop/11543Joas Schilling2013-06-072-10/+21
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11543: [ticket/11543] Add more users so #hidden <> #normal Conflicts: tests/functions/obtain_online_test.php
| | * | | [ticket/11543] Add more users so #hidden <> #normalJoas Schilling2013-06-072-10/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| * | | | [ticket/develop/11543] Use plurals in developJoas Schilling2013-06-062-25/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| * | | | Merge branch 'ticket/11543' into ticket/develop/11543Joas Schilling2013-06-062-0/+348
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11543: [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count()
| | * | | [ticket/11543] Use correct IP addresses and inject time for correct valuesJoas Schilling2013-06-061-22/+25
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | * | | [ticket/11543] Add unit tests for obtain_users_online_string()Joas Schilling2013-06-062-1/+185
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | * | | [ticket/11543] Add unit tests for obtain_users_online() with empty forumJoas Schilling2013-06-061-0/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | * | | [ticket/11543] Add unit tests for obtain_users_online()Joas Schilling2013-06-061-0/+65
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | * | | [ticket/11543] Add unit tests for obtain_guest_count()Joas Schilling2013-06-062-0/+80
| | | | | | | | | | | | | | | | | | | | PHPBB3-11543
* | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-06-061-0/+20
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling (1) and Nils Adermann (1) * remotes/upstream/develop-olympus: [ticket/11590] Close database connections when tearDown() is called
| * | | | Merge pull request #1466 from nickvergessen/ticket/11590Nils Adermann2013-06-061-0/+20
| |\ \ \ \ | | | | | | | | | | | | [ticket/11590] Close database connections when tearDown() is called
| | * | | | [ticket/11590] Close database connections when tearDown() is calledJoas Schilling2013-06-071-0/+20
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11590
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-04 13:13:06 +0000