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

17232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Nathaniel Guse
36338a0d7b Merge branch 'develop-olympus' into develop 
* develop-olympus:
 2013-07-11 10:11:20 -05:00
Nathaniel Guse
8f87fd7bf4 Merge remote-tracking branch 'remotes/nickv/ticket/8319-develop' into develop 
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/8319-develop:
  [ticket/8319] Add migration file for update change
  [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:11:11 -05: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
648e1e51fa [ticket/11388] INCLUDEJS test for //(url) 
PHPBB3-11388
 2013-07-11 08:44:48 -05:00
Nathaniel Guse
99c7483ade [ticket/11388] INCLUDEJS supports //(url) 
PHPBB3-11388
 2013-07-11 08:36:16 -05:00
Andreas Fischer
2fcae1ca16 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11630] Improvements to the PHP lint pre-commit hook
 2013-07-11 00:51:07 +02:00
Andreas Fischer
13c087d4f1 Merge remote-tracking branch 'EXreaction/ticket/11630' into develop-olympus 
* EXreaction/ticket/11630:
  [ticket/11630] Improvements to the PHP lint pre-commit hook
 2013-07-11 00:50:05 +02:00
Nathaniel Guse
8d8979eda7 [ticket/11388] Fixing includejs test 
Changed expected output to file?(any supplied argument string)&asset_version
=($config['asset_version'])#(any supplied anchor string)

Testing lines one at a time to make checking them easier.

PHPBB3-11388
 2013-07-10 13:23:36 -05:00
Nathaniel Guse
ab5a79a823 [ticket/11388] includejs inherit from includeasset 
Copied from the INCLUDECSS PR, since this needed to be modified.

Added checks for argument strings/anchors/http/https paths in asset files
to load files properly

PHPBB3-11388
 2013-07-10 13:19:34 -05:00
Nathaniel Guse
f88cdce43a Merge remote-tracking branch 'remotes/cyberalien/feature/twig/includejs_tests' into feature/twig 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/feature/twig/includejs_tests:
  [feature/twig] Unit tests for includejs
 2013-07-10 11:38:48 -05:00
Vjacheslav Trushkin
9725eb19f8 [feature/twig] Unit tests for includejs 
PHPBB3-11598
 2013-07-10 11:43:52 -04:00
Joas Schilling
19f7d12328 [ticket/8319] Add migration file for update change 
PHPBB3-8319
 2013-07-10 17:25:27 +02:00
Joas Schilling
34ad665c8b Merge branch 'ticket/8319' into ticket/8319-develop2 
* 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

Conflicts:
	phpBB/install/database_update.php
 2013-07-10 17:24:49 +02:00
Joas Schilling
9210d735a5 [ticket/8319] Do not repeat the replacement 
PHPBB3-8319
 2013-07-10 17:13:02 +02:00
Nathan Guse
47ec38c011 [feature/twig] Add simple test to make sure Twig filters/tags are working 
PHPBB3-11598
 2013-07-08 15:21:27 -05:00