mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
17,887 Commits 17 Branches 190 Tags
Commit Graph

17887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andreas Fischer
a7edbf9258 Merge remote-tracking branch 'marc1706/ticket/11548' into develop-olympus 
* marc1706/ticket/11548:
  [ticket/11548] Use new static methods for request and submit
  [ticket/11548] Run array_map on complete error array and not just colour_error
 2013-07-11 23:38:49 +02:00
Marc Alexander
2667c3a527 [ticket/11548] Use new static methods for request and submit 
PHPBB3-11548
 2013-07-11 17:34:34 -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
Nils Adermann
bf43da75f8 Merge branch 'develop-olympus' into develop with no effect 
No changes!

* develop-olympus:
  [ticket/10772] Updating tests
  [ticket/10772] Remove 3.1 code
 2013-07-11 17:06:32 -04:00
Nathaniel Guse
9bfb567854 [ticket/11420] Fix tests 
PHPBB3-11420
 2013-07-11 15:58:02 -05: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
Nathaniel Guse
91165e0758 [ticket/11420] Fix tests 
PHPBB3-11420
 2013-07-11 15:49:32 -05:00
Vjacheslav Trushkin
94e5bfaada [ticket/10772] Updating tests 
PHPBB3-10772
 2013-07-11 22:46:26 +02:00
Vjacheslav Trushkin
335d48775f [ticket/10772] Remove 3.1 code 
PHPBB3-10772
 2013-07-11 22:46:19 +02:00
Nils Adermann
bdd1d4d132 Merge pull request #1509 from EXreaction/ticket/11388 
Ticket/11388 INCLUDECSS
 2013-07-11 13:41:39 -07:00
Nathaniel Guse
9f5c1e0062 [ticket/11388] Add newlines at EOF 
PHPBB3-11388
 2013-07-11 15:40:43 -05: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
Vjacheslav Trushkin
6eef2aebd7 [ticket/11647] Fix tests for INCLUDEJS 
PHPBB-11647
 2013-07-11 15:40:28 -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
7104aeb77e Merge branch 'develop-olympus' into develop 
# By Vjacheslav Trushkin
# Via Nathaniel Guse (1) and Vjacheslav Trushkin (1)
* develop-olympus:
  [ticket/10772] Remove unnecessary comment
  [ticket/10772] Functional tests for forum style

Conflicts:
	tests/functional/forum_style_test.php
 2013-07-11 13:15:26 -05:00
Nathaniel Guse
cb0335ebcb Merge remote-tracking branch 'remotes/cyberalien/ticket/develop/10772' into develop 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/develop/10772:
  [ticket/develop/10772] Fix copyright year
  [ticket/develop/10772] Unit tests for forum specific style
  [ticket/10772] Use forum specific style for trigger_error
 2013-07-11 13:12:41 -05:00
Nathaniel Guse
406c48c655 Merge remote-tracking branch 'remotes/cyberalien/ticket/10772' into develop-olympus 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/10772:
  [ticket/10772] Remove unnecessary comment
  [ticket/10772] Functional tests for forum style
  [ticket/10772] Use forum specific style for trigger_error
 2013-07-11 13:08:24 -05:00
Nathaniel Guse
5b81cad775 Merge branch 'develop-olympus' into develop 
# By Igor Wiedler
# Via Igor Wiedler (1) and Nathaniel Guse (1)
* develop-olympus:
  [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
 2013-07-11 12:25:54 -05:00
Nathaniel Guse
900525a0e4 Merge remote-tracking branch 'remotes/igorw/ticket/11644' into develop-olympus 
# By Igor Wiedler
# Via Igor Wiedler
* remotes/igorw/ticket/11644:
  [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
 2013-07-11 12:25:25 -05:00
Vjacheslav Trushkin
9b194ddb1e [ticket/11553] Typo 
PHPBB3-11553
 2013-07-11 13:18:01 -04:00
Igor Wiedler
20d59c49e2 [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6 
PHPBB3-11644
 2013-07-11 13:00:21 -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
Vjacheslav Trushkin
5362f2a1c1 [ticket/11553] Replace bullet with unicode 
PHPBB3-11553
 2013-07-11 11:11:38 -04:00