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
19,096 Commits 17 Branches 190 Tags
Commit Graph

8174 Commits

Author SHA1 Message Date
Joseph Warner
245e71e4e2 [feature/oauth] Add get_login_data to the auth_provider_interface 
PHPBB3-11673
 2013-08-02 14:05:44 -04:00
Andreas Fischer
ea8f584de9 [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. 2013-08-01 17:26:34 +02:00
Joas Schilling
9f60a38539 Merge remote-tracking branch 'brunoais/ticket/11653' into develop 
* brunoais/ticket/11653:
  [ticket/11653] Use $parse_flags
  [ticket/11653] generate_text_for_display on mcp/mcp_topic.php
 2013-08-01 16:50:50 +02: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
2f25197279 [ticket/11641] Use $parse_flags 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11641
 2013-08-01 10:16:33 +01: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
a302a09ffb [ticket/11642] Use $parse_flags 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11642
 2013-08-01 10:12:58 +01:00
Bruno Ais
ea6938d3e5 [ticket/11643] Use $parse_flags 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11643
 2013-08-01 10:11:08 +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
776773522b [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:07:58 +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
Vjacheslav Trushkin
c335edc038 [ticket/11754] Remove styleswitcher leftovers 
PHPBB3-11754
 2013-07-30 12:21:34 +03:00
Joas Schilling
91392c7288 Merge remote-tracking branch 'phpbb/develop' into ticket/11574 
* phpbb/develop: (130 commits)
  [ticket/11638] Changed the layout to match the other similar commits
  [ticket/11640] removed the space that I wonder what it was doing there.
  [ticket/11749] Move event after all template data has been defined
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
  [ticket/11749] Template events for topic_list_row_pre/append
  [ticket/11749] PHP Events for viewforum.php
  [ticket/11749] PHP Events for search.php
  [ticket/11740] Update FAQ to include Ideas Centre
  [ticket/11062] If user's language is english there is no further work needed
  [ticket/11062] Load new strings from user's language file if provided
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
  [ticket/11741] Fix empty brackets and remove bullet
  [ticket/11638] Removed the unneeded reset.
  [ticket/11638] Use the $parse_flags like the other commits
  [ticket/11638] Reverted to use the $parse tags way as the other ones
  [ticket/11638] Updated: bitwise $parse_flags use optionset()
  [ticket/11656] Made the check for the bitfield just like other PR's
  [ticket/11667] Use @inheritdoc
  ...
 2013-07-30 01:06:11 +02: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
Joas Schilling
db78c11702 Merge pull request #1625 from brunoais/ticket/11640 
[ticket/11640] removed the space that I wonder what it was doing there.
 2013-07-29 09:09:46 -07:00
Joseph Warner
75206c74be [feature/oauth] Basic checking for data needed in login linking 
PHPBB3-11673
 2013-07-29 11:58:47 -04:00
Bruno Ais
b8fef3b33a [ticket/11640] removed the space that I wonder what it was doing there. 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11640
 2013-07-29 16:55:58 +01: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
Nathan Guse
8cc2725703 Merge pull request #1576 from brunoais/ticket/11640 
[ticket/11640] generate_text_for_display on functions_privmsgs.php
 2013-07-29 07:29:25 -07:00
Nathan Guse
7003f98d03 Merge pull request #1586 from brunoais/ticket/11654 
[ticket/11654] generate_text_for_display on mcp/mcp_warn.php
 2013-07-29 07:26:15 -07:00
Nathan Guse
a79e3b3415 [ticket/11373] Prune old read notifications with cron 
PHPBB3-11373
 2013-07-27 20:37:50 -05:00
Nathan Guse
46b4a405b1 [ticket/11745] Group request approved notification 
PHPBB3-11745
 2013-07-27 17:02:45 -05: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
Nathaniel Guse
ffbc144a73 [ticket/11628] Make get_template_vars protected 
Remove all references to it and the hacky code in messenger that was using it

PHPBB3-11628
 2013-07-24 13:38:12 -05:00
Nathaniel Guse
12c2258506 [ticket/11628] Remove template_path option on set_custom_style 
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)

PHPBB3-11628
 2013-07-24 13:25:20 -05:00
Nathaniel Guse
863592a8be [ticket/11628] Remove set_style_names function, moved to set_custom_style 
PHPBB3-11628
 2013-07-24 13:19:20 -05:00
Nathaniel Guse
4b761f6575 [ticket/11628] Remove third parameter ($names) from set_custom_style 
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument

PHPBB3-11628
 2013-07-24 12:56:39 -05:00
Joseph Warner
581cb37b8c [feature/oauth] Start linking/registering OAuth accounts during login 
PHPBB3-11673
 2013-07-24 13:46:33 -04:00
Nathaniel Guse
5d1afb4532 [ticket/11628] Remove phpbb_style (move methods to phpbb_template) 
PHPBB3-11628
 2013-07-24 12:24:35 -05:00
Nathaniel Guse
44a82dd083 [ticket/11628] Remove style path provider 
No longer used since Twig was implemented.

PHPBB3-11628
 2013-07-24 12:05:04 -05:00
Nathaniel Guse
98b385bc1c [ticket/11628] Remove style resource locator 
No longer used since Twig was implemented.

PHPBB3-11628
 2013-07-24 11:59:21 -05:00