1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-05 16:33:34 +02:00

30828 Commits

Author SHA1 Message Date
Marc Alexander
5fb7029692
Merge branch '3.2.x' 2017-10-11 19:06:52 +02:00
Marc Alexander
2f799fa993
Merge pull request #4994 from hanakin/ticket/15391
[ticket/15391] image-rendering not needed for Topic/Forum imgs
2017-10-11 19:06:48 +02:00
Michael Miday
e213b8264d [ticket/15391] image-rendering no longer needed
PHPBB3-15391
2017-10-11 10:11:10 -04:00
Marc Alexander
7998aa8381
Merge branch '3.2.x' 2017-10-11 13:29:06 +02:00
Marc Alexander
f6d1dd8b33
Merge pull request #4995 from senky/ticket/15394
[ticket/15394] Add $user_cache
2017-10-11 13:29:00 +02:00
Máté Bartus
68b3da2df0 Merge pull request #4990 from rubencm/ticket/15377
[ticket/15377] Fix INCLUDECSS and INCLUDEJS
2017-10-09 21:12:08 +02:00
Jakub Senko
5c16ef0657
[ticket/15394] Add $post_edit_list
PHPBB3-15394
2017-10-09 19:08:16 +02:00
Jakub Senko
bad711e0d9
[ticket/15394] Add $user_cache
PHPBB3-15394
2017-10-09 17:55:47 +02:00
Máté Bartus
eb0122b8ee Merge pull request #4685 from hanakin/ticket/15071
[ticket/15071] Consolidate all media queries
2017-10-09 16:15:33 +02:00
Rubén Calvo
eaeec9b50b [ticket/15377] Use __DIR__ constant
PHPBB3-15377
2017-10-09 12:31:57 +02:00
Rubén Calvo
c2d3322e82 [ticket/15377] Add test
PHPBB3-15377
2017-10-07 00:20:20 +02:00
Rubén Calvo
18c5f5c6e8 [ticket/15377] Fix INCLUDECSS and INCLUDEJS
PHPBB3-15377
2017-10-05 20:54:01 +02:00
Máté Bartus
f4ffbd5506 Merge branch '3.2.x' 2017-10-05 20:46:10 +02:00
Máté Bartus
cfba5613b7 Merge pull request #4989 from Elsensee/ticket/15361
[ticket/15361] Fix paths and names of graphics
2017-10-05 20:45:57 +02:00
Oliver Schramm
69985f9b0c [ticket/15361] Fix paths and names of graphics
PHPBB3-15361
2017-10-05 17:58:57 +02:00
Oliver Schramm
bba4b4fc30 Merge branch '3.2.x' 2017-10-05 15:40:28 +02:00
Oliver Schramm
9c91bc4976 Merge pull request #4967 from Leinad4Mind/3.2.x
[PHPBB3-14629] round() the log() explicitly to a proper integer
2017-10-05 15:40:24 +02:00
Oliver Schramm
8e62ea225e Merge branch '3.2.x'
Conflicts:
	phpBB/includes/ucp/ucp_notifications.php
2017-10-05 15:14:58 +02:00
Oliver Schramm
e1ae3236b2 Merge pull request #4981 from senky/ticket/15362
[ticket/15362] Fix colspan in notification options table
2017-10-05 15:13:41 +02:00
Oliver Schramm
5d3cac71d5 Merge branch '3.2.x' 2017-10-05 15:00:55 +02:00
Oliver Schramm
5c33c852ae Merge pull request #4961 from hanakin/ticket/15361
[ticket/15361] Topic / Forum Icon rendering across all browsers
2017-10-05 15:00:50 +02:00
Oliver Schramm
92f25a6edc Merge branch '3.2.x' 2017-10-05 14:55:00 +02:00
Oliver Schramm
16159f20f6 Merge branch '3.1.x' into 3.2.x 2017-10-05 14:54:52 +02:00
Oliver Schramm
5514b10699 Merge pull request #4960 from rxu/ticket/15367
[ticket/15367] Escape special characters in Sphinx search backend
2017-10-05 14:54:47 +02:00
Jakub Senko
2cdb27a0d1
[ticket/15362] Fix colspan in notification options table
PHPBB3-15362
2017-10-02 12:24:33 +02:00
Marc Alexander
ff52857b1e
Merge branch '3.2.x' 2017-09-28 21:33:24 +02:00
Marc Alexander
fc3d3a83db
Merge pull request #4974 from Elsensee/ticket/15379
[ticket/15379] Fix assignments in reparser cron job
2017-09-28 21:33:19 +02:00
Oliver Schramm
6de10bd75e Merge branch '3.2.x' 2017-09-28 18:57:57 +02:00
Oliver Schramm
e71cb17b64 Merge pull request #4958 from kasimi/ticket/15365
[ticket/15365] Fix invalidating OPcache
2017-09-28 18:57:44 +02:00
Oliver Schramm
e41819e37a [ticket/15379] Only initialize reparsers on first call in migration
PHPBB3-15379
2017-09-25 17:48:37 +02:00
Oliver Schramm
4069cdd518 [ticket/15379] Fix the assignments in reparser cron job
PHPBB3-15379
2017-09-25 17:46:00 +02:00
Michael Miday
ad67efecfa [ticket/15071] Tweak order
PHPBB3-15071
2017-09-23 11:32:02 -04:00
hanakin
98479f235b [ticket/15071] Fix cahnges
PHPBB3-15071
2017-09-23 11:24:32 -04:00
hanakin
f724017953 [ticket/15071] Consolidate all media queries
PHPBB3-15071
2017-09-23 11:17:57 -04:00
Daniel Mota
f79b7f1896 [PHPBB3-14629] round() the log() explicitly to a proper integer 2017-09-21 17:24:16 +01:00
Marc Alexander
b70ba0e47c
Merge branch '3.2.x' 2017-09-19 19:22:22 +02:00
Marc Alexander
d095e620c1
Merge pull request #4963 from DavidIQ/ticket/15368
[ticket/15368] Correct function reference in MSSQL db tools
2017-09-19 19:22:16 +02:00
David Colón
3574832ddb [ticket/15368] Correct function reference in MSSQL db tools 2017-09-17 18:04:14 -04:00
Michael Miday
77401ff354 [ticket/15361] fix forum_link
PHPBB3-15361
2017-09-16 15:40:37 -04:00
Michael Miday
d0e2b29492 [ticket/15361] new graphics to fix chrome & safari
PHPBB3-15361
2017-09-16 15:28:53 -04:00
rxu
ca5678cc1c [ticket/15367] Escape special characters in Sphinx search backend
PHPBB3-15367
2017-09-16 23:54:25 +07:00
kasimi
f1f35f7f3d
[ticket/15365] Fix invalidating OPcache
PHPBB3-15365
2017-09-16 11:10:04 +02:00
Marc Alexander
024cf709c4 Merge pull request #4957 from CHItA/ticket/13214
[ticket/13214] Remove px after 0 from padding property
2017-09-15 15:45:37 +02:00
Máté Bartus
36e7446103 [ticket/13214] Remove px after 0 from padding property
PHPBB3-13214
2017-09-15 11:29:08 +02:00
Máté Bartus
711d4db968 [ticket/13214] Remove .idea files added by accident on merge
PHPBB3-13214
2017-09-15 10:18:34 +02:00
Máté Bartus
ba58e9cb4c Merge branch '3.2.x' 2017-09-15 10:12:14 +02:00
Máté Bartus
cd14b2cdf8 Merge pull request #4955 from hanakin/ticket/13214
[ticket/13214] Contact us page textarea looks narrow in responsive mode
2017-09-15 10:07:56 +02:00
Máté Bartus
905c5e3706 Merge branch '3.2.x' 2017-09-15 10:05:19 +02:00
Máté Bartus
969048293d Merge pull request #4956 from hanakin/ticket/15271
[ticket/15271] align forum and topic row columns
2017-09-15 10:05:08 +02:00
Michael Miday
78c9d07a7b [ticket/15271] align forum and topic row columns
PHPBB3-15271
2017-09-11 13:00:56 -04:00