1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-14 16:34:29 +02:00
Commit Graph

3680 Commits

Author SHA1 Message Date
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
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
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
Marc Alexander
5a82061c3a [ticket/9211] Use different icon for link subforum in forum legend
PHPBB3-9211
2016-11-16 21:51:58 +01:00
Marc Alexander
fa9182c133 Merge branch '3.2.x' 2016-11-12 19:41:20 +01:00
Marc Alexander
9c7e8c2dc5 Merge branch '3.1.x' into 3.2.x 2016-11-12 19:41:10 +01:00
Marc Alexander
372324cead Merge pull request #4504 from VSEphpbb/ticket/14855
[ticket/14855] Update notification and PM alert bubbles
2016-11-12 19:30:34 +01:00
Matt Friedman
55f7438187 [ticket/14855] Bump font size to 10px
PHPBB3-14855
2016-11-12 09:32:57 -08:00
Marc Alexander
90cd9fc18f Merge branch '3.2.x' 2016-11-12 16:17:34 +01:00
Marc Alexander
728335820c Merge branch '3.1.x' into 3.2.x 2016-11-12 16:17:31 +01:00
Marc Alexander
bc4c82bae5 Merge pull request #4481 from senky/ticket/14819
[ticket/14819] Hide soft-deleted posts in topic review
2016-11-12 16:17:27 +01:00
Marc Alexander
6b6b740dcb Merge branch '3.2.x' 2016-11-12 13:44:36 +01:00
Marc Alexander
8d3d396f1b Merge branch '3.1.x' into 3.2.x 2016-11-12 13:44:32 +01:00
Matt Friedman
0fd04f2e6f [ticket/14855] CSS updates
PHPBB3-14855
2016-11-11 16:38:46 -08:00
Matt Friedman
74285b4308 [ticket/14855] Update CSS
PHPBB3-14855
2016-11-11 09:32:25 -08:00
lavigor
cdf6464382 [ticket/14860] Broken link on subscriptions page on mobile devices
PHPBB3-14860
2016-11-08 16:50:53 +03:00
Matt Friedman
9b1e2e523c [ticket/14855] Update the comments
PHPBB3-14855
2016-11-06 16:12:39 -08:00
Matt Friedman
0e114f91f4 [ticket/14855] Remove notification bubble on mark all read
PHPBB3-14855
2016-11-06 10:00:50 -08:00
Matt Friedman
87209fdd06 [ticket/14855] Fix responsive alert bubble CSS
PHPBB3-14855
2016-11-05 16:29:13 -07:00
Matt Friedman
c259a9b387 [ticket/14855] Update notification and PM alert bubbles
PHPBB3-14855
2016-11-05 16:15:50 -07:00
Marc Alexander
773099d761 Merge branch '3.2.x' 2016-10-24 18:21:19 +02:00
Marc Alexander
52b1a9d4fa Merge branch '3.1.x' into 3.2.x 2016-10-24 18:21:17 +02:00
Marc Alexander
2406fe2e5e [ticket/14750] Remove html5 invalid attributes from attachment file input
PHPBB3-14750
2016-10-15 09:00:36 +02:00
Jakub Senko
4dfadfc97f [ticket/14819] Hide soft-deleted posts in topic review
PHPBB3-14819
2016-10-13 14:28:29 +02:00
rxu
98a6133c1e [ticket/14808] Add template event overall_header_searchbox_after
PHPBB3-14808
2016-10-04 16:58:51 +07:00
Tristan Darricau
10ae96c9b6 Merge branch '3.2.x'
* 3.2.x:
  [ticket/14786] Add mcp_forum_actions_before/after events
2016-10-02 18:13:13 +02:00
Tristan Darricau
b28fe0a7fa Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14786] Add mcp_forum_actions_before/after events
2016-10-02 18:12:53 +02:00
Jakub Senko
f66ca6a9cc [ticket/14786] Add mcp_forum_actions_before/after events
PHPBB3-14786
2016-09-26 11:13:11 +02:00
Marc Alexander
2f17757f4e [prep-release-3.1.10] Update version to 3.1.10-RC1 2016-09-24 14:50:46 +02:00
Marc Alexander
531d23935a Merge branch '3.2.x' 2016-09-24 13:04:27 +02:00
Marc Alexander
187c6df18a Merge branch '3.1.x' into 3.2.x 2016-09-24 13:04:24 +02:00
GerB
90e9d5c462 [ticket/14785] Add template event overall_header_headerbar_after/before
PHPBB3-14785
2016-09-24 11:04:23 +02:00