Commit graph

18570 commits

Author SHA1 Message Date
Marc Alexander
bc6122b64f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531 2013-07-14 16:51:46 -04:00
Nils Adermann
b3e8734a49 [ticket/11700] Load the dbms with namespaces
PHPBB3-11700
2013-07-14 16:35:04 -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
Nils Adermann
3d45f69572 [ticket/11700] Load namespaced classes in tests
PHPBB3-11700
2013-07-14 16:21:59 -04:00
Joseph Warner
a8e60c306d [feature/oauth] Remove get_service_credentials() from oauth provider
PHPBB3-11673
2013-07-14 16:02:10 -04:00
David King
1891e24ea6 Merge remote-tracking branch 'upstream/pr/1570' into develop
* upstream/pr/1570:
  [ticket/11706] Use @ to suppress errors for getimagesize in remote avatar
2013-07-14 16:02:09 -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
Joas Schilling
d8dea63778 Merge pull request #9 from igorw/ticket/11574
[ticket/11574] Fix more issues in the updater
2013-07-14 12:47:49 -07: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
Nils Adermann
4311cd65e3 [ticket/11700] Instantiate the class loader with namespace rather than prefix
PHPBB3-11700
2013-07-14 14:29:11 -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
4b1390ca31 [feature/oauth] Pathing information for some services
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
e600596602 [feature/oauth] Scopes/path part one
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
a7bfe5eeeb [feature/oauth] Changes to oauth
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
6e73ccd00f [feature/oauth] Function to update user_id of a token
PHPBB3-9734
2013-07-14 14:22:43 -04:00
Joseph Warner
9619a9a16f [feature/oauth] Anonymous user does not depend on user_id in token
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
3c8187c277 [feature/oauth] Have array of services not just one in oauth
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
68a80f8ea8 [feature/oauth] Fix typo
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
5942eac5da [feature/oauth] Pass table in constructor
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
69e1588655 [feature/oauth] Store anonymous user by session id
PHPBB3-9734
2013-07-14 14:22:43 -04:00
Joseph Warner
b22b076a99 [feature/oauth] Update invocation of method in OAuth
PHPBB3-11673
2013-07-14 14:22:43 -04:00
Joseph Warner
02921f4b23 [feature/oauth] Have token storage use DB
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
24bf333e16 [feature/oauth] Use DB for OAuth token storage
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
37f099b014 [feature/oauth] Document and rearrange methods
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
aa12f6afc5 [feature/oauth] More work on login
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
93f7ed4fb5 [feature/oauth] Continue work on OAuth login
PHPBB3-11673
2013-07-14 14:22:42 -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
Joseph Warner
6479a989c5 [feature/oauth] Token Storage Skeleton
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
d63f920250 [feature/oauth] Check that the service actually has settings
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
1e38be3fa9 [feature/oauth] Additional work on implementing login
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
65485253c9 [feature/oauth] Start implementing login
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
232a8c6740 [feature/oauth] OAuth as a symfony service
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
6a29d9cf81 [feature/oauth] OAuth provider skeleton
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Joseph Warner
3254f7c02b [feature/oauth] Include OAuth library in composer.json
PHPBB3-11673
2013-07-14 14:22:42 -04:00
Nils Adermann
af69349398 Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop
* github-phpbb/develop-olympus:
  [ticket/11704] Use the correct directory for dependency checking.
  [ticket/11704] Correctly escape "
2013-07-14 13:56:05 -04:00
Nils Adermann
8d8a0602d6 Merge pull request #1567 from bantu/ticket/11704
[ticket/11704] phing build script does not include vendor folder, even if there are dependencies
2013-07-14 10:55:32 -07:00
Nils Adermann
d4d3d311b9 [ticket/11700] Implement namespace loading in the class loader
PHPBB3-11700
2013-07-14 13:54:56 -04:00
Andreas Fischer
da1ee75140 [ticket/11704] Use the correct directory for dependency checking.
PHPBB3-11704
2013-07-14 19:48:55 +02:00
Andreas Fischer
2a41128e6b [ticket/11704] Correctly escape "
PHPBB3-11704
2013-07-14 19:48:41 +02: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