mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity
26,799 Commits 17 Branches 190 Tags
Commit Graph

26799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
5f4943c183 Merge pull request #3760 from Zoddo/ticket/14014 
[ticket/14014] Add core.mcp_forum_view_before event
 2015-08-09 10:13:24 +02:00
Marc Alexander
7b8f8d7d90 Merge branch '3.1.x' 2015-08-09 10:08:06 +02:00
Marc Alexander
9e38f412ea Merge pull request #3756 from rxu/ticket/14005 
[ticket/14005] Allow extensions control post buttons displaying
 2015-08-09 10:08:00 +02:00
Marc Alexander
b1d8f8a22c Merge branch '3.1.x' 2015-08-09 10:00:34 +02:00
Marc Alexander
8d54f06d19 Merge pull request #3822 from brunoais/ticket/14083 
[ticket/14083] Fix wrong variables from previous commit
 2015-08-09 10:00:29 +02:00
Marc Alexander
994b9c2c77 Merge branch '3.1.x' 2015-08-09 09:56:40 +02:00
Marc Alexander
4d2940dd2f Merge pull request #3821 from brunoais/ticket/14082 
[ticket/14082] Fix wrong variables from previous commit
 2015-08-09 09:56:34 +02:00
brunoais
7a2f72df75 [ticket/14083] Fix wrong variables from previous commit 
Fixing variables wrongly attributed in PHPBB3-13693

PHPBB3-14083
 2015-08-08 22:45:38 +01:00
brunoais
84a40b6ad1 [ticket/14082] Fix wrong variables from previous commit 
Fixing variables wrongly attributed in PHPBB3-13686

PHPBB3-14082
 2015-08-08 22:23:17 +01:00
Marc Alexander
e41fcab3de Merge branch '3.1.x' 2015-08-08 22:40:40 +02:00
Marc Alexander
8e80425c82 Merge pull request #3759 from Zoddo/ticket/14013 
[ticket/14013] Add acp_forums_custom_settings event
 2015-08-08 22:40:35 +02:00
Marc Alexander
47b32f1da9 Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/avatar/driver/upload.php
	tests/avatar/manager_test.php
 2015-08-08 22:23:03 +02:00
Marc Alexander
b7e4d0b0a5 Merge pull request #3738 from javiexin/ticket/13981 
[ticket/13981] Add events to capture avatar deletion or overwriting
 2015-08-08 22:21:11 +02:00
Marc Alexander
46ffafd0c6 Merge branch '3.1.x' 2015-08-08 22:17:29 +02:00
Marc Alexander
3dcba7000b Merge pull request #3757 from Zoddo/ticket/14006 
[ticket/14006] Add core.ucp_register_agreement event
 2015-08-08 22:17:21 +02:00
Máté Bartus
962fb6b19b Merge pull request #3819 from Nicofuma/ticket/14079 
[ticket/14079] Correctly mark notifications as read
 2015-08-08 19:53:34 +02:00
Tristan Darricau
05d583bba7 [ticket/14079] Correctly mark notifications as read 
PHPBB3-14079
 2015-08-08 19:18:18 +02:00
Máté Bartus
ec270713d0 Merge pull request #3817 from Nicofuma/ticket/14076 
[ticket/14076] Fix notification settings
 2015-08-07 16:39:55 +02:00
Tristan Darricau
7e62b3a4b0 [ticket/14076] Fix notification settings 
PHPBB3-14076
 2015-08-07 16:38:53 +02:00
Máté Bartus
e4e3f595ec Merge pull request #3816 from Nicofuma/ticket/14074 
[ticket/14074] Fix mark notifications as read in the ucp
 2015-08-07 16:34:15 +02:00
Tristan Darricau
2260533d47 [ticket/14074] Fix mark notifications as read in the ucp 
PHPBB3-14074
 2015-08-07 16:14:40 +02:00
Marc Alexander
b55361e89b Merge remote-tracking branch 'Nicofuma/ticket/12692' 2015-08-07 10:07:45 +02:00
Tristan Darricau
618065ec16 [ticket/12692] Fix tests and update style 
PHPBB3-12692
 2015-08-06 13:26:14 +02:00
rxu
9e467a4e4a [ticket/14072] Add core event to the function format_display() 
PHPBB3-14072
 2015-08-06 03:51:48 +07:00
Marco Kubuntu
32f5dc3d8b [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration 
Changed the sql_fetchfield() call to comply to the function definition.

PHPBB3-14069
 2015-08-05 19:07:02 +02:00
Oliver Schramm
2510369804 [ticket/12143] Fix tests after rebase 
PHPBB3-12143
 2015-08-05 17:50:26 +02:00
Oliver Schramm
c3e5185135 [ticket/12143] Avoid no output from get_group_name() 
PHPBB3-12143
 2015-08-05 17:50:26 +02:00
Oliver Schramm
981bd8bed4 [ticket/12143] Fix those tests 
I always have to fix them.. :(

PHPBB3-12143
 2015-08-05 17:50:26 +02:00
Oliver Schramm
ca17bc7187 [ticket/12143] Add some tests 
PHPBB3-12143
 2015-08-05 17:50:25 +02:00
Oliver Schramm
d4095bb11d [ticket/12143] Oops, fixed array index 
PHPBB3-12143
 2015-08-05 17:50:25 +02:00
Oliver Schramm
185fbe41c9 [ticket/12143] Replace group name output 
So now we can use translated group names for non-special groups

PHPBB3-12143
 2015-08-05 17:50:24 +02:00
Oliver Schramm
4b3343e756 [ticket/12143] Add group helper class to translate groupnames 
We can translate groupnames now even though these groups aren't special

PHPBB3-12143
 2015-08-05 17:50:22 +02:00
Marc Alexander
f4c1796d5e [ticket/14070] Properly pass whether config should be ignored for avatars 
PHPBB3-14070
 2015-08-05 17:46:17 +02:00
Oliver Schramm
2b30e632b6 [ticket/12143] Add is_set method to language service 
We need that.

PHPBB3-12143
 2015-08-05 17:45:14 +02:00
Andreas Fischer
4aac578908 Merge pull request #3782 from RMcGirr83/ticket/13711 
[ticket/13711] Notifications are sent to inactive users

* RMcGirr83/ticket/13711:
  [ticket/13711] Notifications are sent to inactive users
 2015-08-05 13:45:02 +02:00
Andreas Fischer
452c8bef28 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13711] Notifications are sent to inactive users
 2015-08-05 13:45:02 +02:00
Andreas Fischer
50cf610eb6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14049] Use headers from config when sending Plupload delete request.
  [ticket/14010] Update Plupload from 2.1.2 to 2.1.8.
 2015-08-05 13:41:59 +02:00
Andreas Fischer
b34e74254a Merge pull request #3790 from prototech/ticket/14010 
[ticket/14010] Update Plupload from 2.1.2 to 2.1.8.

* prototech/ticket/14010:
  [ticket/14010] Update Plupload from 2.1.2 to 2.1.8.
 2015-08-05 13:40:40 +02:00
Andreas Fischer
e7c6c3f02b Merge pull request #3791 from prototech/ticket/14049 
[ticket/14049] Use headers from config when sending Plupload delete request.

* prototech/ticket/14049:
  [ticket/14049] Use headers from config when sending Plupload delete request.
 2015-08-05 13:39:44 +02:00
Tristan Darricau
cbe74844b0 Merge pull request #3698 from s9e/ticket/13935 
[ticket/13935] Allow more admin-configurable schemes in post links

* s9e/ticket/13935:
  [ticket/13935] Removed cache invalidation from acp_board
  [ticket/13935] Removed UI
  [ticket/13935] Allow more admin-configurable schemes in post links
 2015-08-05 12:59:55 +02:00
rxu
49bc477a87 [ticket/14067] Add template events to overall_header.html around feeds 
PHPBB3-14067
 2015-08-05 16:29:06 +07:00
rxu
6a7978965d [ticket/14065] Add template events to attachment.html 
Additionally remove some unnecessary empty lines.

PHPBB3-14065
 2015-08-03 18:35:15 +07:00
rxu
478a4c4133 [ticket/14064] Add template events to ucp_pm_history.html 
PHPBB3-14064
 2015-08-03 03:48:20 +07:00
Jakub Senko
7cb7ca57c2 [ticket/14043] Add more parameters to the event 
PHPBB3-14043
 2015-08-02 20:27:05 +02:00
Oyabun1
84f8d6d64e [ticket/14058] Contact us form missing email subject field in subsilver2 
PHPBB3-14058
 2015-07-31 22:30:30 +10:00
Tristan Darricau
e70373a820 Merge pull request #3799 from CHItA/ticket/14056 
[ticket/14056] Keep install schema resources in the install folder

* CHItA/ticket/14056:
  [ticket/14056] Fix remaining schema path
  [ticket/14056] Keep install schema resources in the install folder
 2015-07-30 09:58:34 +02:00
Mate Bartus
4ae83e4266 [ticket/14056] Fix remaining schema path 
PHPBB3-14056
 2015-07-29 22:08:37 +02:00
Mate Bartus
6eb284b23a [ticket/14056] Keep install schema resources in the install folder 
PHPBB3-14056
 2015-07-29 20:24:52 +02:00
RMcGirr83
30449b69af [ticket/13863] Spaces not tabs 
PHPBB3-13863
 2015-07-29 12:47:31 -04:00
Richard McGirr
9c67d02bd2 [ticket/13863] Add topic_row_append/prepend to mcp_forum.html 
PHPBB3-13863
 2015-07-28 05:53:30 -04:00