makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-20 10:18:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
19718 commits 18 branches 192 tags 207 MiB
Commit graph

19718 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Nathaniel Guse
d6384f8939 [ticket/11744] Group request test 
PHPBB3-11744
 2013-07-26 13:09:24 -05:00
Nathaniel Guse
a988c7e396 [ticket/11744] Create base notification test class for setup 
PHPBB3-11744
 2013-07-26 13:08:53 -05:00
Nathaniel Guse
3f230b1a8c [ticket/11744] Create null log class (primarily for unit test) 
PHPBB3-11744
 2013-07-26 12:29:49 -05: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
Nathaniel Guse
26dac64d45 Merge branch 'develop-olympus' into develop 
# By Oliver Schramm
# Via Nathaniel Guse (1) and Oliver Schramm (1)
* develop-olympus:
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
 2013-07-25 13:36:52 -05:00
Nathaniel Guse
935001b7a2 Merge remote-tracking branch 'remotes/Elsensee/ticket/10917' into develop-olympus 
# By Oliver Schramm
# Via Oliver Schramm
* remotes/Elsensee/ticket/10917:
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
 2013-07-25 13:36:29 -05:00
Nathaniel Guse
bea1ce92a1 Merge branch 'develop-olympus' into develop 
# By Oliver Schramm
# Via Nathaniel Guse (1) and Oliver Schramm (1)
* develop-olympus:
  [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
 2013-07-25 13:34:10 -05:00
Nathaniel Guse
162ea10b6a Merge remote-tracking branch 'remotes/Elsensee/ticket/11062' into develop-olympus 
# By Oliver Schramm
# Via Oliver Schramm
* remotes/Elsensee/ticket/11062:
  [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
 2013-07-25 13:32:23 -05:00
Joseph Warner
317a71a838 [feature/oauth] Template for ucp_login_link started 
PHPBB3-11673
 2013-07-25 12:49:54 -04:00
Joseph Warner
fcac58e065 [feature/oauth] Have login_link loaded in ucp.php 
PHPBB3-11673
 2013-07-25 11:41:19 -04:00
Nathan Guse
57bc3c7d3a [ticket/11628] phpbb_template, not phpbb_template_interface 
PHPBB3-11628
 2013-07-25 09:32:28 -05:00
Oliver Schramm
866e475f96 [ticket/10037] Apply attached patch with a few changes 
PHPBB3-10037
 2013-07-25 15:47:55 +02:00
Andreas Fischer
5ebc36f583 Merge remote-tracking branch 'Elsensee/ticket/11741' into develop 
* Elsensee/ticket/11741:
  [ticket/11741] Fix empty brackets and remove bullet
 2013-07-25 14:20:29 +02:00
Andreas Fischer
8e1801698e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11740] Update FAQ to include Ideas Centre
 2013-07-25 14:08:06 +02:00
Andreas Fischer
76a7d544cf Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11740] Update FAQ to include Ideas Centre
 2013-07-25 14:07:53 +02:00
Andreas Fischer
469d9ee171 Merge remote-tracking branch 'unknownbliss/ticket/11740' into prep-release-3.0.12 
* unknownbliss/ticket/11740:
  [ticket/11740] Update FAQ to include Ideas Centre
 2013-07-25 14:07:10 +02:00
MichaelC
c5de4dd51d [ticket/11740] Update FAQ to include Ideas Centre 
PHPBB3-11740
 2013-07-25 13:06:11 +01:00
Oliver Schramm
7304ac9c3c [ticket/11062] If user's language is english there is no further work needed 
PHPBB3-11062
 2013-07-25 13:10:45 +02:00
Oliver Schramm
a9f0577502 [ticket/11062] Load new strings from user's language file if provided 
PHPBB3-11062
 2013-07-25 12:29:25 +02:00
Joas Schilling
593ab9362e Merge remote-tracking branch 'brunoais/ticket/11656' into develop 
* brunoais/ticket/11656:
  [ticket/11656] Made the check for the bitfield just like other PR's
  [ticket/11656] Wrong bitwise OR
  [ticket/11656] Remove line break in function call
  [ticket/11656] generate_text_for_display on memberlist.php
 2013-07-24 22:14:52 +02:00
Joseph Warner
7c065bc9a2 [feature/oauth] Finish fixes from tests and tests for token storage 
PHPBB3-11673
 2013-07-24 16:06:34 -04:00