Commit graph

1117 commits

Author SHA1 Message Date
Joseph Warner
9cd80345ad [feature/oauth] Implement unlinking in OAuth
PHPBB3-11673
2013-08-14 16:33:10 -04:00
Joseph Warner
cd12786e58 [feature/oauth] Fix errors found in testing linking
PHPBB3-11673
2013-08-14 16:02:47 -04:00
Joseph Warner
bb68338861 [feature/oauth] Refactor oauth::link_account for two paths
PHPBB3-11673
2013-08-14 15:55:58 -04:00
Joseph Warner
afebbf231a [feature/oauth] Update link_account to allow for two methods of linking
PHPBB3-11673
2013-08-14 15:36:20 -04:00
Joseph Warner
ce387d9bfc [feature/oauth] Fix errors in ucp_auth_link
PHPBB3-11673
2013-08-14 15:21:24 -04:00
Joseph Warner
67b1ec5bb8 [feature/oauth] Start implementing link/unlink actions
PHPBB3-11673
2013-08-14 15:19:40 -04:00
rechosen
e2014ab76e [ticket/11786] Fix PHPDoc documentation of a few events
Fixed some PHPDoc errors I noticed while working on the karma extension.
Mostly spacing issues or omitted characters, though there was one description
that made no sense at all.

PHPBB3-11786
2013-08-13 16:23:54 +02:00
Joseph Warner
836d3ba22e [feature/oauth] Handle hidden fields
PHPBB3-11673
2013-08-12 15:29:22 -04:00
Joseph Warner
4003e077c1 [feature/oauth] Get the OAuth template in place for ucp_auth_link
PHPBB3-11673
2013-08-12 14:43:35 -04:00
Joseph Warner
a479f919ff [feature/oauth] Error handling on page
PHPBB3-11673
2013-08-12 12:53:22 -04:00
Joseph Warner
69cb2e4c60 [feature/oauth] More template work
PHPBB3-11673
2013-08-09 05:26:44 -04:00
Joseph Warner
0b80aaf217 [feature/oauth] Add method to return necessary data for auth_link
PHPBB3-11673
2013-08-09 05:17:27 -04:00
Joseph Warner
deb62d51fe [feature/oauth] Start building the template
PHPBB3-11673
2013-08-09 05:12:57 -04:00
Joseph Warner
b5255d42b5 [feature/oauth] Default auth_link into UCP_PROFILE not UCP_MAIN
PHPBB3-11673
2013-08-09 04:39:06 -04:00
Joseph Warner
4683c37682 [feature/oauth] Forgot to have login_link be "in login" in ucp
PHPBB3-11673
2013-08-05 17:35:44 -04:00
Joseph Warner
baa3a750c4 [feature/oauth] Start general auth linking page
PHPBB3-11673
2013-08-05 15:38:03 -04:00
Joas Schilling
498f6ccbfc Merge remote-tracking branch 'brunoais/ticket/11655' into develop
* brunoais/ticket/11655:
  [ticket/11653] Use $parse_flags
  [ticket/11653] Missing ";"
  [ticket/11655] Use $parse_flags
  [ticket/11655] wrong var names for the uid and for the bitfield
  [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.php
2013-08-01 11:39:17 +02:00
Bruno Ais
3ae33910fc [ticket/11653] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11653
2013-08-01 10:14:34 +01:00
Bruno Ais
c806375828 [ticket/11653] Missing ";"
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11653
2013-08-01 10:09:11 +01:00
Bruno Ais
c2aff70cf5 [ticket/11655] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11655
2013-08-01 10:03:04 +01:00
Joas Schilling
ca07be9c57 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10037] Fix table in subsilver2
  [ticket/10037] Apply attached patch with a few changes
2013-07-31 23:40:35 +02:00
Joseph Warner
aa80ac44a4 [feature/oauth] Login_link works with ucp_register now
PHPBB3-11673
2013-07-31 14:54:28 -04:00
Joseph Warner
3b19d5c198 [feature/oauth] Fix errors on ucp_login_link
PHPBB3-11673
2013-07-31 14:46:45 -04:00
Joseph Warner
b6d93d21ba [feature/oauth] Login_link in registration
PHPBB3-11673
2013-07-31 13:46:57 -04:00
Joseph Warner
0cbfa8ffd4 [feature/oauth] Start working on login_link registration support
PHPBB3-11673
2013-07-30 14:45:23 -04:00
Joseph Warner
3d55e5faa9 [feature/oauth] Works in all tests now
PHPBB3-11673
2013-07-29 16:04:08 -04:00
Joseph Warner
600c29e6ec [feature/oauth] Most of ucp page related to login option should be done now
PHPBB3-11673
2013-07-29 14:02:09 -04:00
Joseph Warner
ec160814b8 [feature/oauth] More work on getting login link working
PHPBB3-11673
2013-07-29 13:48:42 -04:00
Joseph Warner
c09bda10fc [feature/oauth] Properly check that all data needed is available
PHPBB3-11673
2013-07-29 13:11:15 -04:00
Joseph Warner
bcdeafedd7 [feature/oauth] Login works on login_link now, still does not actually link
PHPBB3-11673
2013-07-29 12:56:25 -04:00
Joseph Warner
75206c74be [feature/oauth] Basic checking for data needed in login linking
PHPBB3-11673
2013-07-29 11:58:47 -04:00
Nathan Guse
6da63f3ad8 Merge pull request #1597 from marc1706/ticket/11723
[ticket/11723] Correctly redirect user to agreement page and let him leave
2013-07-29 07:45:51 -07:00
Matt Friedman
01e133f356 [ticket/11747] ucp_prefs_post core events
PHPBB3-11747
2013-07-26 18:33:27 -07:00
Matt Friedman
d3859aa874 [ticket/11747] ucp_prefs_view core events
PHPBB3-11747
2013-07-26 18:31:58 -07:00
Matt Friedman
79cd86bcbc [ticket/11747] ucp_prefs_personal core events
PHPBB3-11747
2013-07-26 18:29:06 -07:00
Matt Friedman
37ceb57d12 [ticket/11747] Add $phpbb_dispatcher to global
PHPBB3-11747
2013-07-26 18:27:47 -07:00
Nathaniel Guse
c260e82a9b [ticket/11744] Move notification from ucp_groups to group_user_add
PHPBB3-11744
2013-07-26 11:22:44 -05:00
Nathan Guse
e0ef10128b [ticket/11744] Group join request notification
PHPBB3-11744
2013-07-26 10:26:52 -05:00
Joseph Warner
59852b5997 [feature/oauth] More work on login linking accounts
PHPBB3-11673
2013-07-25 14:53:19 -04:00
Joseph Warner
317a71a838 [feature/oauth] Template for ucp_login_link started
PHPBB3-11673
2013-07-25 12:49:54 -04:00
Oliver Schramm
866e475f96 [ticket/10037] Apply attached patch with a few changes
PHPBB3-10037
2013-07-25 15:47:55 +02:00
Joseph Warner
9cbf670f51 [feature/oauth] Some work on login_link
PHPBB3-11673
2013-07-24 15:31:12 -04:00
Joseph Warner
27ea03d3e0 [feature/oauth] Initial login_link ucp class
PHPBB3-11673
2013-07-24 14:55:29 -04:00
Marc Alexander
974da6449c [ticket/11723] Correctly redirect user to agreement page and let him leave
This patch consists of two changes. The first one will make sure that $agree
is correctly reset to 0 and the user redirected back to the agreement page
after changing the display language. Secondly, by reseting 'change_lang',
the user will be able to agree to the terms on the agreement page again.
The changed language will still be kept, as this is correctly saved in the
'lang' field that is passed to the ucp_register page.
The variable $agree has also been changed to be boolean. It is not used as
an integer anywere in the ucp_register file.

PHPBB3-11723
2013-07-22 22:20:55 +02: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
Bruno Ais
43b172c8aa [ticket/11655] wrong var names for the uid and for the bitfield
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11655
2013-07-20 16:44:24 +01:00
Bruno Ais
ef7a7cac6d [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11655
2013-07-19 18:27:25 +01: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
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
Andreas Fischer
382ae5a01e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11548] Use new static methods for request and submit
  [ticket/11548] Run array_map on complete error array and not just colour_error

Conflicts:
	tests/functional/ucp_groups_test.php
2013-07-12 00:11:18 +02:00