Marc Alexander
843586a93f
Merge branch '3.2.x'
2017-12-23 13:23:07 +01:00
Marc Alexander
cb233c862b
Merge pull request #5036 from JoshyPHP/ticket/15442
...
[ticket/15442] Allow unsafe HTML in bbcode.html
2017-12-23 13:23:01 +01:00
Marc Alexander
7ef4be39a5
Merge branch '3.2.x'
2017-12-22 19:52:21 +01:00
Marc Alexander
e2e47a87c3
Merge pull request #5032 from rxu/ticket/15224
...
[ticket/15224] Fix some MySQL fulltext index searching errors
2017-12-22 19:45:16 +01:00
Rubén Calvo
a4a928b156
[ticket/15400] Make app.php routes work in vagrant
...
PHPBB3-15400
2017-12-20 20:35:26 +01:00
Marc Alexander
20984af029
Merge branch '3.2.x'
2017-12-18 21:13:19 +01:00
Marc Alexander
e23b671d32
Merge pull request #5060 from dsinn/ticket/15478
...
[ticket/15478] Fix core.js $loadingIndicator JavaScript errors
2017-12-18 20:06:17 +01:00
rxu
c077b90f8b
[ticket/15486] Add core event to the user_add() to modify notifications data
...
Additionally, fix some typos in two other events docblocks.
PHPBB3-15486
2017-12-19 00:05:58 +07:00
Daniel Sinn
bf55546d2d
[ticket/15471] Fix event documentation for core.prune_forums_settings_confirm
...
PHPBB3-15471
2017-12-18 08:14:42 -05:00
Derk
b9e2e53c33
Merge pull request #5062 from vinny/ticket/15484
...
[ticket/15484] Remove empty lines from includes/ucp/ucp_register.php
2017-12-18 07:43:37 +01:00
vinny
5bfd609cc8
[ticket/15485] Add template event for forum images
...
PHPBB3-15485
2017-12-18 02:52:35 -03:00
vinny
68f8ec60fc
[ticket/15484] Remove multiple empty lines at includes/ucp/ucp_register.php
...
PHPBB3-15484
2017-12-18 02:32:51 -03:00
Derky
bcbfd75719
Merge branch '3.2.x'
2017-12-18 00:07:13 +01:00
Derky
57772a0d32
Merge pull request #5035 from kasimi/ticket/15440
...
[ticket/15440] Added core.ucp_register_agreement_modify_template_data
2017-12-17 23:53:23 +01:00
Derky
d2dc314a30
[ticket/15440] State deprecated version for core.ucp_register_agreement
...
PHPBB3-15440
2017-12-17 23:36:26 +01:00
kasimi
79464c9951
[ticket/15440] Added core.ucp_register_agreement_modify_template_data
...
PHPBB3-15440
2017-12-17 23:35:59 +01:00
Marc Alexander
730e472fb3
Merge branch '3.2.x'
2017-12-17 21:37:57 +01:00
Marc Alexander
6d864a9df5
Merge pull request #5059 from kasimi/ticket/15476
...
[ticket/15476] Add event core.search_modify_post_row
2017-12-17 21:37:50 +01:00
Marc Alexander
dfdb02c933
Merge branch '3.2.x'
2017-12-17 16:22:01 +01:00
Marc Alexander
751de0c2e9
Merge pull request #5052 from hanakin/ticket/15455
...
[ticket/15455] Fix UCP padding issues
2017-12-17 16:21:57 +01:00
Marc Alexander
2b7c498f40
Merge branch '3.2.x'
2017-12-17 16:13:10 +01:00
Marc Alexander
d546e7fbd9
Merge pull request #5054 from hanakin/ticket/15470
...
[ticket/15470] Add font-size prop to .attachbox
2017-12-17 16:10:39 +01:00
Marc Alexander
4bbda5bc45
[ticket/15322] Adjust email language and move force sender setting
...
PHPBB3-15322
2017-12-16 18:32:55 +01:00
Marc Alexander
4e045ed767
[ticket/15322] Try to make new email setting more readable
...
PHPBB3-15322
2017-12-13 21:31:07 +01:00
Marc Alexander
9f055e1af3
[ticket/15322] Add config setting for -f parameter & remove mail function name
...
The -f parameter can now be added via configuration in the ACP. Addtionally,
the config setting for the mail function name has been removed.
PHPBB3-15322
2017-12-11 21:56:21 +01:00
Daniel Sinn
c94b7f69b7
[ticket/15478] Fix core.js $loadingIndicator JavaScript errors
...
PHPBB3-15478
2017-12-11 14:31:20 -05:00
Marc Alexander
10f1e2d1fa
Merge branch '3.2.x'
2017-12-10 10:45:03 +01:00
Marc Alexander
cc3f77b5fc
Merge pull request #5057 from Derky/ticket/15475
...
[ticket/15475] Fix Travis pull request commit messages validation
2017-12-10 10:44:58 +01:00
JoshyPHP
485a4a75b2
[ticket/15444] Add a migration to merge duplicate BBCodes
...
PHPBB3-15444
2017-12-10 04:00:18 +01:00
JoshyPHP
75e7e7b293
[ticket/15468] Add a service to merge duplicate BBCodes
...
PHPBB3-15468
2017-12-10 02:57:07 +01:00
JoshyPHP
b9dce3fa65
[ticket/15457] Updated s9e/text-formatter dependency
...
PHPBB3-15457
2017-12-10 02:55:10 +01:00
kasimi
3083dd997b
[ticket/15476] Add event core.search_modify_post_row
...
PHPBB3-15476
2017-12-09 15:40:55 +01:00
kitsiosk
b4ca1bdb00
[ticket/15322] Fix bug wrong return in emails
...
PHPBB3-15322
2017-12-09 16:19:41 +02:00
Derky
5ab3eac014
[ticket/15475] Fix Travis pull request commit messages validation
...
It stopped working because of Travis's default clone depth of 50.
PHPBB3-15475
2017-12-08 23:49:49 +01:00
Derk
9a5d03ce72
Merge pull request #4962 from rubencm/ticket/14972
...
[ticket/14972] replace all occurrences of sizeof() with the count()
2017-12-03 23:58:34 +01:00
Derky
f70801856a
Merge branch '3.2.x'
2017-12-03 23:06:09 +01:00
Derky
2643e851f2
Merge pull request #5022 from kasimi/ticket/15431
...
[ticket/15431] Add event core.ucp_register_modify_template_data
2017-12-03 22:49:14 +01:00
kasimi
6cc46a3d39
[ticket/15431] Moved phpbb_timezone_select() before the event
...
PHPBB3-15431
2017-12-03 19:02:40 +01:00
kasimi
65c529e66d
[ticket/15431] Split up $template_vars
...
PHPBB3-15431
2017-12-03 18:47:17 +01:00
Marc Alexander
0568c4a502
Merge branch '3.2.x'
2017-12-03 17:49:43 +01:00
Marc Alexander
551c3fd511
Merge pull request #5025 from hubaishan/ticket/15433
...
[ticket/15433] Fix phpbbcli can enable non-existent extension
2017-12-03 17:49:39 +01:00
hubaishan
03b3b38db1
[ticket/15433] Fix phpbbcli can enable non-existent extension
...
Fix phpbbcli can enable non-existent extension
PHPBB3-15433
2017-12-03 15:01:31 +01:00
Daniel Sinn
5b22ccfa76
[ticket/15471] Add core events to ACP when pruning a forum
...
PHPBB3-15471
2017-11-30 15:40:18 -05:00
kasimi
9c93c180b0
[ticket/15431] Removed $page_title
...
PHPBB3-15431
2017-11-29 19:35:36 +01:00
Michael Miday
20ab0e16f0
[ticket/15470] Add font-size
...
PHPBB3-15470
2017-11-28 09:20:27 -05:00
Michael Miday
58fe69d721
[ticket/15455] Remove unessecary jumpbox
...
PHPBB3-15455
2017-11-27 11:46:39 -05:00
MichaelC
156dd4a05b
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15460] Fix group name displayed in the manage users ACP module
2017-11-26 22:12:44 +00:00
MichaelC
b66b497429
Merge remote-tracking branch 'rxu/ticket/15460' into 3.2.x
...
* rxu/ticket/15460:
[ticket/15460] Fix group name displayed in the manage users ACP module
2017-11-26 22:12:19 +00:00
MichaelC
ddc9b720ad
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15463] Add MichaelC and Hanakin to the dev credits
2017-11-26 21:57:07 +00:00
MichaelC
6ed40857ed
Merge remote-tracking branch 'CHItA/ticket/15463' into 3.2.x
...
* CHItA/ticket/15463:
[ticket/15463] Add MichaelC and Hanakin to the dev credits
2017-11-26 21:54:49 +00:00
