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

1213 Commits

Author SHA1 Message Date
Nathan Guse
b213be84a7 [ticket/11744] Comments 
PHPBB3-11744
 2013-07-27 09:09:24 -05:00
Nathaniel Guse
3f230b1a8c [ticket/11744] Create null log class (primarily for unit test) 
PHPBB3-11744
 2013-07-26 12:29:49 -05:00
Nathan Guse
e0ef10128b [ticket/11744] Group join request notification 
PHPBB3-11744
 2013-07-26 10:26:52 -05:00
Nathan Guse
57bc3c7d3a [ticket/11628] phpbb_template, not phpbb_template_interface 
PHPBB3-11628
 2013-07-25 09:32:28 -05:00
Joseph Warner
7c065bc9a2 [feature/oauth] Finish fixes from tests and tests for token storage 
PHPBB3-11673
 2013-07-24 16:06:34 -04:00
Joseph Warner
f8dbaa148d [feature/oauth] Fixes for problems found by tests 
PHPBB3-11673
 2013-07-24 16:02:59 -04:00
Joseph Warner
15a2ad3149 [feature/oauth] Fix error in token_storage::set_user_id() 
PHPBB3-11673
 2013-07-24 15:08:08 -04:00
Nathaniel Guse
ffbc144a73 [ticket/11628] Make get_template_vars protected 
Remove all references to it and the hacky code in messenger that was using it

PHPBB3-11628
 2013-07-24 13:38:12 -05:00
Nathaniel Guse
427fa17f7f [ticket/11628] Fix a bug I noticed in template->destroy 
Should not be setting $this->context = array()!

PHPBB3-11628
 2013-07-24 13:34:41 -05:00
Nathaniel Guse
8795a354fe [ticket/11628] Remove the one usage of get_style_path() 
Makes the code easier to follow

PHPBB3-11628
 2013-07-24 13:31:09 -05:00
Nathaniel Guse
3b46f77e4e [ticket/11628] Shorten an if to an inline statement 
PHPBB3-11628
 2013-07-24 13:26:55 -05:00
Nathaniel Guse
12c2258506 [ticket/11628] Remove template_path option on set_custom_style 
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)

PHPBB3-11628
 2013-07-24 13:25:20 -05:00
Nathaniel Guse
863592a8be [ticket/11628] Remove set_style_names function, moved to set_custom_style 
PHPBB3-11628
 2013-07-24 13:19:20 -05:00
Joseph Warner
5843294813 [feature/oauth] Update comment to better reflect the action 
PHPBB3-11673
 2013-07-24 14:05:54 -04:00
Nathaniel Guse
4414278209 [ticket/11628] Set admin namespace in the constructor 
PHPBB3-11628
 2013-07-24 13:05:27 -05:00
Nathaniel Guse
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
Nathaniel Guse
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
Joseph Warner
581cb37b8c [feature/oauth] Start linking/registering OAuth accounts during login 
PHPBB3-11673
 2013-07-24 13:46:33 -04:00
Nathaniel Guse
bfbc7aa742 [ticket/11628] Return $this from set_style, set_custom_style 
PHPBB3-11628
 2013-07-24 12:45:35 -05:00
Nathaniel Guse
ecaed319ab [ticket/11628] Move setting core namespace to set_style() 
PHPBB3-11628
 2013-07-24 12:42:37 -05:00
Nathaniel Guse
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
Nathaniel Guse
5d1afb4532 [ticket/11628] Remove phpbb_style (move methods to phpbb_template) 
PHPBB3-11628
 2013-07-24 12:24:35 -05:00
Nathaniel Guse
44a82dd083 [ticket/11628] Remove style path provider 
No longer used since Twig was implemented.

PHPBB3-11628
 2013-07-24 12:05:04 -05:00
Nathaniel Guse
98b385bc1c [ticket/11628] Remove style resource locator 
No longer used since Twig was implemented.

PHPBB3-11628
 2013-07-24 11:59:21 -05:00
Joseph Warner
669586c134 [feature/oauth] Token must be updated with the user_id 
PHPBB3-11673
 2013-07-24 12:56:27 -04:00
Joseph Warner
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
Joseph Warner
ffb14a6988 [feature/oauth] Fix OAuth login 
PHPBB3-11673
 2013-07-24 10:36:08 -04:00
Joseph Warner
38d4eb073e [feature/oauth] Fix last typo. Authentication works for accounts in db 
PHPBB3-11673
 2013-07-23 22:35:54 -04:00
Joseph Warner
5fa08b92a2 [feature/oauth] Fix typo in token storage 
PHPBB3-11673
 2013-07-23 22:33:11 -04:00
Joseph Warner
4369cc8876 [feature/oauth] Fix more errors related to sql changes 
PHPBB3-11673
 2013-07-23 22:29:27 -04:00
Joseph Warner
da6a8787f8 [feature/oauth] Fix SQL error found in install 
PHPBB3-11673
 2013-07-23 22:26:34 -04:00
Joseph Warner
dc050e7ece [feature/oauth] Fix OAuth after schema changes 
PHPBB3-11673
 2013-07-23 22:20:38 -04:00
Joseph Warner
b1c62793c6 [feature/oauth] Fix token storage after sql changes 
PHPBB3-11673
 2013-07-23 22:20:04 -04:00
Joseph Warner
2483efe9a3 [feature/oauth] Actual final schema changes 
PHPBB3-11673
 2013-07-23 22:18:56 -04:00
Joseph Warner
e60f4bc88b [feature/oauth] Finalize schema changes 
PHPBB3-11673
 2013-07-23 22:16:09 -04:00
Joseph Warner
8d568dae71 [feature/oauth] Fix SQL error in token storage 
PHPBB3-11673
 2013-07-23 21:23:07 -04:00
Joseph Warner
fe9c97cfb4 [feature/oauth] Fix errors in OAuth 
PHPBB3-11673
 2013-07-23 21:17:05 -04:00
Joseph Warner
c166801fe3 [feature/oauth] Remove temporary google testing code 
PHPBB3-11673
 2013-07-23 21:07:18 -04:00
Joseph Warner
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
Joseph Warner
c26b68cc54 [feature/oauth] Update error message with actual error 
PHPBB3-11673
 2013-07-23 19:27:55 -04:00
Joseph Warner
9805927fac [feature/oauth] OAuth init method to minimally validate entered data 
PHPBB3-11673
 2013-07-23 15:26:57 -04:00
Joseph Warner
77c3264543 [feature/oauth] OAuth acp() method to return config field names 
PHPBB3-11673
 2013-07-23 14:53:02 -04:00
Joseph Warner
0857d14030 [feature/oauth] Update auth provider interface docs for block vars in ACP 
PHPBB3-11673
 2013-07-23 14:41:46 -04:00
Joseph Warner
2fc4be1a31 [feature/oauth] Fix language bug with new ACP OAuth template 
PHPBB3-11673
 2013-07-23 14:24:50 -04:00
Joseph Warner
32678f63ed [feature/oauth] Finish the template so it "works" 
PHPBB3-11673
 2013-07-23 14:14:09 -04:00
Joseph Warner
93cbdc37b5 [feature/oauth] ACP options for OAuth, needs some work 
PHPBB3-11673
 2013-07-23 14:06:24 -04:00
Nathan Guse
bf04bfcced [ticket/11667] Use @inheritdoc 
PHPBB3-11667
 2013-07-23 11:16:23 -05:00
Nathan Guse
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
Nathaniel Guse
ea250a5ef5 [ticket/11701] Refix regex for appending |length 
PHPBB3-11701
 2013-07-23 09:28:23 -05:00
Nathaniel Guse
2d764ef7d5 [ticket/11701] Fix regex for appending |length 
PHPBB3-11701
 2013-07-23 09:27:32 -05:00