1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-09 19:26:53 +02:00
Commit Graph

23674 Commits

Author SHA1 Message Date
b7deef46ac Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13681] Invalidate and reset opcache where necessary
2016-02-18 22:00:10 +01:00
6e4ab6509b Merge pull request #4185 from marc1706/ticket/13681
[ticket/13681] Invalidate and reset opcache where necessary

* marc1706/ticket/13681:
  [ticket/13681] Invalidate and reset opcache where necessary
2016-02-18 21:55:11 +01:00
f6fd819764 Merge pull request #4165 from Nicofuma/ticket/14457
[ticket/14457] Uses a random placeholder to inject css and js
2016-02-18 21:52:48 +01:00
028191e7c2 Merge pull request #4166 from marc1706/ticket/14315
[ticket/14315] Correctly set permission roles for multiple groups

* marc1706/ticket/14315:
  [ticket/14315] Properly get sid from cookies and simplify take_screenshot
  [ticket/14315] Use proper ID selectors in ui test
  [ticket/14315] Add logout to ui tests and use in permissions role test
  [ticket/14315] Add functional tests for permission roles and fix non-js
  [ticket/14315] Add tests for setting permission roles using javascript
  [ticket/14315] Add more functionality to ui test cases
  [ticket/14315] Add back roles select for disable javascript
  [ticket/14315] Tweak location of drop-down
  [ticket/14315] Apply roles options format for multiple forums too
  [ticket/14315] Build role options for each permission group
  [ticket/14315] Correctly set default values and reset values
  [ticket/14315] Only add role options specified for each group
2016-02-18 21:47:02 +01:00
bd12427fd4 [ticket/13681] Invalidate and reset opcache where necessary
PHPBB3-13681
2016-02-18 19:03:56 +01:00
ab6e0bbef9 Merge branch '3.1.x' into 3.2.x
Conflicts:
	build/build.xml
	phpBB/composer.lock
2016-02-18 18:42:39 +01:00
fc66f00236 Merge branch 'prep-release-3.1.8' into 3.1.x
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2016-02-18 18:38:43 +01:00
9745d8d80e Add migration for 3.1.8 2016-02-18 18:04:47 +01:00
6fc7fc1c75 Update version for final 3.1.8 release 2016-02-18 17:59:26 +01:00
58359b1587 [ticket/14457] Replaces unique_id implementation by random_bytes()
PHPBB3-14457
2016-02-18 17:30:31 +01:00
08a11dbe32 [ticket/14457] Set the config values related to the RNG in the installer config
PHPBB3-14457
2016-02-18 17:30:31 +01:00
97bbf2d2b8 [ticket/14457] Handle the case where there isn't any 'definition' bag
PHPBB3-14457
2016-02-18 17:30:31 +01:00
99ace63e62 [ticket/14457] Don't set CSS to JS and JS to CSS
PHPBB3-14457
2016-02-18 17:30:31 +01:00
f7c5098c60 [ticket/14457] CS
PHPBB3-14457
2016-02-18 17:30:31 +01:00
f253a853b8 [ticket/14457] Fix twig/twig::assign_display
PHPBB3-14457
2016-02-18 17:30:31 +01:00
d34ffda9c1 [ticket/14457] Uses a random placeholder to inject css and js
PHPBB3-14457
2016-02-18 17:30:31 +01:00
4364629919 [ticket/14485] Update composer.lock
PHPBB3-14485
2016-02-18 16:28:04 +01:00
1007dea154 Merge pull request #4127 from RMcGirr83/ticket_14416
[ticket/14416] footer nav links have incorrect tooltip styling applied
2016-02-18 16:18:29 +01:00
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
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
32815faa33 [ticket/14315] Tweak location of drop-down
PHPBB3-14315
2016-02-16 18:21:04 +01:00
0a1604a536 [ticket/14315] Apply roles options format for multiple forums too
PHPBB3-14315
2016-02-16 18:21:04 +01:00
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
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
4973632288 [ticket/14315] Only add role options specified for each group
PHPBB3-14315
2016-02-16 18:21:04 +01:00
d0ce6a18df Merge pull request #4171 from CHItA/ticket/14462
[ticket/14462] Try to prevent timeouts in the installer

* CHItA/ticket/14462:
  [ticket/14462] Not show timeout messages in convertors
  [ticket/14462] Make timeout error translateable
  [ticket/14462] Update ordering in install db config
  [ticket/14462] Fix comments
  [ticket/14462] Fix tests
  [ticket/14462] Fix CS and typo
  [ticket/14462] Set instance of db driver for database access using global
  [ticket/14462] Fix installation in tests
  [ticket/14462] Refactor tasks to be more modular
  [ticket/14462] Further speed improvements
2016-02-16 00:06:52 +01:00
00d71d854c Merge pull request #4157 from VSEphpbb/ticket/14447
[ticket/14447] Remove trailing white spaces in Prosilver

* VSEphpbb/ticket/14447:
  [ticket/14447] Remove trailing white spaces in Prosilver
2016-02-15 23:08:08 +01:00
d4c7f25e04 Merge pull request #4179 from marc1706/ticket/14477
[ticket/14477] Update text-formatter dependency

* marc1706/ticket/14477:
  [ticket/14477] Update text-formatter dependency
2016-02-15 22:57:30 +01:00
6debd9a1be [ticket/14462] Not show timeout messages in convertors
PHPBB3-14462
2016-02-14 19:27:24 +01:00
d330ef8c1b [ticket/14478] Move facebook/webdriver dependency to main composer file
Also updated to latest version and now using proper version in
composer.json.

PHPBB3-14478
2016-02-14 16:24:00 +01:00
2084404d2a [ticket/14462] Make timeout error translateable
PHPBB3-14462
2016-02-14 16:16:33 +01:00
b6f9a2e1aa [ticket/14477] Update text-formatter dependency
PHPBB3-14477
2016-02-14 15:49:56 +01:00
8663edce76 Merge branch '3.1.x' into 3.2.x
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/includes/functions_user.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2016-02-13 18:08:01 +01:00
17e21d5140 [3.1.x] Increase dev version for 3.1.9 2016-02-13 18:01:32 +01:00
cafd165bd0 [prep-release-3.1.8] Update changelog 2016-02-13 16:45:51 +01:00
9590ff3c18 Merge pull request #4176 from Elsensee/ticket/14409
[ticket/14409] Update session page info before displaying online list
2016-02-13 16:45:04 +01:00
4f07a0bafb Merge pull request #4177 from marc1706/ticket/14475
[ticket/14475] Do not log removal of users from newly registered group
2016-02-13 16:40:16 +01:00
1bd4895d7a [ticket/14409] Update session page info before displaying online list
PHPBB3-14409
2016-02-13 15:58:05 +01:00
6d57136264 [ticket/14475] Do not log removal of users from newly registered group
PHPBB3-14475
2016-02-13 15:36:38 +01:00
b9f5c03099 [ticket/14462] Update ordering in install db config
PHPBB3-14462
2016-02-13 15:02:33 +01:00
e63493115a [prep-release-3.1.8] Add changelog for 3.1.8-RC1 2016-02-13 14:57:53 +01:00
a1a84c9930 [prep-release-3.1.8] Add migration for 3.1.8-RC1 2016-02-13 14:55:24 +01:00
3e8a62f309 [prep-release-3.1.8] Update version to 3.1.8-RC1 2016-02-13 14:52:57 +01:00
2efceffaeb [ticket/14462] Fix comments
PHPBB3-14462
2016-02-12 23:30:32 +01:00
7c0fb563ec [ticket/14462] Fix CS and typo
PHPBB3-14462
2016-02-12 15:38:34 +01:00
68091561ab [ticket/14462] Refactor tasks to be more modular
PHPBB3-14462
2016-02-12 14:31:28 +01:00
955b9ede33 [ticket/14462] Further speed improvements
- Cache the secondary container
- Only initialize tasks/modules that are being used
- Add timeout error message in the AJAX UI

PHPBB3-14462
2016-02-12 14:31:28 +01:00
971fe13a28 Merge pull request #4160 from Nicofuma/ticket/14440
[ticket/14440] Correctly remove the web root path in update_web_root_path
2016-02-11 23:40:18 +01:00
5557760ecc [ticket/14440] Add comments
PHPBB3-14440
2016-02-11 22:18:09 +01:00
c9e5d308f2 Merge pull request #4159 from marc1706/ticket/14448
[ticket/14448] Use guzzle for remote files uploading

* marc1706/ticket/14448:
  [ticket/14448] Correctly pass verify setting if available
  [ticket/14448] Let user decide if remote upload certs should be checked
  [ticket/14448] Add new vendor files and dirs to clean task
  [ticket/14448] Do not try to test remote upload timeout
  [ticket/14448] Remove no longer needed guzzle 3.9.3
  [ticket/14448] Use GuzzleHttp and try to verify certs
  [ticket/14448] Update composer.json and lock file for guzzlehttp
  [ticket/14431] Remote avatar uploading
  [ticket/14431] Remote avatar uploading
2016-02-11 22:16:10 +01:00