David King
068d350652
[ticket/11215] Don't try to correct paths during tests
...
PHPBB3-11215
2013-07-12 00:03:06 -04:00
Joas Schilling
1911285b77
[ticket/9657] Notifications do not require emails or jabber anymore
...
PHPBB3-9657
2013-07-11 22:44:06 -04:00
Joas Schilling
003a104f93
[ticket/9657] Add type hints for classes
...
PHPBB3-9657
2013-07-11 22:41:24 -04:00
Joas Schilling
5ab0090e6c
[ticket/9657] Remove sql_visibility as it is always non-empty
...
PHPBB3-9657
2013-07-11 22:35:55 -04:00
Joas Schilling
53c0647aed
[ticket/9657] Use include instead of include_once
...
PHPBB3-9657
2013-07-11 22:16:45 -04:00
David King
3a87a6b700
[ticket/11215] use global
...
PHPBB3-11215
2013-07-11 20:46:18 -04:00
David King
8b7aef6f93
Merge branch 'develop' into ticket/11215
...
* develop: (176 commits)
[feature/bootstrap-dic] Bootstrap container from config.php
[ticket/11548] Use new static methods for request and submit
[ticket/10772] Updating tests
[ticket/10772] Remove 3.1 code
[ticket/11388] Add newlines at EOF
[ticket/11388] INCLUDECSS
[ticket/11548] Run array_map on complete error array and not just colour_error
[ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
[ticket/11388] Do not append assets_version if using remote path (e.g. http)
[ticket/11388] Fix typo
[ticket/11388] Remove typehints (causing tests to fail)
[ticket/11388] Disable cache if IN_INSTALL defined
[ticket/11388] Do not modify by reference
[ticket/11388] typehits
[ticket/11388] INCLUDEJS test for //(url)
[ticket/11388] INCLUDEJS supports //(url)
[ticket/11388] Fixing includejs test
[ticket/11388] includejs inherit from includeasset
[feature/twig] Unit tests for includejs
[ticket/8319] Add migration file for update change
...
2013-07-11 20:43:41 -04:00
Nils Adermann
b1d3c1bf69
Merge pull request #1522 from igorw/feature/bootstrap-dic
...
[feature/bootstrap-dic] Bootstrap container from config.php
2013-07-11 15:28:26 -07:00
Vjacheslav Trushkin
f5c2119e7c
[ticket/11647] Always use & for URLs
...
Remove code for URLs separated with ;
Add test case for mix of & and & in URLs
PHPBB3-11647
2013-07-11 18:13:48 -04:00
Andreas Fischer
382ae5a01e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11548] Use new static methods for request and submit
[ticket/11548] Run array_map on complete error array and not just colour_error
Conflicts:
tests/functional/ucp_groups_test.php
2013-07-12 00:11:18 +02:00
Joas Schilling
54012dfb2f
[ticket/9657] Initialise variable outside of the loop
...
PHPBB3-9657
2013-07-11 18:04:56 -04:00
Igor Wiedler
1a5d685f45
[feature/bootstrap-dic] Bootstrap container from config.php
...
PHPBB3-11651
2013-07-11 18:04:40 -04:00
Joas Schilling
0e5e128174
[ticket/9657] Fix variable naming of phpEx to php_ext
...
PHPBB3-9657
2013-07-11 18:02:45 -04:00
Joseph Warner
f4f29a1c0a
[feature/auth-refactor] Fix style issue
...
PHPBB3-9734
2013-07-11 17:43:53 -04:00
Joseph Warner
a64a042830
[feature/auth-refactor] Fix typo
...
PHPBB3-9734
2013-07-11 17:39:51 -04:00
Marc Alexander
dc4687501a
Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket/11548
2013-07-11 17:30:32 -04:00
Vjacheslav Trushkin
94fc0cccdc
[ticket/11647] Allow custom ports
...
Allow custom port number in schema-relative URLs
PHPBB3-11647
2013-07-11 16:56:10 -04:00
Vjacheslav Trushkin
4fbdac0b9e
[ticket/11647] Use $config for assets_version
...
PHPBB3-11647
2013-07-11 16:38:52 -04:00
Vjacheslav Trushkin
63f1d99cc8
[ticket/11647] Fix invalid variable name
...
PHPBB3-11647
2013-07-11 16:33:08 -04:00
Nathaniel Guse
159f018056
[ticket/11388] INCLUDECSS
...
PHPBB3-11388
2013-07-11 15:31:55 -05:00
Marc Alexander
599f83395f
[ticket/11548] Run array_map on complete error array and not just colour_error
...
Up to now the array_map() that turns error messages into the localized output
was only ran if the group's color was set. With this patch it'll run the
array_map() on the complete error array if it's not empty.
PHPBB3-11548
2013-07-11 16:15:27 -04:00
Joseph Warner
f24a8e5b81
[ticket/11626] Make identifier uppercase per style requirements
...
PHPBB3-11626
2013-07-11 15:49:46 -04:00
Joseph Warner
3465867a4e
[ticket/11626] Change the identifier template file in the template
...
PHPBB3-11626
2013-07-11 15:49:45 -04:00
Joseph Warner
3431cb8ed7
[ticket/11626] Call method only one time per provider
...
PHPBB3-11626
2013-07-11 15:49:45 -04:00
Joseph Warner
60100b62f3
[ticket/11626] Change interface to match functionality
...
Changes the interface so that it matches the new functionality of
phpbb_provider_auth_interface::acp().
PHPBB3-11626
2013-07-11 15:49:45 -04:00
Joseph Warner
29b472c2e5
[ticket/11626] Include the template file in acp_board
...
PHPBB3-11626
2013-07-11 15:49:45 -04:00
Joseph Warner
80eb95bbb7
[ticket/11626] LDAP Auth ACP Template File
...
PHPBB3-11626
2013-07-11 15:49:45 -04:00
Joseph Warner
b0e6b1dd98
[ticket/11626] Create get_acp_template method for auth providers
...
PHPBB3-11626
2013-07-11 15:49:45 -04:00
Joseph Warner
9c0495664d
[feature/auth-refactor] Remove invalid providers from acp select
...
PHPBB3-9734
2013-07-11 15:46:08 -04:00
Vjacheslav Trushkin
4f3ce669f6
[ticket/11647] New assets handling
...
PHPBB-11647
2013-07-11 15:41:27 -04:00
Nils Adermann
59f34bef08
Merge pull request #1470 from EXreaction/feature/twig
...
Feature/twig
2013-07-11 12:11:41 -07:00
Joseph Warner
e2435f25d9
[feature/auth-refactor] Check that providers implement auth interface
...
PHPBB3-9734
2013-07-11 14:54:52 -04:00
Nathaniel Guse
947b907efe
[ticket/11388] Do not append assets_version if using remote path (e.g. http)
...
PHPBB3-11388
2013-07-11 11:28:35 -05:00
Nathaniel Guse
abd4159f87
[ticket/11388] Fix typo
...
PHPBB3-11388
2013-07-11 11:27:15 -05:00
Nathaniel Guse
dd7f9f08d5
[ticket/11388] Remove typehints (causing tests to fail)
...
PHPBB3-11388
2013-07-11 11:24:45 -05:00
Joseph Warner
e674838d69
[feature/auth-refactor] Remove full stop
...
PHPBB3-9734
2013-07-11 12:07:00 -04:00
Nathaniel Guse
a846048918
[ticket/11388] Disable cache if IN_INSTALL defined
...
PHPBB3-11388
2013-07-11 11:03:28 -05:00
Nathaniel Guse
bc4b5c87a9
[ticket/11388] Do not modify by reference
...
PHPBB3-11388
2013-07-11 10:45:23 -05:00
Nathaniel Guse
ac6b4319b3
[ticket/11388] typehits
...
PHPBB3-11388
2013-07-11 10:32:13 -05:00
Joseph Warner
177e340764
[feature/auth-refactor] Code style fix for doc blocks
...
PHPBB3-9734
2013-07-11 11:31:50 -04:00
Joseph Warner
ccef1ae5ab
[feature/auth-refactor] Change 'must' to 'should'
...
PHPBB3-9734
2013-07-11 11:27:20 -04:00
Nathaniel Guse
ece01f0a1f
Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympus
...
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/8319:
[ticket/8319] Do not repeat the replacement
[ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
[ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
[ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
[ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
2013-07-11 10:09:53 -05:00
Joseph Warner
021eb083ab
[feature/auth-refactor] Remove implements on classes extending base
...
PHPBB3-9734
2013-07-11 11:09:45 -04:00
Joseph Warner
69c1b1aea8
[feature/auth-refactor] Prevent fatal error in php < 5.3.23
...
PHPBB3-9734
2013-07-11 11:06:59 -04:00
Joseph Warner
3c11052fb3
[feature/auth-refactor] Have a base auth class
...
PHPBB3-9734
2013-07-11 10:56:04 -04:00
Nathaniel Guse
99c7483ade
[ticket/11388] INCLUDEJS supports //(url)
...
PHPBB3-11388
2013-07-11 08:36:16 -05:00
Joas Schilling
753dc62267
[ticket/9657] Fix unit tests
...
PHPBB3-9657
2013-07-11 15:02:07 +02:00
Joas Schilling
9aed758c13
[ticket/9657] Use the service instead of the static class
...
PHPBB3-9657
2013-07-11 14:24:07 +02:00
Joas Schilling
9f89cb4cfb
[ticket/9657] Make content visibility a service and inject everything
...
PHPBB3-9657
2013-07-11 13:31:39 +02:00
Joas Schilling
ed151cd6aa
[ticket/9657] Add , to last element of an array
...
PHPBB3-9657
2013-07-11 12:12:18 +02:00