1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-02 06:52:48 +02:00

1583 Commits

Author SHA1 Message Date
Tristan Darricau
b7597a347b
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14887] ACP profile step one lang specific event
2016-12-11 20:43:39 +01:00
Tristan Darricau
27df2278ef
Merge pull request #4570 from Derky/ticket/14901
[ticket/14901] Remove notice for extension without version check

* Derky/ticket/14901:
  [ticket/14901] Remove notice for extension without version check
2016-12-11 20:09:16 +01:00
Christian Schnegelberger
dfe42e9603 [ticket/14908] Uses lang-variable instead of english text
PHPBB3-14908
2016-12-10 21:50:09 +01:00
Derky
a2793f24b1 [ticket/14901] Remove notice for extension without version check
Extensions without version check should not display a notice on the
details page in the ACP.

PHPBB3-14901
2016-12-09 20:03:00 +01:00
javiexin
76ffd288fe [ticket/14887] ACP profile step one lang specific event
PHPBB3-14887
2016-12-08 12:16:07 +01:00
Marc Alexander
9b4190e136
[ticket/14492] Encode URI components in systemdata for stats
The stats data needs to be URI encoded to prevent issues when
submitting the data to the receive_stats script on www.phpbb.com.

PHPBB3-14492
2016-12-03 14:23:34 +01:00
Marc Alexander
afe16a6272
[ticket/14492] Add missing event variable
PHPBB3-14492
2016-12-03 14:23:34 +01:00
Marc Alexander
89fef2ce13
[ticket/14492] Send statistics via ajax request
Flooding ajax requests will try to be prevented and sending
stats without JS will also properly work.

PHPBB3-14492
2016-12-03 14:23:34 +01:00
Marc Alexander
80a63a9a94
[ticket/14492] Add missing input name
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Marc Alexander
c07ecb060d
[ticket/14492] Add events for modifying help phpBB page
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Marc Alexander
cc7a0aa4fb
[ticket/14492] Use guzzle for submitting data to stats service
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Marc Alexander
9fb2a5d5f8
[ticket/14492] Update language variables and trigger details text
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Marc Alexander
c1035c98e4
[ticket/14492] Rename files to help_phpbb and fix css tabbing
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Marc Alexander
6f315da9ab
[ticket/14492] Improve look and display data again
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Marc Alexander
c5e0635bc7
[ticket/14492] Add basic layout for enabling viglink
PHPBB3-14492
2016-12-03 14:20:28 +01:00
Tristan Darricau
1e667ce8cc
Merge pull request #4543 from marc1706/ticket/9590-rhea
[ticket/9590] Submit permissions form in chunks -- Rhea version

* marc1706/ticket/9590-rhea:
  [ticket/9590] Update permissions with correct permission role
  [ticket/9590] Correctly update submit size and replace all forum_id[]
  [ticket/9590] Further deduplicate code for form data
  [ticket/9590] Preserve selected forums after previous page redirect
  [ticket/9590] Support ajax submit of permissions for specific forums
  [ticket/9590] Correctly set roles and refresh page using POST
  [ticket/9590] Submit permissions form in chunks when using "Apply all"
2016-12-03 13:16:59 +01:00
Marc Alexander
b24c2ea5be
[ticket/14736] Reset role dropdown when modifying permissions
PHPBB3-14736
2016-12-01 11:34:00 +01:00
Marc Alexander
48d6abcf0a
[ticket/9590] Update permissions with correct permission role
PHPBB3-9590
2016-11-27 00:14:22 +01:00
Marc Alexander
4fce18609f
Merge branch 'ticket/9590' into ticket/9590-rhea 2016-11-27 00:14:14 +01:00
Marc Alexander
5e36dd3d0b
[ticket/9590] Correctly update submit size and replace all forum_id[]
PHPBB3-9590
2016-11-27 00:12:59 +01:00
Marc Alexander
0f46d35f75
[ticket/9590] Further deduplicate code for form data
PHPBB3-9590
2016-11-26 23:56:11 +01:00
Marc Alexander
b01b3b8b94
[ticket/9590] Preserve selected forums after previous page redirect
Also improved the way the forum ID list is generated when clicking
on "Apply all permissions".

PHPBB3-9590
2016-11-26 23:34:54 +01:00
Marc Alexander
30b3fbb2cf
[ticket/9590] Support ajax submit of permissions for specific forums
PHPBB3-9590
2016-11-26 13:28:15 +01:00
Marc Alexander
ff76a3e433
[ticket/9590] Correctly set roles and refresh page using POST
PHPBB3-9590
2016-11-26 12:31:22 +01:00
Marc Alexander
6c98e3b12f
[ticket/9590] Submit permissions form in chunks when using "Apply all"
This will add an AJAX call that will submit the permissions form in chunks
of 5 fieldsets when clicking on "Apply all permissions".

PHPBB3-9590
2016-11-26 09:58:47 +01:00
Marc Alexander
4a1e5df654
Merge branch '3.1.x' into 3.2.x 2016-11-12 17:14:39 +01:00
Jakub Senko
2f6a258175 [ticket/14848] Add acp_ext_list_disabled/enabled_title_after
PHPBB3-14848
2016-11-02 10:03:11 +01:00
Marc Alexander
142f937354
Merge branch '3.1.x' into 3.2.x 2016-09-14 20:51:13 +02:00
Matt Friedman
5503c09cd5 [ticket/14783] Add template event before custom BBCodes in ACP
PHPBB3-14783
2016-09-14 10:37:27 -07:00
Jakub Senko
4b6c2c8cde [ticket/10961] Send HTTP 403 when applicable
PHPBB3-10961
2016-09-01 08:48:37 +02:00
Marc Alexander
a460aec68c Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/language/en/install.php
2016-06-19 18:25:16 +02:00
Marc Alexander
c60dbede3e Merge pull request #4281 from rmcgirr83/ticket_13716
[ticket/13716] Check phpBB version against config version
2016-06-19 18:17:33 +02:00
Marc Alexander
4fdbd6217d Merge branch '3.1.x' into 3.2.x 2016-05-31 21:43:19 +02:00
Jakub Senko
73073ac8c3 [ticket/14643] Offer latest backup to restore by default
PHPBB3-14643
2016-05-29 17:28:33 +02:00
Richard McGirr
0d7625c534 [ticket/13716] Remove extra br tag and correct missing closing a html tag
PHPBB3-13716
2016-05-16 18:01:55 -04:00
Richard McGirr
04f320cb01 [ticket/13716] Check phpBB version against config version
Display a warning in the ACP if the version constant (files)
does not match the phpbb_config version
(often indicating that the database updates hasn't been run)

PHPBB3-13716
2016-04-05 07:09:12 -04:00
Tristan Darricau
2bfbc07b7d Merge pull request #4021 from marc1706/ticket/14272
[ticket/14272] Use html5 valid input elements

* marc1706/ticket/14272:
  [ticket/14272] Allow input of floats for filesize
  [ticket/14272] Use input type number instead of text in avatars
  [ticket/14272] Assign min and max values for avatar driver settings
  [ticket/14272] Define min and max values for avatar width and height
  [ticket/14272] Disable not toggled form elements
  [ticket/14272] Make sure phpbb_avatar_manager was defined
  [ticket/14272] Remove useless check
  [ticket/14272] Fix invalid or missing min/max settings
  [ticket/14272] Assign min/max for all allowed types
  [ticket/14272] Only use maxlength and size for allowed input elements
2016-03-27 13:34:17 +02:00
Marc Alexander
1600d82b77 Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x
Conflicts:
	phpBB/adm/style/acp_icons.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_acp.php
	phpBB/includes/ucp/ucp_groups.php
	phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
	phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
	phpBB/styles/subsilver2/template/mcp_topic.html
	phpBB/styles/subsilver2/template/posting_attach_body.html
	phpBB/styles/subsilver2/template/posting_body.html
	phpBB/styles/subsilver2/template/posting_poll_body.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
2016-03-27 09:59:25 +02:00
Marc Alexander
2e3f89444a Merge branch 'ticket/14136' into ticket/14136-3.2.x
Conflicts:
	phpBB/adm/style/install_update_diff.html
	phpBB/adm/style/installer_header.html
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
2016-03-24 16:12:56 +01:00
Marc Alexander
244d171cb0 [ticket/14136] Add back X-UA-Compatible meta tag
This was previously removed without needing to. Adding it back to force
users to not emulate the page for previous versions of IE. The
imagetoolbar http-equiv tag was not restored as IE does not contain that
anymore since IE7. Also, the chome=1 has been removed from the
X-UA-Compatible content as ChromeFrame does not receive any further
updates since 2014 and is potentially broken.

PHPBB3-14136
2016-03-24 16:07:07 +01:00
Marc Alexander
620a862266 [ticket/14315] Add functional tests for permission roles and fix non-js
Without JS the settings were not applied due to duplicate input names.

PHPBB3-14315
2016-02-17 12:56:19 +01:00
Marc Alexander
6f41fcb3d6 [ticket/14315] Add back roles select for disable javascript
The javascript will hide the old select and show the version using
the span and showing the tooltips.

PHPBB3-14315
2016-02-16 18:21:04 +01:00
Marc Alexander
32815faa33 [ticket/14315] Tweak location of drop-down
PHPBB3-14315
2016-02-16 18:21:04 +01:00
Marc Alexander
4cfba8f3a4 [ticket/14315] Build role options for each permission group
Previously all role options were put into one array. This required
filtering the options. Instead, these are now passed to the template
via template loops.

PHPBB3-14315
2016-02-16 18:21:04 +01:00
Marc Alexander
eab1b1ad11 [ticket/14315] Correctly set default values and reset values
The permissions tooltip javascript failed at correctly passing
the default values to the page. The same applied to the
display_mask() method in includes/acp/auth.php.

PHPBB3-14315
2016-02-16 18:21:04 +01:00
Marc Alexander
4973632288 [ticket/14315] Only add role options specified for each group
PHPBB3-14315
2016-02-16 18:21:04 +01:00
Oliver Schramm
2084404d2a [ticket/14462] Make timeout error translateable
PHPBB3-14462
2016-02-14 16:16:33 +01:00
Marc Alexander
b39b3da5af [ticket/14272] Allow input of floats for filesize
This might be needed while switching the default input from KiB to MiB or
similar changes to settings.

PHPBB3-14272
2016-02-03 22:03:31 +01:00
Tristan Darricau
03fba99074 Merge pull request #4017 from CHItA/ticket/14262
[ticket/14262] Move convertor to controller

* CHItA/ticket/14262:
  [ticket/14262] Add error handling and small CS fixes
  [ticket/14262] Remove converter template duplicate
  [ticket/14262] Fix stage navigation
  [ticket/14262] Move convertor to controller
2016-02-02 21:29:20 +01:00
Mate Bartus
91f809dc3d [ticket/14262] Add error handling and small CS fixes
PHPBB3-14262
2016-02-02 16:09:40 +01:00