mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-29 02:29:21 +02:00
Code Issues Releases Wiki Activity
25,395 Commits 18 Branches 192 Tags
Commit Graph

2010 Commits

Author SHA1 Message Date
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
Joseph Warner
6a2871692c [feature/oauth] Get service credentials on each OAuth service 
PHPBB3-11673
 2013-07-14 16:00:41 -04:00
Joseph Warner
55cdc874e6 [feature/oauth] Set required scopes on more providers 
PHPBB3-11673
 2013-07-14 15:53:18 -04:00
Igor Wiedler
8928240dc3 [ticket/11574] Fix more issues in the updater 
* Stupid mistake in phpbb_create_update_container
* Do not bootstrap extensions in installer/updater
* Fix template lookup in installer/updater
* Do not attempt to delete posts from bots

The latter is a really fun problem. Since deleting posts now depends
on a new db column that does not exist yet, we cannot call delete_post
from a migration, ever. By using retain, we can hack around the issue
for now.

PHPBB3-11574
 2013-07-14 15:40:19 -04:00
Nils Adermann
62b33968c2 [ticket/11700] include and define are not valid class names 
PHPBB3-11700
 2013-07-14 15:38:04 -04:00
Joseph Warner
0ebff82ad3 [feature/oauth] Last five oauth services 
PHPBB3-11673
 2013-07-14 15:35:51 -04:00
Igor Wiedler
c2b31ca101 Merge remote-tracking branch 'upstream/develop' into ticket/11574 
* upstream/develop:
  [ticket/11704] Use the correct directory for dependency checking.
  [ticket/11704] Correctly escape "
  [ticket/11697] author_search() used incorrect parameter
 2013-07-14 15:27:25 -04:00
Joseph Warner
947aa2b6b4 [feature/oauth] Create OAuth service classes 
PHPBB3-11673
 2013-07-14 15:16:34 -04:00
Marc Alexander
a0e5f83311 [ticket/11706] Use @ to suppress errors for getimagesize in remote avatar 
PHPBB3-11706
 2013-07-14 15:13:09 -04:00
Joseph Warner
00d0e10200 [feature/oauth] Move last file to appropriate location 
PHPBB3-11673
 2013-07-14 14:22:43 -04:00
Joseph Warner
a43a8f8c72 [feature/oauth] Update class name based on last commit 
PHPBB3-11673
 2013-07-14 14:22:43 -04:00
Joseph Warner
117a758f66 [feature/oauth] Move oauth to auth/provider/oauth 
PHPBB3-11673
 2013-07-14 14:22:43 -04:00
Joseph Warner
1a3880806a [feature/oauth] Move OAuth to /phpBB/phpbb 
PHPBB3-11673
 2013-07-14 14:22:43 -04:00
Joseph Warner
2e899c24f9 [feature/oauth] Change name of new method on request 
PHPBB3-11673
 2013-07-14 14:22:42 -04:00
Joseph Warner
a6ff239778 [feature/oauth] Allow getting original global arrays from request 
PHPBB3-11673
 2013-07-14 14:22:42 -04:00
Nils Adermann
d4d3d311b9 [ticket/11700] Implement namespace loading in the class loader 
PHPBB3-11700
 2013-07-14 13:54:56 -04:00
Nils Adermann
da2752e400 [ticket/11700] Modify all code to use the new interface names 
PHPBB3-11700
 2013-07-14 13:30:52 -04:00