1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 18:41:52 +02:00
Commit Graph

26380 Commits

Author SHA1 Message Date
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
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
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
Daniel Sinn
c94b7f69b7 [ticket/15478] Fix core.js $loadingIndicator JavaScript errors
PHPBB3-15478
2017-12-11 14:31:20 -05:00
kasimi
3083dd997b [ticket/15476] Add event core.search_modify_post_row
PHPBB3-15476
2017-12-09 15:40:55 +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
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
Marc Alexander
66c4c6748f Merge branch '3.2.x' 2017-11-26 22:04:01 +01:00
Marc Alexander
a2f5468e8e Merge pull request #4991 from Sophist-UK/ticket/15390
[ticket/15390] Fix vertical bar permission tooltip
2017-11-26 21:58:59 +01:00
Marc Alexander
5485563e05 [ticket/15390] Prevent dropdown from being incorrectly offset
PHPBB3-15390
2017-11-26 20:06:43 +01:00
Marc Alexander
206c6b2185 Merge branch '3.2.x' 2017-11-26 18:33:59 +01:00
Marc Alexander
81a71f71c7 Merge pull request #5051 from JoshyPHP/ticket/15464
[ticket/15464] Detect BBCodes in uppercase when reparsing
2017-11-26 18:33:54 +01:00
JoshyPHP
a7664811dd [ticket/15464] Detect BBCodes in uppercase when reparsing
PHPBB3-15464
2017-11-23 16:25:48 +01:00
Máté Bartus
d6d77a199b [ticket/15463] Add MichaelC and Hanakin to the dev credits
PHPBB3-15463
2017-11-23 09:16:54 +01:00
Derky
1dd447c4aa Merge branch '3.2.x' 2017-11-21 14:10:06 +01:00
Máté Bartus
57323d1650 [ticket/15461] Add Derky to the list of contributors.
PHPBB3-15461
2017-11-21 14:02:43 +01:00
rxu
cb0e13aa19 [ticket/15460] Fix group name displayed in the manage users ACP module
PHPBB3-15460
2017-11-20 21:13:37 +07:00
Marc Alexander
c123254242 Merge branch '3.2.x' 2017-11-16 22:11:11 +01:00
Marc Alexander
0517e43dff Merge pull request #4976 from rubencm/ticket/15171
[ticket/15171] Replace all BBCode templates by default
2017-11-16 21:56:57 +01:00
Máté Bartus
cd757469a6 Merge branch '3.2.x' 2017-11-15 21:45:10 +01:00
Máté Bartus
1a1a2dc046 Merge pull request #4949 from marc1706/ticket/15353
[ticket/15353] Make sure users can continue update after merging file diff
2017-11-15 21:44:53 +01:00
kasimi
0409191be9 [ticket/15431] Fixed event argument description
PHPBB3-15431
2017-11-08 14:45:33 +01:00
JoshyPHP
288def143c [ticket/15442] Allow unsafe HTML in bbcode.html
PHPBB3-15442
2017-11-07 10:34:11 +01:00
Marc Alexander
ded043baab Merge pull request #5000 from hanakin/ticket/15402
[ticket/15402] repurpose tweaks.css
2017-11-05 11:50:06 +01:00