Commit graph

31389 commits

Author SHA1 Message Date
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
c51b613015 [ticket/14976] Allow px line-heights for prosilver
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
hanakin
3652a9cae6 [ticket/14976] More conversions
PHPBB3-14976
2017-10-11 14:50:32 -04:00
hanakin
3b5fa30bb5 [ticket/14976] Fix icon line-height
PHPBB3-14976
2017-10-11 14:49:49 -04:00
hanakin
dbf1987bb3 [ticket/14976] more em converstions and size fixes
PHPBB3-14976
2017-10-11 14:49:49 -04:00
hanakin
725805e7ed [ticket/14976] Some more em conversions
PHPBB3-14976
2017-10-11 14:48:33 -04:00
hanakin
980a9a6f69 [ticket/14976] Start converting ems
PHPBB3-14976
2017-10-11 14:48:33 -04:00
Marc Alexander
0e6a0aae8f
Merge pull request #4987 from hanakin/ticket/14336
[ticket/14336] add title text to online status icon
2017-10-11 19:13:18 +02:00
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
Jakub Senko
4d333e7f70
[ticket/13150] Add core.phpbb_log_get_topic_auth_sql_after
PHPBB3-13150
2017-10-09 16:42:48 +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
Sophist
4a8aa339d0 [ticket/15390] Fix vertical bar permission tooltip
Fix a vertical bar and menu text running through the Admin Permission
Role Tooltip pop-up caused by z-index on menu div (and opacity of the
popup of .95 rather than 1).

PHPBB3-15390
2017-10-05 22:21:53 +01: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
Oliver Schramm
6c04a6715c [ticket/15389] Match multiple events in dispatcher in php_exporter
I've also improved some regular expressions

PHPBB3-15389
2017-10-04 20:12:34 +02:00
Michael Miday
7d464aa0ea [ticket/14336] add title
PHPBB3-14336
2017-10-04 10:07:43 -04:00
Oliver Schramm
f788b7384b [ticket/15389] Allow arrays in event dispatcher
PHPBB3-15389
2017-10-04 04:52:41 +02:00
Jakub Senko
7fcb07572b
[ticket/15111] Fix the typo in ucp_pm_view_messsage
PHPBB3-15111
2017-10-03 11:43:29 +02:00
Jakub Senko
2cdb27a0d1
[ticket/15362] Fix colspan in notification options table
PHPBB3-15362
2017-10-02 12:24:33 +02:00
Jakub Senko
99374731d1
[ticket/15381] Better explain CONTACT_US_ENABLE_EXPLAIN
PHPBB3-15381
2017-10-02 12:17:04 +02:00
ftc2
8f97887683 [ticket/15385] nginx.sample.conf: www redirection, security regex
according to the latest wiki info:
    http://wiki.nginx.org/Pitfalls#Taxing_Rewrites
`return 301` is preferred over a rewrite.

also, the 'security' regex breaks some official extensions because it
will match and deny access to `/ext/phpbb`.
looking through the names of dirs and files containing `phpbb`, it
looks like the intent of the regex was to only disallow the folder
`phpbb` in the root dir and not other `/phpbb` matches.
a negative lookbehind was added to specifically not match `/ext/phpbb`
but still match other occurrences of `/phpbb`.

Tracker ticket: https://tracker.phpbb.com/browse/PHPBB3-15385
2017-10-01 22:57:21 -06:00
rxu
c5e8b759c1 [ticket/15384] Add linebreaks to SMTP/Jabber configuration option explanations
PHPBB3-15384
2017-10-02 10:55:25 +07:00
Oliver Schramm
886089d28e [ticket/15245] Fix tests
PHPBB3-15245
2017-10-01 19:14:12 +02:00
Oliver Schramm
221e5a01b1 [ticket/15245] Fix comments, class names and code style
PHPBB3-15245
2017-09-28 23:55:28 +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
3da67ce581 [ticket/15245] Configure TextFormatter before rendering feeds
PHPBB3-15245
2017-09-28 20:02:50 +02:00