863592a8be
[ticket/11628] Remove set_style_names function, moved to set_custom_style
...
PHPBB3-11628
2013-07-24 13:19:20 -05:00
5843294813
[feature/oauth] Update comment to better reflect the action
...
PHPBB3-11673
2013-07-24 14:05:54 -04:00
4414278209
[ticket/11628] Set admin namespace in the constructor
...
PHPBB3-11628
2013-07-24 13:05:27 -05:00
67627f3336
[ticket/11628] Change set_custom_style $template path to default to string
...
Rather than default to false and compare === false ? 'template/' : value just
assign this default in the arguments
PHPBB3-11628
2013-07-24 13:01:30 -05:00
4b761f6575
[ticket/11628] Remove third parameter ($names) from set_custom_style
...
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument
PHPBB3-11628
2013-07-24 12:56:39 -05:00
581cb37b8c
[feature/oauth] Start linking/registering OAuth accounts during login
...
PHPBB3-11673
2013-07-24 13:46:33 -04:00
bfbc7aa742
[ticket/11628] Return $this from set_style, set_custom_style
...
PHPBB3-11628
2013-07-24 12:45:35 -05:00
ecaed319ab
[ticket/11628] Move setting core namespace to set_style()
...
PHPBB3-11628
2013-07-24 12:42:37 -05:00
85ff05bec6
[ticket/11628] Remove $this->names, $this->style_names from phpbb_template
...
These are not used anywhere
PHPBB3-11628
2013-07-24 12:34:22 -05:00
5d1afb4532
[ticket/11628] Remove phpbb_style (move methods to phpbb_template)
...
PHPBB3-11628
2013-07-24 12:24:35 -05:00
44a82dd083
[ticket/11628] Remove style path provider
...
No longer used since Twig was implemented.
PHPBB3-11628
2013-07-24 12:05:04 -05:00
98b385bc1c
[ticket/11628] Remove style resource locator
...
No longer used since Twig was implemented.
PHPBB3-11628
2013-07-24 11:59:21 -05:00
669586c134
[feature/oauth] Token must be updated with the user_id
...
PHPBB3-11673
2013-07-24 12:56:27 -04:00
58d5820069
[feature/oauth] Basic login functionality now working
...
These changes are currently unique to OAuth and need to be made
generic so that any auth provider can modify the login template.
PHPBB3-11673
2013-07-24 10:40:42 -04:00
ffb14a6988
[feature/oauth] Fix OAuth login
...
PHPBB3-11673
2013-07-24 10:36:08 -04:00
38d4eb073e
[feature/oauth] Fix last typo. Authentication works for accounts in db
...
PHPBB3-11673
2013-07-23 22:35:54 -04:00
5fa08b92a2
[feature/oauth] Fix typo in token storage
...
PHPBB3-11673
2013-07-23 22:33:11 -04:00
4369cc8876
[feature/oauth] Fix more errors related to sql changes
...
PHPBB3-11673
2013-07-23 22:29:27 -04:00
da6a8787f8
[feature/oauth] Fix SQL error found in install
...
PHPBB3-11673
2013-07-23 22:26:34 -04:00
dc050e7ece
[feature/oauth] Fix OAuth after schema changes
...
PHPBB3-11673
2013-07-23 22:20:38 -04:00
b1c62793c6
[feature/oauth] Fix token storage after sql changes
...
PHPBB3-11673
2013-07-23 22:20:04 -04:00
2483efe9a3
[feature/oauth] Actual final schema changes
...
PHPBB3-11673
2013-07-23 22:18:56 -04:00
e60f4bc88b
[feature/oauth] Finalize schema changes
...
PHPBB3-11673
2013-07-23 22:16:09 -04:00
8d568dae71
[feature/oauth] Fix SQL error in token storage
...
PHPBB3-11673
2013-07-23 21:23:07 -04:00
fe9c97cfb4
[feature/oauth] Fix errors in OAuth
...
PHPBB3-11673
2013-07-23 21:17:05 -04:00
c166801fe3
[feature/oauth] Remove temporary google testing code
...
PHPBB3-11673
2013-07-23 21:07:18 -04:00
b1938576f1
[feature/oauth] Fix outstanding issues with OAuth
...
Includes a temporary change that allows me to test against google.
This will be removed shortly.
PHPBB3-11673
2013-07-23 21:04:29 -04:00
c26b68cc54
[feature/oauth] Update error message with actual error
...
PHPBB3-11673
2013-07-23 19:27:55 -04:00
9805927fac
[feature/oauth] OAuth init method to minimally validate entered data
...
PHPBB3-11673
2013-07-23 15:26:57 -04:00
77c3264543
[feature/oauth] OAuth acp() method to return config field names
...
PHPBB3-11673
2013-07-23 14:53:02 -04:00
0857d14030
[feature/oauth] Update auth provider interface docs for block vars in ACP
...
PHPBB3-11673
2013-07-23 14:41:46 -04:00
2fc4be1a31
[feature/oauth] Fix language bug with new ACP OAuth template
...
PHPBB3-11673
2013-07-23 14:24:50 -04:00
32678f63ed
[feature/oauth] Finish the template so it "works"
...
PHPBB3-11673
2013-07-23 14:14:09 -04:00
93cbdc37b5
[feature/oauth] ACP options for OAuth, needs some work
...
PHPBB3-11673
2013-07-23 14:06:24 -04:00
bf04bfcced
[ticket/11667] Use @inheritdoc
...
PHPBB3-11667
2013-07-23 11:16:23 -05:00
485c6ab355
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667
...
# By Joas Schilling (224) and others
# Via Andreas Fischer (23) and others
* 'develop' of github.com:phpbb/phpbb3: (385 commits)
[ticket/11734] Readd accidently removed language strings of forum permissions
[ticket/11620] Whitespace and combine function into test_case
[ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
[ticket/11620] Changed incorrect global variable
[ticket/11620] Minor indentation changes and comment clarity
[ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
[ticket/11733] Add browse test for feed.php
[ticket/11731] Remove static calls to captcha garbage collector
[ticket/11728] Replace topic_approved with topic_visibility
[ticket/11620] Expected and actual test conditions wrongly swapped
[ticket/11620] Space between . in directory import concatenation
[ticket/11620] Changes to match merge
[ticket/11620] Changes for code guidelines consistency
[ticket/11620] Fix a static calls to non-static for session captcha
[ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
[ticket/11620] Update auth_provider for new interface
[ticket/11620] Added garbage_collection_test
[ticket/11620] Fixed check_ban_test errors with cache and ban warning message
[ticket/11620] Fixed a typo on check_ban_test
[ticket/11620] Refactored check_isvalid_test to use session_test_case
...
2013-07-23 11:13:25 -05:00
ea250a5ef5
[ticket/11701] Refix regex for appending |length
...
PHPBB3-11701
2013-07-23 09:28:23 -05:00
2d764ef7d5
[ticket/11701] Fix regex for appending |length
...
PHPBB3-11701
2013-07-23 09:27:32 -05:00
c0b9db1c62
[ticket/11701] Fix loops var check
...
PHPBB3-11701
2013-07-23 09:26:50 -05:00
0d31420ae0
[ticket/11701] Remove useless str_replace
...
PHPBB3-11701
2013-07-23 09:25:58 -05:00
6b0b0f2a9f
[ticket/11701] Loop variables are not passed correctly to events
...
PHPBB3-11701
2013-07-23 09:25:57 -05:00
7d8e80241c
Merge remote-tracking branch 'EXreaction/ticket/11718' into develop
...
* EXreaction/ticket/11718:
[ticket/11718] Quick test for fixes in ELSEIF
[ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF
Conflicts:
tests/template/template_test.php
2013-07-23 04:24:05 +02:00
017d809e74
Merge remote-tracking branch 'nickvergessen/ticket/11733' into develop
...
* nickvergessen/ticket/11733:
[ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
[ticket/11733] Add browse test for feed.php
2013-07-23 01:17:13 +02:00
10ba1e73da
[ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
...
PHPBB3-11733
2013-07-23 00:59:51 +02:00
c2d919f12d
Merge remote-tracking branch 'asperous/ticket/11731' into develop
...
* asperous/ticket/11731:
[ticket/11731] Remove static calls to captcha garbage collector
2013-07-23 00:07:38 +02:00
80f81dd0d2
[ticket/11731] Remove static calls to captcha garbage collector
...
PHPBB3-11731
2013-07-22 15:04:30 -07:00
aa77367267
[ticket/11728] Replace topic_approved with topic_visibility
...
PHPBB3-11728
2013-07-22 22:54:55 +02:00
0be81468e7
[feature/oauth] Possible way of getting the login data to login_box()
...
PHPBB3-11673
2013-07-22 16:36:42 -04:00
cd49cfacfb
[feature/oauth] Initial step in creating OAuth login support
...
PHPBB3-11673
2013-07-22 16:23:41 -04:00
d804842cef
[feature/oauth] Fall back to DB login if OAuth is enabled but not requested
...
PHPBB3-11673
2013-07-22 15:58:32 -04:00
