Máté Bartus
5fccb54391
Merge branch '3.2.x'
2017-09-09 17:20:36 +02:00
Máté Bartus
954af4f180
Merge pull request #4876 from JoshyPHP/ticket/15290
...
[ticket/15290] Add core.text_formatter_s9e_configure_finalize event
2017-09-09 17:20:20 +02:00
Máté Bartus
72799a26ea
Merge branch '3.2.x'
2017-09-09 17:11:03 +02:00
Máté Bartus
9ebe4da725
Merge pull request #4885 from JoshyPHP/ticket/15301
...
[ticket/15301] Set quotes' nesting limit when configuring a parser
2017-09-09 17:10:43 +02:00
Tristan Darricau
3e18766fd6
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15149] Fix Ctrl+Submit action on posting
2017-09-09 17:09:09 +02:00
Tristan Darricau
e465af28d1
Merge pull request #4941 from Elsensee/ticket/15149
...
[ticket/15149] Fix Ctrl+Submit action on posting
* github.com:phpbb/phpbb:
[ticket/15149] Fix Ctrl+Submit action on posting
2017-09-09 17:09:08 +02:00
Máté Bartus
5a19307e9a
Merge pull request #4938 from hanakin/ticket/15354
...
[ticket/15354] Use Lang Var for Loading text
2017-09-09 17:07:18 +02:00
Tristan Darricau
a33666fd32
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15355] Remove version field when no update is available
2017-09-09 17:04:32 +02:00
Tristan Darricau
e767b753a4
Merge pull request #4940 from Elsensee/ticket/15355
...
[ticket/15355] Remove version field when no update is available
* github.com:phpbb/phpbb:
[ticket/15355] Remove version field when no update is available
2017-09-09 17:04:31 +02:00
Oliver Schramm
6a96249e24
[ticket/15149] Fix Ctrl+Submit action on posting
...
PHPBB3-15149
2017-09-09 15:54:10 +02:00
Oliver Schramm
ed7ec01fea
[ticket/15355] Remove version field when no update is available
...
PHPBB3-15355
2017-09-09 13:41:04 +02:00
Tristan Darricau
870ced94eb
Merge pull request #4939 from CHItA/ticket/15351
...
[ticket/15351] Fix missing global usage
* github.com:phpbb/phpbb:
[ticket/15351] Fix missing global usage
2017-09-09 13:19:56 +02:00
Máté Bartus
bd7cdd2e25
[ticket/15351] Fix missing global usage
...
PHPBB3-15351
2017-09-09 12:58:05 +02:00
Máté Bartus
dababbb9ad
Merge branch '3.2.x'
2017-09-09 12:09:50 +02:00
Máté Bartus
c265eab081
Merge pull request #4932 from Nicofuma/ticket/15351
...
[ticket/15351] Makes confirm_works in a router context (app.php)
2017-09-09 12:07:52 +02:00
Michael Miday
dca07283e9
[ticket/15354] Use Lang Var
...
PHPBB3-15354
2017-09-09 11:20:05 +02:00
Tristan Darricau
c368d170cf
[ticket/15351] Makes confirm_works in a router context (app.php)
...
PHPBB3-15351
2017-09-08 16:26:39 +02:00
Marc Alexander
ad24ecae11
Merge pull request #4937 from rubencm/ticket/15330
...
[ticket/15330] Twig function to know if a language string is defined
2017-09-08 16:16:44 +02:00
Oliver Schramm
7a32f79752
Merge branch '3.2.x'
2017-09-08 16:06:52 +02:00
Oliver Schramm
16da17a4ba
Merge branch '3.1.x' into 3.2.x
2017-09-08 16:06:47 +02:00
Oliver Schramm
93621aa184
Merge pull request #4929 from marc1706/ticket/15347
...
[ticket/15347] Use single quotes in update hashes query
2017-09-08 16:06:46 +02:00
Oliver Schramm
da1f2fb9a9
Merge branch '3.2.x'
2017-09-08 15:02:26 +02:00
Oliver Schramm
b75a9dcbe3
Merge pull request #4936 from marc1706/ticket/7845
...
[ticket/7845] Ensure config script path is not empty
2017-09-08 15:02:25 +02:00
Rubén Calvo
c87b94133c
[ticket/15330] Fix typo
...
PHPBB3-15330
2017-09-08 14:39:04 +02:00
Oliver Schramm
92f4cb442b
Merge branch '3.2.x'
2017-09-08 14:22:17 +02:00
Oliver Schramm
1095a67a1b
Merge pull request #4934 from marc1706/ticket/7488
...
[ticket/7488] Display no forums message if user can't see forums of category
2017-09-08 14:22:17 +02:00
Oliver Schramm
aa15e61e4c
Merge branch '3.2.x'
2017-09-08 13:53:38 +02:00
Oliver Schramm
65692e8785
Merge pull request #4935 from JimMH/patch-4
...
[ticket/15352] Descriptions are not used in categories
2017-09-08 13:53:17 +02:00
Jim Mossing Holsteyn
563fc6ed6c
[ticket/15352] Descriptions are not using in categories
...
PHPBB3-15352
2017-09-08 13:50:42 +02:00
Tristan Darricau
9b2c45d892
Merge pull request #4894 from rubencm/ticket/15276
...
[ticket/15276] Use storage in avatars
* github.com:phpbb/phpbb: (34 commits)
[ticket/15276] Changed annotation
[ticket/15276] Remove unused code
[ticket/15276] Revert some changes
[ticket/15276] Use IniGetWrapper
[ticket/15276] Add missing dependency
[ticket/15276] Remove unused dependency
[ticket/15276] Add missing properties
[ticket/15276] Use InitGetWrapper
[ticket/15276] Fix comments
[ticket/15276] Fix code and add phpdoc
[ticket/15276] Use stream_copy_to_stream
[ticket/15276] Fix typo
[ticket/15276] Use mimetype guesser
[ticket/15276] Update file_info to get size of images
[ticket/15276] Update
[ticket/15276] Remove avatar_path
[ticket/15276] Remove avatar_path from acp
[ticket/15276] Use finfo to get mimetype
[ticket/15276] Update file_info
[ticket/15276] Fix code style
...
2017-09-08 13:32:38 +02:00
Rubén Calvo
21f3c53882
[ticket/15330] Twig function to know if a language string is defined
...
PHPBB3-15330
2017-09-08 11:56:20 +02:00
Marc Alexander
654c2370ea
[ticket/7845] Ensure config script path is not empty
...
PHPBB3-7845
2017-09-08 11:54:42 +02:00
Marc Alexander
339ec5bded
[ticket/7488] Display no forums message if user can't see forums of category
...
PHPBB3-7488
2017-09-08 11:42:50 +02:00
Marc Alexander
7e4498dfb5
[ticket/15347] Fix query quotes in update hashes cli command
...
PHPBB3-15347
2017-09-08 10:54:58 +02:00
Rubén Calvo
443c5034ce
[ticket/15276] Changed annotation
...
PHPBB3-15276
2017-09-07 16:44:01 +02:00
Marc Alexander
38cbdb6768
[ticket/15347] Use single quotes in update hashes query
...
PHPBB3-15347
2017-09-07 16:27:49 +02:00
Tristan Darricau
7221a47bb6
Merge pull request #4928 from Crizz0/ticket/15350
...
[ticket/15350] Changes outdated wiki-link for plural-rules to new docs/
* github.com:phpbb/phpbb:
[ticket/15350] Changes outdated wiki-link to new docs/
2017-09-07 15:17:57 +02:00
Rubén Calvo
a8ba4a99e3
[ticket/15276] Remove unused code
...
PHPBB3-15276
2017-09-07 15:10:52 +02:00
Máté Bartus
114f38648b
Merge pull request #4900 from rxu/ticket/15318
...
[ticket/15318] Make user option to disable word censoring effective again
2017-09-07 15:09:48 +02:00
Máté Bartus
b1fe0f9dbe
Merge branch '3.2.x'
2017-09-07 15:09:40 +02:00
Máté Bartus
f6166225cf
Merge pull request #4902 from MoleDJ/patch-1
...
[ticket/15320] Redis cache does not save keys withouth expiration
2017-09-07 15:09:08 +02:00
Máté Bartus
da357f80f8
Merge pull request #4903 from rxu/ticket/15323
...
[ticket/15323] Allow Twig syntax in bbcode.html
2017-09-07 15:08:12 +02:00
Máté Bartus
2c56beee33
Merge pull request #4890 from hanakin/ticket/15308
...
[ticket/15308] Remove !important from pagination css class
2017-09-07 15:07:26 +02:00
Crizzo
4dfd12d5b2
[ticket/15350] Changes outdated wiki-link to new docs/
...
PHPBB3-15350
2017-09-07 15:05:53 +02:00
Tristan Darricau
d7005b816c
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15262] Update the font-weight of buttons
2017-09-07 15:01:00 +02:00
Rubén Calvo
ed282199ac
[ticket/15276] Revert some changes
...
PHPBB3-15276
2017-09-07 14:59:55 +02:00
Tristan Darricau
9af394eff3
Merge pull request #4920 from hanakin/ticket/15262
...
[ticket/15262] Update button font-weight
* github.com:phpbb/phpbb:
[ticket/15262] Update the font-weight of buttons
2017-09-07 14:59:55 +02:00
Tristan Darricau
4bed192958
Merge pull request #4921 from hanakin/ticket/15343
...
[ticket/15343] Fix forum row inner list
* github.com:phpbb/phpbb:
[ticket/15343] make blocks
[ticket/15343] Fix forum row inner list
2017-09-07 14:58:26 +02:00
Rubén Calvo
9fcf30d504
[ticket/15276] Use IniGetWrapper
...
PHPBB3-15276
2017-09-07 14:50:55 +02:00
Tristan Darricau
51693764f9
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15309] Add margin to pagination
[ticket/15309] Right-align responsive pagination for consistency
[ticket/15309] Fix pagination overlap
2017-09-07 14:46:12 +02:00