Commit graph

10830 commits

Author SHA1 Message Date
Marc Alexander
f75fdc69b3
Merge branch '3.2.x' 2017-11-01 15:45:15 +01:00
Marc Alexander
5cdec6199c
Merge pull request #4984 from senky/ticket/15111
[ticket/15111] Fix the typo in ucp_pm_view_messsage
2017-11-01 15:45:11 +01:00
Marc Alexander
6259789e02
Merge branch '3.2.x' 2017-11-01 10:40:01 +01:00
David Colón
dc5267728b [ticket/15372] Add and handle f_list_topics permission 2017-10-26 16:09:01 -04: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
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
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
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
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
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
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
Daniel Mota
f79b7f1896 [PHPBB3-14629] round() the log() explicitly to a proper integer 2017-09-21 17:24:16 +01:00
Oliver Schramm
99306435bd Merge branch '3.2.x' 2017-09-10 15:32:28 +02:00
Oliver Schramm
b1e3787197 Merge pull request #4889 from javiexin/ticket/15307
[ticket/15307] Extensions may add modes to acp_users
2017-09-10 15:32:23 +02:00
Rubén Calvo
7b489638d7 [ticket/15172] Cast port to integer
PHPBB3-15172
2017-09-10 13:24:10 +02:00
Rubén Calvo
246bc8cf08 [ticket/15289] Fix missing language string
PHPBB3-15289
2017-09-09 17:59:33 +02:00
Tristan Darricau
83071ee3fd
Merge pull request #4895 from rubencm/ticket/15289
[ticket/15289] Allow to configure storage from acp

* github.com:phpbb/phpbb: (38 commits)
  [ticket/15289] Add phpdoc
  [ticket/15289] Remove common language from acp module
  [ticket/15289] Check form
  [ticket/15289] Use empty instead of count
  [ticket/15289] Language fixes
  [ticket/15289] Add missing files
  [ticket/15289] Use twig syntax in variables
  [ticket/15289] Use lang_defined()
  [ticket/15289] Dont use short names
  [ticket/15289] Dont use short names
  [ticket/15289] Use Twig includes
  [ticket/15289] Update acp module
  [ticket/15289] Fix comment typo
  [ticket/15289] Fix show field description
  [ticket/15289] Update event
  [ticket/15289] Remove switch since there is only one mode
  [ticket/15289] Improve error messages
  [ticket/15289] Fix code style
  [ticket/15289] Update acp storage
  [ticket/15289] Update acp storage template
  ...
2017-09-09 17:33:51 +02:00
Rubén Calvo
3f9de5b1d4 [ticket/15172] Use symfony request component to get port
PHPBB3-15172
2017-09-09 17:32:06 +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
Rubén Calvo
2b864f51d8 [ticket/15289] Add phpdoc
PHPBB3-15289
2017-09-09 15:21:06 +02:00
Rubén Calvo
c2f508eec6 [ticket/15289] Remove common language from acp module
PHPBB3-15289
2017-09-09 14:01:08 +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
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
Rubén Calvo
11f13e21ac [ticket/15289] Check form
PHPBB3-15289
2017-09-08 17:01:13 +02:00
Rubén Calvo
036ae01b82 [ticket/15289] Use empty instead of count
PHPBB3-15289
2017-09-08 16:54:11 +02:00
Rubén Calvo
d7b1018110 [ticket/15289] Language fixes
PHPBB3-15289
2017-09-08 16:53:20 +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
Rubén Calvo
500404a921 [ticket/15289] Dont use short names
PHPBB3-15289
2017-09-08 16:25:18 +02:00
Rubén Calvo
d322404d00 [ticket/15289] Update event
PHPBB3-15289
2017-09-08 16:25:18 +02:00
Rubén Calvo
ab2dfc2762 [ticket/15289] Remove switch since there is only one mode
PHPBB3-15289
2017-09-08 16:25:18 +02:00
Rubén Calvo
4c9670363c [ticket/15289] Improve error messages
PHPBB3-15289
2017-09-08 16:25:18 +02:00
Rubén Calvo
e27e51bdbf [ticket/15289] Fix code style
PHPBB3-15289
2017-09-08 16:25:18 +02:00
Rubén Calvo
c5f3dec2f2 [ticket/15289] Update acp storage
PHPBB3-15289
2017-09-08 16:25:18 +02:00
Rubén Calvo
fdb75ed443 [ticket/15289] Use config global
PHPBB3-15289
2017-09-08 16:22:10 +02:00
Rubén Calvo
5be42739dc [ticket/15289] Fix radio buttons
PHPBB3-15289
2017-09-08 16:22:10 +02:00
Rubén Calvo
da32ecb30b [ticket/15289] Remove comment
PHPBB3-15289
2017-09-08 16:22:10 +02:00
Rubén Calvo
0b75f1e46a [ticket/15289] Update acp template
PHPBB3-15289
2017-09-08 16:22:10 +02:00
Rubén Calvo
7e0845f930 [ticket/15289] Fix code style
PHPBB3-15289
2017-09-08 16:22:10 +02:00