1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-13 05:06:37 +02:00
Commit Graph

29528 Commits

Author SHA1 Message Date
663bdda53c Merge branch '3.2.x' 2017-01-07 00:20:22 +01:00
44f130808f Merge pull request from marc1706/ticket/14961
[ticket/14961] Add cookie notice as enablable feature
2017-01-07 00:20:18 +01:00
f8d5b3c417 Merge branch '3.2.x' 2017-01-07 00:18:43 +01:00
e096137537 Merge pull request from marc1706/ticket/14772
[ticket/14772] Use float to prevent pagination overwriting topic time
2017-01-07 00:18:40 +01:00
c0fb367d0a Merge branch '3.2.x' 2017-01-07 00:16:49 +01:00
7074876f32 Merge pull request from Nicofuma/ticket/14962
[ticket/14962] Introduces a new helper to check emptyness of bbcode texts
2017-01-07 00:16:45 +01:00
538f03efb0 [ticket/14962] Fix functional test for editing post
PHPBB3-14962
2017-01-06 23:46:34 +01:00
ba82dfa49e [ticket/14772] Add rtl definition for .topic-poster and small margin
PHPBB3-14772
2017-01-06 22:36:35 +01:00
89f0e4d54f [ticket/14772] Use float to prevent pagination overwriting topic time
PHPBB3-14772
2017-01-06 22:27:11 +01:00
f82299b8e4 [ticket/14962] Introduces a new helper to check emptyness of bbcode texts
PHPBB3-14962
2017-01-06 21:40:31 +01:00
710d3e921c Merge branch '3.2.x' 2017-01-06 15:29:45 +01:00
166320ef9e Merge branch '3.1.x' into 3.2.x 2017-01-06 15:29:40 +01:00
9d7acd1897 Merge pull request from rxu/ticket/14958
[ticket/14958] Optimize Twig extension lang() function
2017-01-06 15:29:35 +01:00
49b2269155 Merge branch '3.2.x' 2017-01-06 13:53:43 +01:00
f423c2803a Merge pull request from marc1706/ticket/14949
[ticket/14949] Pass full notification array and post data for updating
2017-01-06 13:53:39 +01:00
743d3af3c5 [ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2
PHPBB3-14961
2017-01-06 12:06:39 +01:00
a187c46072 Merge branch '3.2.x' 2017-01-06 01:14:13 +01:00
91637f8070 Merge pull request from marc1706/ticket/14954
[ticket/14954] Properly check if topic has attachments in mcp_queue
2017-01-06 01:14:09 +01:00
839fec4a0c Merge branch '3.2.x' 2017-01-06 01:12:43 +01:00
70cf5ddf9d Merge pull request from marc1706/ticket/14946
[ticket/14946] Make sure to pass integers to max()
2017-01-06 01:12:39 +01:00
0543413626 Merge branch '3.2.x' 2017-01-06 01:06:10 +01:00
864953ebff Merge pull request from marc1706/ticket/14945
[ticket/14945] Parse signature preview with generate_text_for_display()
2017-01-06 01:06:06 +01:00
af4f477a1b [ticket/14961] Also translate "learn more" link
PHPBB3-14961
2017-01-06 01:04:14 +01:00
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
0a68593dd2 [ticket/14949] Pass full notification array and post data for updating
PHPBB3-14949
2017-01-05 23:39:30 +01:00
93567727fe Merge branch '3.2.x' 2017-01-04 22:16:47 +01:00
0c6c94e527 Merge branch '3.1.x' into 3.2.x 2017-01-04 22:16:24 +01:00
77b3f36992 Merge pull request from senky/ticket/14662
[ticket/14662] Add memberlist_team_username_prepend/append
2017-01-04 22:15:37 +01:00
777a1ad916 [ticket/14945] Parse signature preview with generate_text_for_display()
PHPBB3-14945
2017-01-04 22:04:07 +01:00
13d0549e59 Merge branch '3.2.x' 2017-01-04 21:50:47 +01:00
cfa2bc534b Merge branch '3.1.x' into 3.2.x 2017-01-04 21:50:25 +01:00
a0abb1e10e Merge pull request 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
c6746ab3cd [ticket/14946] Make sure to pass integers to max()
PHPBB3-14946
2017-01-04 21:40:46 +01:00
ee3cf0af0f Merge branch '3.2.x' 2017-01-04 21:07:36 +01:00
24b02ad4d6 Merge pull request from Crizz0/ticket/14780
[ticket/14780] Correction to let group setting overwrite global PM setting
2017-01-04 21:07:32 +01:00
0f19c507e2 Merge branch '3.2.x' 2017-01-04 20:31:50 +01:00
cae30929ea Merge branch '3.1.x' into 3.2.x 2017-01-04 20:31:45 +01:00
2f6993fa81 Merge pull request from DavidIQ/ticket/14941
[ticket/14941] Apply changes individually for MySQL fulltext search
2017-01-04 20:31:41 +01:00
ac1bf79904 Merge branch '3.2.x' 2017-01-04 20:12:03 +01:00
655d40679d Merge pull request from marc1706/ticket/14838
[ticket/14838] Add missing method to mock'ed feed
2017-01-04 20:11:58 +01:00
b582a19039 [ticket/14838] Correctly instantiate language object
PHPBB3-14838
2017-01-04 19:47:10 +01:00
1db7aa712a [ticket/14838] Add missing method to mock'ed feed
PHPBB3-14838
2017-01-04 19:19:02 +01:00
rxu
49c19a267f [ticket/14958] Optimize Twig extension lang() function
PHPBB3-14958
2017-01-05 00:42:27 +07:00
3fef34a541 Merge branch '3.2.x' 2017-01-04 17:48:56 +01:00
c5ce0cd3c4 Merge pull request from VSEphpbb/ticket/14945
[ticket/14945] Fix bbcode flags in user sig previews
2017-01-04 17:48:52 +01:00
e5cc7b6631 Merge branch '3.2.x' 2017-01-04 17:44:15 +01:00
03be94c1f7 Merge branch '3.1.x' into 3.2.x 2017-01-04 17:44:11 +01:00
3d93fd40ed Merge pull request from marc1706/ticket/14838
[icket/14838] Do not query full attachments table in feeds
2017-01-04 17:44:07 +01:00
5c2b9e0e37 Merge branch '3.2.x' 2017-01-04 17:30:05 +01:00
0da910df94 Merge branch '3.1.x' into 3.2.x 2017-01-04 17:29:56 +01:00