Andreas Fischer
f1fb555ea3
Merge remote-tracking branch 'imkingdavid/ticket/11086' into develop
...
* imkingdavid/ticket/11086:
[ticket/11086] Move DI processing below $request definition
[ticket/11086] Fix database_update.php to use Dependency Injection Container
2012-09-14 13:34:23 +02:00
Andreas Fischer
d221f2901a
Merge remote-tracking branch 'igorw/ticket/11101' into develop
...
* igorw/ticket/11101:
[ticket/11101] Delay execution of container processors
2012-09-14 13:34:21 +02:00
Andreas Fischer
635a58a7e2
Merge remote-tracking branch 'bantu/ticket/11109' into develop
...
* bantu/ticket/11109:
[ticket/11109] Re-add file conflict checks to compress class
2012-09-14 01:27:48 +02:00
Fyorl
b24ee89cfc
[ticket/11109] Re-add file conflict checks to compress class
...
PHPBB3-11109
2012-09-14 01:26:33 +02:00
Andreas Fischer
91423880da
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11045] Removed file conflict tests for compress class
[ticket/11045] Replaced __DIR__ with dirname(__FILE__)
[ticket/11045] Opening brace on its own line
[ticket/11045] Explicitely check for zlib and bz2
[ticket/11045] Added tests for file conflicts
[ticket/11045] Added unit tests for the compress class
2012-09-14 00:49:48 +02:00
Andreas Fischer
888aa47b0e
Merge remote-tracking branch 'Fyorl/ticket/11045' into develop-olympus
...
* Fyorl/ticket/11045:
[ticket/11045] Removed file conflict tests for compress class
[ticket/11045] Replaced __DIR__ with dirname(__FILE__)
[ticket/11045] Opening brace on its own line
[ticket/11045] Explicitely check for zlib and bz2
[ticket/11045] Added tests for file conflicts
[ticket/11045] Added unit tests for the compress class
2012-09-14 00:46:04 +02:00
David King
298fa894e7
[ticket/11086] Move DI processing below $request definition
...
As per PR #991 (ticket/11101).
PHPBB3-11086
2012-09-13 16:56:09 -04:00
David King
503989979a
[ticket/11086] Fix database_update.php to use Dependency Injection Container
...
PHPBB3-11086
2012-09-13 16:44:26 -04:00
Fyorl
ce7cffcf9e
[ticket/11045] Removed file conflict tests for compress class
...
PHPBB3-11045
2012-09-11 09:42:29 +01:00
David King
8a91598b14
Merge remote-tracking branch 'nickvergessen/ticket/10876' into develop
2012-09-08 15:58:25 -04:00
Igor Wiedler
d543f0ffb1
[ticket/11101] Delay execution of container processors
...
Also fix the name of the ext processor service.
PHPBB3-11101
2012-09-08 14:41:41 +02:00
Andreas Fischer
23b00d393c
Merge remote-tracking branch 'EXreaction/ticket/11092' into develop
...
* EXreaction/ticket/11092:
[ticket/11092] phpbb_gen_download_links strict standards errors
2012-09-08 00:49:13 +02:00
Nathan Guse
c93b3827dc
[ticket/11092] phpbb_gen_download_links strict standards errors
...
Two strict standards errors in phpbb_gen_download_links
PHPBB3-11092
2012-09-07 11:29:47 -05:00
David King
7bf598954c
Merge remote-tracking branch 'unknownbliss/ticket/10631' into develop
2012-09-01 16:38:47 -04:00
Unknown Bliss
81f7f28cc3
[ticket/10631] Removing un-needed TODOs that are no longer needed.
...
PHPBB3-10631
2012-09-01 21:30:35 +01:00
Unknown Bliss
79da1ea592
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631
...
Conflicts:
phpBB/common.php
phpBB/download/file.php
2012-09-01 21:15:39 +01:00
Nils Adermann
43190ebeca
Merge pull request #962 from imkingdavid/feature/add_events
...
Feature/add events
2012-09-01 12:44:23 -07:00
Nils Adermann
c539c2b0f9
Merge remote-tracking branch 'github-igorw/feature/dic' into develop
...
* github-igorw/feature/dic: (35 commits)
[feature/dic] Spaces to tabs, add useless docblocks
[feature/dic] Remove unneeded newline
[feature/dic] Add a doc block for the prune_forum cron task forum_data
[feature/dic] Update composer.lock to symfony/* RC1
[feature/dic] Fix re-ordering of services
[feature/dic] Fix parse errors
[feature/dic] Add docblock for cron_manager::wrap_task()
[feature/dic] Make cron task attributes protected, one per line
[feature/dic] Coding style: Braces
[feature/dic] Re-order services alphabetically
[feature/dic] Remove duplicate event-dispatcher dependency
[feature/dic] Adjust installer script to work with partially configured container
[feature/dic] Generate full cache driver class name on fresh install
[feature/dic] Adjust cache driver class name for BC
[feature/dic] Rename {phpEx => php_ext} for consistency
[feature/dic] Add trailing newline to htaccess
[feature/dic] Require symfony/* 2.1.*, tabs instead of spaces, --dev lock file
[feature/dic] Load services from extensions
[feature/dic] Introduce DI processors instead of abusing compiler passes
[feature/dic] Add dbal_ class prefix to dbal.driver.class
...
2012-09-01 19:21:24 +02:00
Igor Wiedler
282a80077d
[feature/dic] Spaces to tabs, add useless docblocks
...
Fully documents the constructors of the processors and the cron tasks.
PHPBB3-10739
2012-09-01 19:17:01 +02:00
Igor Wiedler
7ed7b19a1f
[feature/dic] Remove unneeded newline
...
PHPBB3-10739
2012-09-01 19:12:57 +02:00
Nils Adermann
66b60ddba8
Merge remote-tracking branch 'github-igorw/ticket/11082' into develop
...
* github-igorw/ticket/11082:
[ticket/11082] Remove executable permission from redis driver file
2012-09-01 18:02:51 +02:00
Nils Adermann
b8d84d2078
Merge remote-tracking branch 'github-igorw/ticket/11083' into develop
...
* github-igorw/ticket/11083:
[ticket/11083] Mark memory cache driver as abstract
2012-09-01 18:02:18 +02:00
Igor Wiedler
8741bcdaf5
[ticket/11083] Mark memory cache driver as abstract
...
PHPBB3-11083
2012-09-01 17:51:27 +02:00
Igor Wiedler
ed052290a7
[ticket/11082] Remove executable permission from redis driver file
...
PHPBB3-11082
2012-09-01 17:40:19 +02:00
Michael C.
0c35ee2769
[ticket/10631] Fix a spelling typo
...
PHPBB3-10631
2012-09-01 17:32:59 +02:00
Nils Adermann
4fde4abe55
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[task/functional] Fixed DEBUG_TEST related issues
[task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
[task/functional] Added posting tests (reply and new topic)
2012-09-01 17:06:59 +02:00
Nils Adermann
3bd19077dc
Merge remote-tracking branch 'github-imkingdavid/task/functional' into develop-olympus
...
* github-imkingdavid/task/functional:
[task/functional] Fixed DEBUG_TEST related issues
[task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
[task/functional] Added posting tests (reply and new topic)
2012-09-01 17:06:41 +02:00
David King
4dd1bbc587
[task/functional] Fixed DEBUG_TEST related issues
...
PHPBB3-10758
2012-09-01 10:53:01 -04:00
David King
7dfe26dd78
[task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
...
PHPBB3-10758
2012-09-01 10:37:44 -04:00
David King
7cffebbd49
[task/functional] Added posting tests (reply and new topic)
...
PHPBB-10758
2012-09-01 10:37:03 -04:00
Nils Adermann
d866624ea7
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10873] Change language for notice about undelivered, deleted PM.
2012-09-01 16:11:57 +02:00
Nils Adermann
0ba2bfffe2
Merge remote-tracking branch 'github-imkingdavid/ticket/10873' into develop-olympus
...
* github-imkingdavid/ticket/10873:
[ticket/10873] Change language for notice about undelivered, deleted PM.
2012-09-01 16:11:42 +02:00
Nathan Guse
a9b4f2a190
[ticket/10631] Some cleanup of the test cases
...
The acp test case was not actually validating things correctly. Now is does
PHPBB3-10631
2012-09-01 15:06:02 +01:00
Unknown Bliss
f05a175e39
[ticket/10631] Fixing a few extension admin issues
...
PHPBB3-10631
2012-09-01 15:05:59 +01:00
Unknown Bliss
323bbf9b52
[ticket/10631] Adjust prefixes to be easier to understand
...
PHPBB3-10631
2012-09-01 15:05:57 +01:00
Nathan Guse
7b643fe8a5
[ticket/10631] Make failure to meet ext enable requirements clearer
...
Turn the blocks red on the details page if requirement is not met.
Also changing a how the errors come up when trying to enable/disable
an extension when they cannot be.
PHPBB3-10631
2012-09-01 15:05:56 +01:00
Nathan Guse
dce04b2d03
[ticket/10631] Various front-end fixes (extensions manager)
...
Add Back button from details
Add cancel button from actions
Correct language strings
PHPBB3-10631
2012-09-01 15:05:54 +01:00
Nathan Guse
47898cb37a
[ticket/10631] Fix metadata_manager_test
...
PHPBB3-10631
2012-09-01 15:05:52 +01:00
Nathan Guse
36465c9a20
[ticket/10631] Functional acp_extensions test, cleanup
...
PHPBB3-10631
2012-09-01 15:05:49 +01:00
Nathan Guse
500879520c
[ticket/10631] Metadata manager tests
...
PHPBB3-10631
2012-09-01 15:05:47 +01:00
Nathan Guse
8c5786636a
[ticket/10631] Fix class construct arguments in test
...
PHPBB3-10631
2012-09-01 15:05:46 +01:00
Nathan Guse
c39f11750f
[ticket/10631] A _start_ on a metadata manager test.
...
No idea if it runs without errors, I do not have the testing stuff setup.
PHPBB3-10631
2012-09-01 15:05:44 +01:00
Nathan Guse
1de061c4de
[ticket/10631] Fixing an error in the test script
...
PHPBB3-10631
2012-09-01 15:05:42 +01:00
Nathan Guse
747c16240f
[ticket/10631] get_extension_metadata_manager -> create_extension_metadata_manager
...
PHPBB3-10631
2012-09-01 15:05:40 +01:00
Nathan Guse
fd5ed30052
[ticket/10631] Update tests
...
PHPBB3-10631
2012-09-01 15:05:38 +01:00
Nathan Guse
2a7e129291
[ticket/10631] Simplify exceptions
...
PHPBB-10631
2012-09-01 15:05:36 +01:00
Nathan Guse
89f4cf6a8c
[ticket/10631] Use exceptions for errors. Build action list dynamically.
...
PHPBB3-10631
2012-09-01 15:05:34 +01:00
Nathan Guse
106c105113
[ticket/10631] Fix some issues as noted in github comments, significantly simplified validation
...
PHPBB3-10631
2012-09-01 15:05:32 +01:00
Nathan Guse
2273ae2b34
[ticket/10631] Remove references to delete extension
...
PHPBB3-10631
2012-09-01 15:05:30 +01:00
Nils Adermann
790e64433d
Merge pull request #921 from imkingdavid/ticket/10444
...
[ticket/10444] Do not default to the previous post edit reason.
2012-09-01 07:05:29 -07:00