1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-12 03:42:05 +02:00

26247 Commits

Author SHA1 Message Date
Marc Alexander
c6e8a5ddee
Merge branch '3.2.x' 2017-10-31 15:51:24 +01:00
Marc Alexander
200562548e
Merge pull request #4980 from senky/ticket/15381
[ticket/15381] Better explain CONTACT_US_ENABLE_EXPLAIN
2017-10-31 15:51:20 +01:00
Marc Alexander
a51741df41
Merge branch '3.2.x' 2017-10-31 15:47:14 +01:00
Marc Alexander
1744d829ad
Merge pull request #4978 from ftc2/3.2.x
[ticket/15385] nginx.sample.conf: www redirection, security regex
2017-10-31 15:47:09 +01:00
Marc Alexander
f5467c560a
Merge branch '3.2.x' 2017-10-31 14:17:32 +01:00
Marc Alexander
78610f0406
Merge pull request #4975 from senky/ticket/15273
[ticket/15273] Better explain cookie path
2017-10-31 14:17:28 +01:00
Marc Alexander
cc52dc9a7e
Merge branch '3.2.x' 2017-10-31 12:58:44 +01:00
Marc Alexander
f31dcfc937
Merge pull request #4970 from rxu/ticket/15374
[ticket/15374] Add core event to modify page title in viewforum.php
2017-10-31 12:58:40 +01:00
Marc Alexander
ea23d456d5
Merge branch '3.2.x' 2017-10-31 09:58:33 +01:00
Marc Alexander
fbbd1713d7
Merge pull request #4969 from Elsensee/ticket/15245
[ticket/15245] Fix images in feeds when accessing via app.php
2017-10-31 09:58:29 +01:00
Marc Alexander
0c009e3feb
Merge pull request #4959 from rubencm/ticket/15366
[ticket/15366] Remove useless code
2017-10-29 22:09:49 +01:00
Marc Alexander
7a54b0631d
Merge branch '3.2.x' 2017-10-29 12:49:25 +01:00
Marc Alexander
d56e573a8e
Merge pull request #4950 from Nicofuma/ticket/15357-3.2.x
[ticket/15298] Never suppress exception trace when using CLI
2017-10-29 12:49:16 +01:00
Marc Alexander
408916d24e
Merge branch '3.2.x' 2017-10-29 11:34:52 +01:00
Marc Alexander
d0e25f2eed
Merge pull request #5012 from kasimi/ticket/15060
[ticket/15060] Set correct forum id in user session data if f= is missing
2017-10-29 11:34:47 +01:00
kasimi
60596eb675
[ticket/15060] Set correct forum id in user session data if f= is missing
PHPBB3-15060
2017-10-23 22:36:29 +02:00
Marc Alexander
d11db17e2c
Merge branch '3.2.x' 2017-10-22 10:19:35 +02:00
Marc Alexander
3b5c624c03
Merge pull request #4930 from rubencm/ticket/15201
[ticket/15201] Set user style to default style when it is disabled or uninstalled
2017-10-22 10:19:30 +02:00
Marc Alexander
e7fa0de888
Merge branch '3.2.x' 2017-10-18 21:11:42 +02:00
Marc Alexander
1d12d76790
Merge pull request #4948 from Elsensee/ticket/15267
[ticket/15267] Hide birthday list if permission wasn't granted
2017-10-18 21:10:52 +02:00
Marc Alexander
f2f1037e8d
Merge branch '3.2.x' 2017-10-17 21:16:15 +02:00
Marc Alexander
0e9a1e0d54
Merge pull request #4910 from javiexin/ticket/15331_B
[ticket/15331] Allow gravatars to be overridden by existing event - B
2017-10-17 21:13:40 +02:00
Marc Alexander
867d0bfb2f
Merge branch '3.2.x' 2017-10-17 21:01:25 +02:00
Marc Alexander
c1c3004fa1
Merge pull request #5003 from kasimi/ticket/15409
[ticket/15409] Add u_action to core.acp_users_overview_run_quicktool
2017-10-17 20:48:49 +02:00
Marc Alexander
5338b7a361
Merge branch '3.2.x' 2017-10-17 19:54:24 +02:00
Marc Alexander
7bdff132ff
Merge pull request #4997 from kasimi/ticket/15396
[ticket/15396] Fix revert_schema() steps not executed in correct order
2017-10-17 19:54:19 +02:00
vinny
40247dcd1b [ticket/15411] Use lowercase in hex color code
PHPBB3-15411
2017-10-17 03:54:08 -03:00
kasimi
0b42b34531
[ticket/15409] Add u_action to core.acp_users_overview_run_quicktool
PHPBB3-15409
2017-10-16 22:59:41 +02:00
Marc Alexander
d509bd9baa Merge pull request #4947 from rubencm/ticket/15289-2
[ticket/15289] Allow to configure storage from acp
2017-10-16 21:05:01 +02:00
Marc Alexander
3dc1cde5c6
Merge branch '3.2.x' 2017-10-15 21:32:26 +02:00
Marc Alexander
ee9eb586dd
Merge pull request #4999 from marc1706/ticket/15401
[ticket/15401] Use separate constant for memcached driver config
2017-10-15 21:31:53 +02:00
Marc Alexander
d80b2d4236
Merge pull request #4946 from Nicofuma/ticket/15357
[ticket/15357] Requires composer/installers in phpBB core for extensions
2017-10-15 20:48:09 +02:00
Marc Alexander
21ccc97cf8
Merge branch '3.2.x' 2017-10-15 20:42:05 +02:00
Marc Alexander
7fa30de9d5
Merge pull request #4944 from Elsensee/ticket/14677
[ticket/14677] Add exclamation mark to outdated extensions
2017-10-15 20:28:43 +02:00
Julien Tant
5aceccf00b
[ticket/15401] Use separate constant for memcached driver config
PHPBB3-15401
2017-10-15 14:13:26 +02:00
Marc Alexander
052b55624b Merge pull request #4626 from hanakin/ticket/14976
[ticket/14976] Convert all ems to px
2017-10-15 10:06:39 +02:00
Marc Alexander
c3939580b3
Merge branch '3.2.x' 2017-10-13 19:39:46 +02:00
Marc Alexander
e1966c3476
Merge pull request #4888 from javiexin/ticket/15306
[ticket/15306] Error and missing data in core.acp_users_profile_validate
2017-10-13 19:39:42 +02:00
kasimi
ed9b896d22
[ticket/15396] Fix revert_schema() steps not executed in correct order
PHPBB3-15396
2017-10-13 14:46:32 +02:00
Michael Miday
b7c3318541 [ticket/14976] fix error
PHPBB3-14976
2017-10-13 00:16:48 -04:00
Michael Miday
dbcd54d523 [ticket/14976] refactor fieldset.fields1 dd
PHPBB3-14976
2017-10-13 00:16:30 -04:00
Marc Alexander
d64ce15ecf
Merge branch '3.2.x' 2017-10-11 21:00:38 +02:00
Marc Alexander
2c01fe67e9
Merge pull request #4942 from rubencm/ticket/15172
[ticket/15172] Fix redirection to wrong port
2017-10-11 21:00:33 +02:00
hanakin
a408180c4a [ticket/14976] fix errors
PHPBB3-14976
2017-10-11 14:51:16 -04:00
hanakin
f7baa94d44 [ticket/14976] Fix content.css
PHPBB3-14976
2017-10-11 14:50:32 -04:00
hanakin
4ddc9a89fe [ticket/14976] more fixes in content.css
PHPBB3-14976
2017-10-11 14:50:32 -04:00
hanakin
8a312b01fb [ticket/14976] fix errors
PHPBB3-14976
2017-10-11 14:50:32 -04:00
hanakin
f268e07935 [ticket/14976] fix common.css and ignore normalize
PHPBB3-14976
2017-10-11 14:50:32 -04:00
hanakin
a3372e628a [ticket/14976] Fix linting
PHPBB3-14976
2017-10-11 14:50:32 -04:00
hanakin
036d00f872 [ticket/14976] Some cleanup
PHPBB3-14976
2017-10-11 14:50:32 -04:00