Commit graph

18275 commits

Author SHA1 Message Date
Joseph Warner
9eb4d55e82 [feature/oauth] Start work on linking an oauth account
Updates token storage to allow retrieval only by session_id

PHPBB3-11673
2013-07-29 14:27:46 -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
Joas Schilling
49d908e959 Merge pull request #1624 from brunoais/ticket/11638
[ticket/11638] Changed the layout to match the other similar commits
2013-07-29 09:09:07 -07:00
Bruno Ais
ccc5c5f6b8 [ticket/11638] Changed the layout to match the other similar commits
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-29 17:00:51 +01: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
7027610e23 Merge pull request #1542 from brunoais/ticket/11638
[ticket/11638] generate_text_for_display on viewtopic.php
2013-07-29 07:42:32 -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
6cbe887ea0 Merge pull request #1619 from VSEphpbb/ticket/11749
[ticket/11749] PHP and Template Events for Topic Preview Extension
2013-07-29 07:18:41 -07:00
Matt Friedman
9902f1c751 [ticket/11749] Move event after all template data has been defined
PHPBB3-11749
2013-07-29 00:05:31 -07:00
Nathan Guse
0215e0bd95 [ticket/11724] Replace spaces with tabs
PHPBB3-11724
2013-07-28 21:31:12 -05:00
Nathan Guse
9bec7b21a2 Merge branch 'ticket/11744' of github.com:EXreaction/phpbb3 into ticket/11744
* 'ticket/11744' of github.com:EXreaction/phpbb3:
  [ticket/11744] Helper function to assert notifications in base test
2013-07-28 21:16:26 -05:00
Nathan Guse
cbe72ab14b [ticket/11744] Cast to int
PHPBB3-11744
2013-07-28 21:15:58 -05:00
Nathan Guse
28daa60e9e [ticket/11744] Inheritdoc
PHPBB3-11744
2013-07-28 21:10:17 -05:00
Oliver Schramm
dd875f13e8 [ticket/10917] Variable used only once so delete it
The variable $this->unequal_version was only used once
and only to display the version the package updates to.
To display the version it updates to makes no sense when
the update files just aren't meant to update from the
current version. (It's already shown in an error message)
So I deleted the variable from there.

Furthermore the use of version_compare makes the variable
useless in that context which is why I deleted the variable
from the whole file and replaced it in the relevant if statement
with the old comparison.

PHPBB3-10917
2013-07-28 13:55:37 +02:00
Nathan Guse
a79e3b3415 [ticket/11373] Prune old read notifications with cron
PHPBB3-11373
2013-07-27 20:37:50 -05:00
Nathan Guse
d5c56c5d50 [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
PHPBB3-11724
2013-07-27 20:02:03 -05:00
Nathan Guse
97204e432b [ticket/11745] Add test for group request approved
PHPBB3-11745
2013-07-27 19:32:51 -05:00
Nathan Guse
c4cb9574c5 Merge branch 'ticket/11744' of github.com:EXreaction/phpbb3 into ticket/11745
* 'ticket/11744' of github.com:EXreaction/phpbb3:
  [ticket/11744] Helper function to assert notifications in base test
2013-07-27 19:32:09 -05:00
Nathan Guse
359aedf664 [ticket/11744] Helper function to assert notifications in base test
This also fixes tests

PHPBB3-11744
2013-07-27 19:31:31 -05:00
Nathan Guse
46b4a405b1 [ticket/11745] Group request approved notification
PHPBB3-11745
2013-07-27 17:02:45 -05:00
Oliver Schramm
d8584877a1 [ticket/10917] Revert use of phpbb wrapper
PHPBB3-10917
2013-07-27 22:37:44 +02:00
Matt Friedman
8e636e4572 [ticket/11749] Template events for topic_list_row_pre/append
PHPBB3-11749
2013-07-27 10:48:40 -07:00
Matt Friedman
9ffb150d47 [ticket/11749] PHP Events for viewforum.php
PHPBB3-11749
2013-07-27 10:45:40 -07:00
Matt Friedman
9e68404de5 [ticket/11749] PHP Events for search.php
PHPBB3-11749
2013-07-27 10:44:39 -07:00
Matt Friedman
9ea9afd1c4 [ticket/11747] Tweak some of the wording in the events doc
PHPBB3-11747
2013-07-27 09:19:34 -07:00
Nathan Guse
b213be84a7 [ticket/11744] Comments
PHPBB3-11744
2013-07-27 09:09:24 -05:00
Nathan Guse
93db6190f5 [ticket/11744] Language
PHPBB3-11744
2013-07-27 09:08:35 -05:00
Nathan Guse
7cfb04690d [ticket/11744] Copyright year
PHPBB3-11744
2013-07-27 09:07:23 -05:00
Matt Friedman
dacca5657a [ticket/11747] Use _prepend and _append for template events
PHPBB3-11747
2013-07-26 22:25:27 -07:00
Matt Friedman
442b2a292e [ticket/11747] ucp_prefs_post template events
PHPBB3-11747
2013-07-26 18:33:54 -07:00
Matt Friedman
01e133f356 [ticket/11747] ucp_prefs_post core events
PHPBB3-11747
2013-07-26 18:33:27 -07:00
Matt Friedman
b716e1177d [ticket/11747] ucp_prefs_view template events
PHPBB3-11747
2013-07-26 18:33:07 -07:00
Matt Friedman
d3859aa874 [ticket/11747] ucp_prefs_view core events
PHPBB3-11747
2013-07-26 18:31:58 -07:00
Matt Friedman
cd329c55a7 [ticket/11747] ucp_prefs_personal template events
PHPBB3-11747
2013-07-26 18:31:05 -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
49c6e83560 [ticket/11744] Fix tests for postgresql
PHPBB3-11744
2013-07-26 17:27:52 -05:00
Nathaniel Guse
7dd16f4148 [ticket/11744] spelling
PHPBB3-11744
2013-07-26 15:44:49 -05:00
Nathaniel Guse
f2ad22439f [ticket/11744] Empty notifications tables after testing them
PHPBB3-11744
2013-07-26 15:00:45 -05:00
Nathaniel Guse
4f0dd9a752 [ticket/11744] Tables are not truncated in some dbms during tests
PHPBB3-11744
2013-07-26 14:51:46 -05:00
Nathaniel Guse
185d4e112e [ticket/11744] Fix functional test case that's failing
PHPBB3-11744
2013-07-26 14:39:34 -05:00
Nathaniel Guse
9573b36b32 [ticket/11744] Include once
PHPBB3-11744
2013-07-26 13:23:33 -05:00
Nathaniel Guse
03ff0581e0 [ticket/11744] Cleanup
PHPBB3-11744
2013-07-26 13:10:13 -05:00