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

7853 Commits

Author SHA1 Message Date
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
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
6a29d9cf81 [feature/oauth] OAuth provider skeleton 
PHPBB3-11673
 2013-07-14 14:22:42 -04:00
Joas Schilling
f302cbe175 [ticket/11696] Move file to new directory 
PHPBB3-11696
 2013-07-14 10:16:15 -04:00
Joas Schilling
131194d216 [ticket/11696] Rename constructor to __construct() 
PHPBB3-11696
 2013-07-14 10:12:49 -04:00
Joas Schilling
057d860d07 [ticket/11696] Rename db_tools.php so it can be autoloaded 
PHPBB3-11696
 2013-07-14 10:10:05 -04:00
Nils Adermann
7030578bbe [ticket/11698] Moving all autoloadable files to phpbb/ 
PHPBB3-11698
 2013-07-14 01:32:34 -04:00
Nils Adermann
4186c05bb4 Merge pull request #1555 from EXreaction/ticket/11692 
[ticket/11692] Don't update search_type in dev migration if already appended
 2013-07-13 20:53:48 -07:00
Vjacheslav Trushkin
8d30322635 [ticket/11694] Do not locate assets with root path 
Do not locate assets that start with ./

PHPBB3-11694
 2013-07-13 23:15:26 -04:00
Nathaniel Guse
176729ab00 [ticket/11692] Don't update search_type in dev migration if already appended 
PHPBB3-11692
 2013-07-13 17:50:35 -05:00
Nils Adermann
9f5ee08bae [ticket/11690] Old module class names may get autoloaded by class_exists 
PHPBB3-11690
 2013-07-13 16:47:25 -04:00
Nathan Guse
ea0ef00801 Merge pull request #1550 from nickvergessen/ticket/9649 
[ticket/9649] Display information on index for moderators on unapproved posts
 2013-07-13 12:03:33 -07:00
Joas Schilling
081350678d [ticket/9649] Display information on index for moderators on unapproved posts 
PHPBB3-9649
 2013-07-13 14:57:31 -04:00
Nathan Guse
e10cbbf023 Merge pull request #1541 from nickvergessen/ticket/11684 
[ticket/11684] Remove useless confirmation page after login and admin login
 2013-07-13 10:38:24 -07:00
Nathan Guse
b6c3939c32 Merge pull request #1543 from nickvergessen/ticket/11685 
[ticket/11685] Remove logout confirmation page
 2013-07-13 10:37:43 -07:00
Vjacheslav Trushkin
c1bb179914 [ticket/10999] Fix assets_version in ACP 
PHPBB3-10999
 2013-07-13 13:30:33 -04:00
Nils Adermann
0ef95a7009 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11112] Do not change opensource.org link to https
  [ticket/11112] Use https for user-visible links to phpbb.com

Conflicts:
	phpBB/language/en/install.php
	phpBB/language/en/ucp.php
 2013-07-13 13:16:58 -04:00
Nils Adermann
0341555314 Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11112] Do not change opensource.org link to https
  [ticket/11112] Use https for user-visible links to phpbb.com
 2013-07-13 13:14:48 -04:00
Joas Schilling
8f95ef55a6 [ticket/11685] Remove logout confirmation page 
PHPBB3-11685
 2013-07-13 12:27:00 -04:00
Joas Schilling
7d0c1d02ca [ticket/11684] Remove useless confirmation page after login and admin login 
PHPBB3-11684
 2013-07-13 12:02:49 -04:00
Nathan Guse
87795eba55 Merge pull request #1017 from nickvergessen/feature/softdelete-1-permission 
Soft delete
 2013-07-13 08:57:20 -07:00
Nathan Guse
d879acb7cc Merge pull request #1519 from cyberalien/ticket/11647 
Fix INCLUDEJS URLs handling
 2013-07-13 08:46:46 -07:00
Joas Schilling
1584fdd26d Merge remote-tracking branch 'EXreaction/ticket/11420' into develop 
* EXreaction/ticket/11420:
  [ticket/11420] Fix tests
  [ticket/11420] Fix tests
  [ticket/11420] Fix tests
  [ticket/11420] Use !==, === when comparing strings
  [ticket/11420] Fix comments, license link
  [ticket/11420] Rename migrations file to something more helpful
  [ticket/11420] Forgot to include mock sql_insert_buffer
  [ticket/11420] Fix notification options conversion
 2013-07-13 11:15:53 -04:00
Joas Schilling
6cde302ffa [ticket/9657] Remove old code 
PHPBB3-9657
 2013-07-13 10:47:42 -04:00
Joas Schilling
8352a7cada Merge remote-tracking branch 'phpbb/develop' into ticket/9657 
* phpbb/develop: (216 commits)
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
  [ticket/11668] Run lint test at the end of the test suite
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
  [ticket/11665] Fix test class name
  [ticket/11664] Stop creating php.html file in root path in tests
  [ticket/11665] Can't change file names already sent to set_filenames
  [ticket/11662] Typos: occured -> occurred
  [ticket/11662] Typos: occured -> occurred
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
  [feature/auth-refactor] Add parent::setUp() in setUp()
  [feature/auth-refactor] Changes
  [feature/auth-refactor] DataProvider for acp_board test
  ...
 2013-07-13 09:36:24 -04:00
Joas Schilling
28e3341fcd [ticket/9657] Keep approval state of posts/topics when copying them 
PHPBB3-9657
 2013-07-13 00:54:39 -04:00
Marc Alexander
07eadac2f6 [ticket/11112] Use https for user-visible links to phpbb.com 
PHPBB3-11112
 2013-07-12 16:24:27 -04:00
Nathaniel Guse
b5651c0289 Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into develop 
# By Joseph Warner
# Via Joseph Warner
* remotes/Hardolaf/ticket/11626:
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [ticket/11626] Make identifier uppercase per style requirements
  [ticket/11626] Change the identifier template file in the template
  [ticket/11626] Call method only one time per provider
  [ticket/11626] Change interface to match functionality
  [ticket/11626] Include the template file in acp_board
  [ticket/11626] LDAP Auth ACP Template File
  [ticket/11626] Create get_acp_template method for auth providers
 2013-07-12 14:59:43 -05:00
Joseph Warner
64308f41b0 [ticket/11626] Remove last reference to template in ldap 
PHPBB3-11626
 2013-07-12 15:57:35 -04:00
Joseph Warner
631ce22f2c [ticket/11626] Remove LDAP dependency on template 
Returns template vars rather than requiring the template.

PHPBB3-11626
 2013-07-12 15:54:41 -04:00
Nathan Guse
86b910692a Merge pull request #1515 from Hardolaf/feature/auth-refactor 
[feature/auth-refactor] Use a base class for all authentication providers
 2013-07-12 12:51:35 -07:00
Andreas Fischer
dfa888c13f Merge branch 'develop' of git://github.com/phpbb/phpbb3 into develop 
* 'develop' of git://github.com/phpbb/phpbb3:
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
 2013-07-12 21:45:30 +02:00