1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 11:01:48 +02:00
Commit Graph

3834 Commits

Author SHA1 Message Date
Marc Alexander
44f130808f Merge pull request #4618 from marc1706/ticket/14961
[ticket/14961] Add cookie notice as enablable feature
2017-01-07 00:20:18 +01:00
Marc Alexander
f8d5b3c417 Merge branch '3.2.x' 2017-01-07 00:18:43 +01:00
Marc Alexander
ba82dfa49e [ticket/14772] Add rtl definition for .topic-poster and small margin
PHPBB3-14772
2017-01-06 22:36:35 +01:00
Marc Alexander
89f0e4d54f [ticket/14772] Use float to prevent pagination overwriting topic time
PHPBB3-14772
2017-01-06 22:27:11 +01:00
Marc Alexander
a187c46072 Merge branch '3.2.x' 2017-01-06 01:14:13 +01:00
Marc Alexander
91637f8070 Merge pull request #4608 from marc1706/ticket/14954
[ticket/14954] Properly check if topic has attachments in mcp_queue
2017-01-06 01:14:09 +01:00
Marc Alexander
af4f477a1b [ticket/14961] Also translate "learn more" link
PHPBB3-14961
2017-01-06 01:04:14 +01:00
Marc Alexander
e0eeea800c [ticket/14961] Add cookie notice as enablable feature
Uses Insites cookieconsent v3.0.3:
https://cookieconsent.insites.com

PHPBB3-14961
2017-01-06 00:57:12 +01:00
Marc Alexander
93567727fe Merge branch '3.2.x' 2017-01-04 22:16:47 +01:00
Marc Alexander
0c6c94e527 Merge branch '3.1.x' into 3.2.x 2017-01-04 22:16:24 +01:00
Marc Alexander
77b3f36992 Merge pull request #4532 from senky/ticket/14662
[ticket/14662] Add memberlist_team_username_prepend/append
2017-01-04 22:15:37 +01:00
Marc Alexander
4c550c221b [ticket/14954] Properly check if topic has attachments in mcp_queue
PHPBB3-14954
2017-01-02 23:23:53 +01:00
Tristan Darricau
5ff0e4ec7d Merge branch '3.2.x' 2016-12-29 18:27:59 +01:00
JoshyPHP
f111e70fc3 [ticket/14914] Made emoji scale in size with text
PHPBB3-14914
2016-12-27 21:48:01 +01:00
Jakub Senko
cc42c09a95 [ticket/14662] Add memberlist_team_username_prepend/append
PHPBB3-14662
2016-12-18 21:15:36 +01:00
Marc Alexander
9e998e1830 Merge branch '3.2.x' 2016-12-18 20:50:59 +01:00
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