Commit graph

3768 commits

Author SHA1 Message Date
Marc Alexander
60af11da9d
Merge branch '3.1.x' into 3.2.x 2016-12-18 20:50:38 +01:00
Marc Alexander
956c7186ec
Merge pull request #4534 from senky/ticket/14522
[ticket/14522] Add ucp_register_buttons_before
2016-12-18 20:49:53 +01:00
Marc Alexander
a56d25b437
Merge branch '3.2.x' 2016-12-18 16:23:04 +01:00
Marc Alexander
909aef0ed3
Merge branch '3.1.x' into 3.2.x 2016-12-18 16:22:59 +01:00
Marc Alexander
0e68c35cfd
Merge pull request #4577 from Crizz0/ticket/14877
[ticket/14877] Replaces "mono" with "monospace" to avoid bad behaviour
2016-12-18 16:22:54 +01:00
Marc Alexander
33f8ace91c
Merge branch '3.2.x' 2016-12-18 15:46:57 +01:00
Marc Alexander
7ec24ec0f6
Merge pull request #4575 from Crizz0/ticket/14909
[ticket/14909] Increases CSS specifity of .header-image to avoid unde…
2016-12-18 15:46:52 +01:00
Marc Alexander
84d7371167
Merge branch '3.2.x' 2016-12-17 23:39:09 +01:00
Marc Alexander
5ecd9fb775
Merge branch '3.1.x' into 3.2.x 2016-12-17 23:39:03 +01:00
Marc Alexander
b6ea338309
Merge pull request #4529 from senky/ticket/14520
[ticket/14520] Add ucp_pm_viewmessage_options_before
2016-12-17 23:38:56 +01:00
Marc Alexander
20752848ff
Merge branch '3.2.x' 2016-12-17 16:41:59 +01:00
Marc Alexander
544c7c4e08
Merge branch '3.1.x' into 3.2.x 2016-12-17 16:41:38 +01:00
Marc Alexander
fadec0d2b9
Merge pull request #4527 from senky/ticket/14390
[ticket/14390] Add ucp_main_front_user_activity_append/prepend
2016-12-17 16:40:17 +01:00
Marc Alexander
5dc31fd03d
Merge branch '3.2.x' 2016-12-12 22:09:40 +01:00
Marc Alexander
37eb22a61d
Merge branch '3.1.x' into 3.2.x 2016-12-12 22:09:21 +01:00
Marc Alexander
5235e6de53
Merge pull request #4520 from senky/ticket/14868
[ticket/14868] Add mcp_forum_actions_options template event
2016-12-12 22:07:59 +01:00
Tristan Darricau
37f786b3b7
erge branch '3.2.x'
* 3.2.x:
  [ticket/14855] Update notification and PM alert bubbles
  [ticket/14855] Update notification and PM alert bubbles
  [ticket/14855] Update notification and PM alert bubbles
2016-12-11 20:16:35 +01:00
Tristan Darricau
0cf85c047e
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14855] Update notification and PM alert bubbles
  [ticket/14855] Update notification and PM alert bubbles
  [ticket/14855] Update notification and PM alert bubbles
2016-12-11 20:16:25 +01:00
Christian Schnegelberger
3a4f1bc061 [ticket/14877] Replaces "mono" with "monospace" to avoid bad behaviour
PHPBB3-14877
2016-12-11 18:02:20 +01:00
Christian Schnegelberger
28296af248 [ticket/14909] Increases CSS specifity of .header-image to avoid underline
PHPBB3-14909
2016-12-10 22:07:47 +01:00
javiexin
959e5fb79d [ticket/14855] Update notification and PM alert bubbles
Alternative implementation without removing notification from
the DOM, but changing the class.  So that style designers
might have more options (show/not show).

PHPBB3-14855
2016-12-10 00:51:41 +01:00
Marc Alexander
86257feb33
Merge branch '3.2.x' 2016-12-10 00:30:07 +01:00
Marc Alexander
9d72c4a66a
[prep-release-3.2.0-RC2] Update version numbers to 3.2.0-RC2 2016-12-09 20:50:48 +01:00
Jakub Senko
839987fa19
[ticket/14868] Add mcp_forum_actions_options template event
PHPBB3-14868
2016-12-04 17:24:19 +01:00
Tristan Darricau
6aa4f0e9d1
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14884] Remove duplicate span from navbar_header
2016-12-03 12:42:36 +01:00
Marc Alexander
207b52c77f
[ticket/14884] Remove duplicate span from navbar_header
PHPBB3-14884
2016-12-02 12:44:51 +01:00
Marc Alexander
92b6991d0e
Merge branch '3.2.x' 2016-12-02 11:50:56 +01:00
Marc Alexander
1639cb93a8
Merge branch '3.1.x' into 3.2.x 2016-12-02 11:46:34 +01:00
Marc Alexander
1ee9cc91d4
Merge pull request #4550 from hanakin/ticket/14881
[Ticket/14881] Add wrapper to jump actions to clear floats
2016-12-02 11:38:50 +01:00
hanakin
e1d2c4c900 [ticket/14881] Fix jumpbox-return link layout
PHPBB3-14881
2016-12-01 17:49:26 +01:00
hanakin
0e53442fd4 [ticket/14881] Add action-bar wrap to jump actions
PHPBB3-14881
2016-12-01 17:45:24 +01:00
hanakin
e79e0efc9e [ticket/14865] Mask remaining issues with print
PHPBB3-14865
2016-11-25 00:28:09 +01:00
hanakin
58d50129ce [ticket/14865] Mask remaining issues in responsive
PHPBB3-14865
2016-11-25 00:27:46 +01:00
hanakin
4d5b955a61 [ticket/18465] Fix badge color
PHPBB3-14865
2016-11-25 00:26:53 +01:00
hanakin
52ddce75f6 [ticket/14865] Remove duplicate from responsive
PHPBB3-14865
2016-11-25 00:26:17 +01:00
hanakin
154552dfa4 [ticket/14865] Fix comments in responsive
PHPBB3-14865
2016-11-25 00:25:41 +01:00
hanakin
6010bc298e [ticket/14865] Mask remaining issues with tweaks
PHPBB3-14865
2016-11-25 00:24:52 +01:00
Tristan Darricau
28ef544521
Merge branch '3.2.x'
* 3.2.x:
  [ticket/9211] Use different icon for link subforum in forum legend
2016-11-24 14:16:40 +01:00
Tristan Darricau
3e1f9c4201
Merge pull request #4508 from marc1706/ticket/9211
[ticket/9211] Use different icon for link subforum in forum legend

* marc1706/ticket/9211:
  [ticket/9211] Use different icon for link subforum in forum legend
2016-11-24 14:16:37 +01:00
Tristan Darricau
ce1f5eeffd
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14750] Remove html5 invalid attributes from attachment file input
2016-11-24 14:15:32 +01:00
Tristan Darricau
592ef2eff4
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14750] Remove html5 invalid attributes from attachment file input
2016-11-24 14:15:12 +01:00
Tristan Darricau
16620ea3d2
Merge pull request #4483 from marc1706/ticket/14750
[ticket/14750] Remove html5 invalid attributes from attachment file input

* marc1706/ticket/14750:
  [ticket/14750] Remove html5 invalid attributes from attachment file input
2016-11-24 14:12:13 +01:00
hanakin
fc056cf717 [ticket/14865] Remove spacer overqualified div
PHPBB3-14865
2016-11-24 13:32:14 +01:00
hanakin
298353146d [ticket/14865] Mask remaining issues with links
PHPBB3-14865
2016-11-24 13:32:13 +01:00
hanakin
53b82f28f7 [ticket/14865] Mask remaining issues with forms
PHPBB3-14865
2016-11-24 13:32:11 +01:00
hanakin
628005e730 [ticket/14865] Mask remaining issues with cp
PHPBB3-14865
2016-11-24 13:32:09 +01:00
hanakin
507428e5dc [ticket/14865] Mask remaining issues with contnet
PHPBB3-14865
2016-11-24 13:32:09 +01:00
hanakin
cc258f09eb [ticket/14865] Move colors from content to colours
PHPBB3-14865
2016-11-24 13:32:08 +01:00
hanakin
abcc7efff1 [ticket/14865] Mask remaining issues with common
PHPBB3-14865
2016-11-24 13:32:07 +01:00
hanakin
30d3d5c696 [ticket/14865] Remove duplicate code from common
PHPBB3-14865
2016-11-24 13:32:07 +01:00