mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-24 21:26:24 +02:00
Code Issues Releases Wiki Activity
21,752 Commits 10 Branches 193 Tags
25e58669d2048de26db7ad7f430b122fe9c6eebe
Commit Graph

1076 Commits

Author SHA1 Message Date
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
Nathaniel Guse
c0b9db1c62 [ticket/11701] Fix loops var check 
PHPBB3-11701
 2013-07-23 09:26:50 -05:00
Nathaniel Guse
0d31420ae0 [ticket/11701] Remove useless str_replace 
PHPBB3-11701
 2013-07-23 09:25:58 -05:00
Nathaniel Guse
6b0b0f2a9f [ticket/11701] Loop variables are not passed correctly to events 
PHPBB3-11701
 2013-07-23 09:25:57 -05:00
Andreas Fischer
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
Andreas Fischer
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
Joas Schilling
10ba1e73da [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed 
PHPBB3-11733
 2013-07-23 00:59:51 +02:00
Andreas Fischer
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
Andy Chase
80f81dd0d2 [ticket/11731] Remove static calls to captcha garbage collector 
PHPBB3-11731
 2013-07-22 15:04:30 -07:00
Joas Schilling
aa77367267 [ticket/11728] Replace topic_approved with topic_visibility 
PHPBB3-11728
 2013-07-22 22:54:55 +02:00
Joseph Warner
0be81468e7 [feature/oauth] Possible way of getting the login data to login_box() 
PHPBB3-11673
 2013-07-22 16:36:42 -04:00
Joseph Warner
cd49cfacfb [feature/oauth] Initial step in creating OAuth login support 
PHPBB3-11673
 2013-07-22 16:23:41 -04:00
Joseph Warner
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
Nathan Guse
127ee62edd Merge pull request #1589 from marc1706/ticket/11717 
[ticket/11717] Use topic_posts_approved instead of topic_replies
 2013-07-22 12:20:17 -07:00
Nathan Guse
b71038486e Merge pull request #1513 from nickvergessen/ticket/11582 
Ticket/11582 Split permission logic from translations
 2013-07-22 11:28:55 -07:00
Marc Alexander
603dc1f786 [ticket/11717] Use topic_posts_approved instead of topic_replies 
Due to the move to soft-delete, the topic_replies column no longer exists
in the topics table. Instead, the column topic_posts_approved should be used.

PHPBB3-11717
 2013-07-20 21:21:36 +02:00
Nathaniel Guse
375976eb38 [ticket/11707] Twig DEFINE not working as expected 
PHPBB3-11707
 2013-07-19 14:12:28 -05:00
Nathaniel Guse
b92f660ed3 [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF 
PHPBB3-11718
 2013-07-19 13:08:41 -05:00
Joseph Warner
4c48da0597 [feature/oauth] Clean up unneeded complexity 
PHPBB3-11673
 2013-07-18 21:04:10 -04:00
Joseph Warner
f852485513 [feature/oauth] Fix a bunch of errors in oauth.php 
PHPBB3-11673
 2013-07-18 21:02:21 -04:00
Joseph Warner
b67032fb02 [feature/oauth] Temporary workaround for only allowing one auth provider 
PHPBB3-11673
 2013-07-18 20:49:42 -04:00
Joseph Warner
0f292f70c7 [feature/oauth] Fix fatal error 
PHPBB3-11673
 2013-07-18 20:05:26 -04:00
Joseph Warner
a673eb8cbc [feature/oauth] Google support 
PHPBB3-11673
 2013-07-18 16:04:58 -04:00
Joseph Warner
772a977afc [feature/oauth] Facebook support 
PHPBB3-11673
 2013-07-18 16:03:44 -04:00
Joseph Warner
2eb47d00e0 [feature/oauth] Remove unused method 
PHPBB3-11673
 2013-07-18 15:33:31 -04:00
Joseph Warner
36f7913cc0 [feature/oauth] Finish authenticating user code 
PHPBB3-11673
 2013-07-18 15:31:31 -04:00
Joseph Warner
2faaa7f63c [feature/oauth] Update service files + check for existing links 
PHPBB3-11673
 2013-07-18 12:51:53 -04:00
Joseph Warner
662b8fdcec [feature/oauth] Remove OAuth providers to make PR smaller 
PHPBB3-11673
 2013-07-18 12:21:45 -04:00
Joseph Warner
fe9428b725 [feature/oauth] Create means to associate phpBB account with external 
PHPBB3-11673
 2013-07-18 12:12:57 -04:00
Joseph Warner
469879716d [feature/oauth] Bitly authentication method, no user_id association 
PHPBB3-11673
 2013-07-18 11:51:59 -04:00
Joseph Warner
e9bf2bf09a [feature/oauth] Update interface appropriately 
PHPBB3-11673
 2013-07-15 15:28:31 -04:00
Joseph Warner
47b998ae48 [feature/oauth] Define method to perform login actions for a provider 
PHPB3-11673
 2013-07-15 15:24:48 -04:00
Joseph Warner
8641127da5 [feature/oauth] Correct function call 
PHPBB3-11673
 2013-07-15 15:19:36 -04:00
Joseph Warner
6e1c522bdd [feature/oauth] Update oauth to reflect recent changes 
PHPBB3-11673
 2013-07-15 14:57:22 -04:00
Joseph Warner
0156bac3e2 [feature/oauth] Update auth provider oauth to take in service providers 
PHPBB3-11673
 2013-07-14 17:42:26 -04:00
Joseph Warner
247a002a14 [feature/oauth] Add constructors 
PHPBB3-11673
 2013-07-14 17:24:01 -04:00
Nils Adermann
adc58ba084 [ticket/11700] Use a new style constructor for the error collector 
PHPBB3-11700
 2013-07-14 16:28:30 -04:00
Joseph Warner
a8e60c306d [feature/oauth] Remove get_service_credentials() from oauth provider 
PHPBB3-11673
 2013-07-14 16:02:10 -04:00