mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-19 08:01:27 +02:00
Code Issues Releases Wiki Activity
23,471 Commits 18 Branches 192 Tags
f3588c66ec22b71e779da1497a690802e1c6b51a
Commit Graph

1081 Commits

Author SHA1 Message Date
Nathan Guse
e8ab8fe0bc Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323 
# By Joas Schilling (613) and others
# Via Andreas Fischer (214) and others
* 'develop' of github.com:phpbb/phpbb3: (2494 commits)
  [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
  [ticket/11215] Remove unnecessary comment
  [ticket/11755] MySQL upgrader out of date
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
  [ticket/11812] Fix empty define
  [ticket/11818] Update Symfony dependencies to 2.3.*
  [ticket/11791] Load adm/ events from styles/adm/event/
  [ticket/11215] Fix helper_url_test.php tests
  [ticket/11215] Add newline back to .htaccess, fix wording
  [ticket/11215] Update comment in .htaccess
  [ticket/11215] Uncomment rewrite rules in .htaccess
  [ticket/11215] Make controller helper url() method use correct format
  [ticket/11215] Add commented-out URL rewrite capability to .htaccess
  [ticket/11821] Fix comma usage next to "You are receiving this notification".
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11215] Use new URL structure for controllers
  [ticket/11215] Everything appears to be working...
  ...

Conflicts:
	phpBB/includes/functions_privmsgs.php
 2013-09-05 13:56:57 -05:00
Nathan Guse
dd86e8d0ae Merge pull request #1618 from VSEphpbb/ticket/11747 
[ticket/11747] UCP Prefs Core and Template Events
 2013-09-05 11:36:25 -07:00
Joseph Warner
d5808f13e5 [feature/oauth] Fix bug on ucp_auth_link related to error display 
PHPBB3-11673
 2013-09-02 16:54:30 -04:00
Joseph Warner
ae18f921ea [feature/oauth] More small fixes 
PHPBB3-11673
 2013-09-02 16:52:41 -04:00
Joseph Warner
29e3768ecc [feature/oauth] More minor changes from review 
PHPBB3-11673
 2013-09-02 16:47:53 -04:00
Joseph Warner
51f06f36f1 [feature/oauth] Fix small issues on ucp pages 
PHPBB3-11673
 2013-09-02 16:31:21 -04:00
Joas Schilling
44ddcf792f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11799] Send anti abuse headers in "new password" emails.
 2013-08-26 16:57:46 +02:00
Joseph Warner
d847df7175 [feature/oauth] A few more minor changes 
PHPBB3-11673
 2013-08-24 22:10:34 -04:00
Joseph Warner
a8ffbce99f [feature/oauth] Changes due to code review 
PHPBB3-11673
 2013-08-24 22:04:04 -04:00
Joseph Warner
76d1e7e111 [feature/oauth] Fix issues on ucp_login_link from review 
PHPBB3-11673
 2013-08-24 21:14:55 -04:00
Joseph Warner
27ba57747a [feature/oauth] Clean up TODOs 
PHPBB3-11673
 2013-08-24 17:17:31 -04:00
Andreas Fischer
5f81d66c2f [ticket/11799] Send anti abuse headers in "new password" emails. 
PHPBB3-11799
 2013-08-23 03:55:26 +02:00
Joseph Warner
e2d0a0b7c8 [feature/oauth] Fix template not refreshing issue 
PHPBB3-11673
 2013-08-14 23:18:10 -04:00
Joseph Warner
43e08e221f [feature/oauth] Fix bug found in testing 
PHPBB3-11673
 2013-08-14 22:50:49 -04:00
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