1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 20:19:13 +02:00

25054 Commits

Author SHA1 Message Date
Tristan Darricau
118824fd26
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14967] Add cookie notice migration fixing invalid previous one
2017-01-08 18:06:22 +01:00
Marc Alexander
1d0bb70f78
Merge pull request #4509 from hanakin/ticket/14865
[ticket/14865] Use Stylelint for managing CSS
2017-01-08 14:02:28 +01:00
Marc Alexander
40985de245
[ticket/14967] Add cookie notice migration fixing invalid previous one
PHPBB3-14967
2017-01-08 10:48:30 +01:00
Marc Alexander
385feb0a5d
[3.2.x] Update development version to 3.2.1-dev 2017-01-07 17:19:35 +01:00
Marc Alexander
8d58d1814f
Merge branch '3.2.x' 2017-01-07 17:08:30 +01:00
Marc Alexander
830a384988
[prep-release-3.2.0] Fix links to convertor 2017-01-07 16:16:24 +01:00
Marc Alexander
9bbd034a4e
[prep-release-3.2.0] Correctly compare extensions version 2017-01-07 14:44:04 +01:00
Marc Alexander
da8ec61ab2
[prep-release-3.2.0] Update version numbers and add 3.2.0 migration 2017-01-07 11:48:15 +01:00
Marc Alexander
663bdda53c
Merge branch '3.2.x' 2017-01-07 00:20:22 +01:00
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
e096137537
Merge pull request #4620 from marc1706/ticket/14772
[ticket/14772] Use float to prevent pagination overwriting topic time
2017-01-07 00:18:40 +01:00
Marc Alexander
c0fb367d0a
Merge branch '3.2.x' 2017-01-07 00:16:49 +01:00
Marc Alexander
7074876f32
Merge pull request #4619 from Nicofuma/ticket/14962
[ticket/14962] Introduces a new helper to check emptyness of bbcode texts
2017-01-07 00:16:45 +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
Tristan Darricau
f82299b8e4
[ticket/14962] Introduces a new helper to check emptyness of bbcode texts
PHPBB3-14962
2017-01-06 21:40:31 +01:00
Marc Alexander
710d3e921c
Merge branch '3.2.x' 2017-01-06 15:29:45 +01:00
Marc Alexander
166320ef9e
Merge branch '3.1.x' into 3.2.x 2017-01-06 15:29:40 +01:00
Marc Alexander
9d7acd1897
Merge pull request #4613 from rxu/ticket/14958
[ticket/14958] Optimize Twig extension lang() function
2017-01-06 15:29:35 +01:00
Marc Alexander
49b2269155
Merge branch '3.2.x' 2017-01-06 13:53:43 +01:00
Marc Alexander
f423c2803a
Merge pull request #4617 from marc1706/ticket/14949
[ticket/14949] Pass full notification array and post data for updating
2017-01-06 13:53:39 +01:00
Marc Alexander
743d3af3c5
[ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2
PHPBB3-14961
2017-01-06 12:06:39 +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
839fec4a0c
Merge branch '3.2.x' 2017-01-06 01:12:43 +01:00
Marc Alexander
70cf5ddf9d
Merge pull request #4615 from marc1706/ticket/14946
[ticket/14946] Make sure to pass integers to max()
2017-01-06 01:12:39 +01:00
Marc Alexander
0543413626
Merge branch '3.2.x' 2017-01-06 01:06:10 +01:00
Marc Alexander
864953ebff
Merge pull request #4616 from marc1706/ticket/14945
[ticket/14945] Parse signature preview with generate_text_for_display()
2017-01-06 01:06:06 +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
0a68593dd2
[ticket/14949] Pass full notification array and post data for updating
PHPBB3-14949
2017-01-05 23:39:30 +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
777a1ad916
[ticket/14945] Parse signature preview with generate_text_for_display()
PHPBB3-14945
2017-01-04 22:04:07 +01:00
Marc Alexander
13d0549e59
Merge branch '3.2.x' 2017-01-04 21:50:47 +01:00
Marc Alexander
cfa2bc534b
Merge branch '3.1.x' into 3.2.x 2017-01-04 21:50:25 +01:00
Marc Alexander
a0abb1e10e
Merge pull request #4600 from hubaishan/ticket/14549
[ticket/14549] fix mcp page redirect back after topic merge and rised warning
2017-01-04 21:47:21 +01:00
Marc Alexander
c6746ab3cd
[ticket/14946] Make sure to pass integers to max()
PHPBB3-14946
2017-01-04 21:40:46 +01:00
Marc Alexander
ee3cf0af0f
Merge branch '3.2.x' 2017-01-04 21:07:36 +01:00
Marc Alexander
24b02ad4d6
Merge pull request #4443 from Crizz0/ticket/14780
[ticket/14780] Correction to let group setting overwrite global PM setting
2017-01-04 21:07:32 +01:00
Marc Alexander
0f19c507e2
Merge branch '3.2.x' 2017-01-04 20:31:50 +01:00
Marc Alexander
cae30929ea
Merge branch '3.1.x' into 3.2.x 2017-01-04 20:31:45 +01:00
Marc Alexander
2f6993fa81
Merge pull request #4595 from DavidIQ/ticket/14941
[ticket/14941] Apply changes individually for MySQL fulltext search
2017-01-04 20:31:41 +01:00
rxu
49c19a267f [ticket/14958] Optimize Twig extension lang() function
PHPBB3-14958
2017-01-05 00:42:27 +07:00
Marc Alexander
3fef34a541
Merge branch '3.2.x' 2017-01-04 17:48:56 +01:00
Marc Alexander
c5ce0cd3c4
Merge pull request #4599 from VSEphpbb/ticket/14945
[ticket/14945] Fix bbcode flags in user sig previews
2017-01-04 17:48:52 +01:00
Marc Alexander
e5cc7b6631
Merge branch '3.2.x' 2017-01-04 17:44:15 +01:00
Marc Alexander
03be94c1f7
Merge branch '3.1.x' into 3.2.x 2017-01-04 17:44:11 +01:00