makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-22 03:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
30430 commits 18 branches 192 tags 207 MiB
Commit graph

30430 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Alexander
0a1604a536 [ticket/14315] Apply roles options format for multiple forums too 
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
Marc Alexander
9eedf29021 [ticket/14481] Use port 443 if https is specified in x-forwarded-proto 
PHPBB3-14481
 2016-02-16 16:33:19 +01:00
Tristan Darricau
8d1eee0e01 Merge branch '3.2.x' 
* 3.2.x:
  [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:11:27 +01:00
Tristan Darricau
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
Tristan Darricau
1f0b6c8123 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14447] Remove trailing white spaces in Prosilver
 2016-02-15 23:08:18 +01:00
Tristan Darricau
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
Tristan Darricau
f872af464e Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14477] Update text-formatter dependency
 2016-02-15 22:57:49 +01:00
Tristan Darricau
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
Tristan Darricau
9a7f2c08f6 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14478] Remove no longer required shell script
  [ticket/14478] Move facebook/webdriver dependency to main composer file
 2016-02-15 22:56:27 +01:00
Tristan Darricau
f983684fdb Merge pull request #4180 from marc1706/ticket/14478 
[ticket/14478] Move facebook/webdriver dependency to main composer file

* marc1706/ticket/14478:
  [ticket/14478] Remove no longer required shell script
  [ticket/14478] Move facebook/webdriver dependency to main composer file
 2016-02-15 22:55:56 +01:00
Marc Alexander
accf8f8625 [ticket/14481] Respect HTTP_X_FORWARDED headers for implying https 
PHPBB3-14481
 2016-02-15 22:06:25 +01:00
Mate Bartus
6debd9a1be [ticket/14462] Not show timeout messages in convertors 
PHPBB3-14462
 2016-02-14 19:27:24 +01:00
Marc Alexander
469f200821 [ticket/14478] Remove no longer required shell script 
PHPBB3-14478
 2016-02-14 16:28:08 +01:00
Marc Alexander
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
Oliver Schramm
2084404d2a [ticket/14462] Make timeout error translateable 
PHPBB3-14462
 2016-02-14 16:16:33 +01:00
Marc Alexander
b6f9a2e1aa [ticket/14477] Update text-formatter dependency 
PHPBB3-14477
 2016-02-14 15:49:56 +01:00
Joas Schilling
c3370201ba Merge branch '3.2.x' 2016-02-13 18:08:28 +01:00
Joas Schilling
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
Joas Schilling
17e21d5140 [3.1.x] Increase dev version for 3.1.9 2016-02-13 18:01:32 +01:00
Joas Schilling
c2ea2a3e18 Merge branch 'prep-release-3.1.8' into 3.1.x 2016-02-13 18:00:20 +01:00
Joas Schilling
cafd165bd0 [prep-release-3.1.8] Update changelog 2016-02-13 16:45:51 +01:00
Joas Schilling
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
Joas Schilling
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
Oliver Schramm
1bd4895d7a [ticket/14409] Update session page info before displaying online list 
PHPBB3-14409
 2016-02-13 15:58:05 +01:00
Marc Alexander
6d57136264 [ticket/14475] Do not log removal of users from newly registered group 
PHPBB3-14475
 2016-02-13 15:36:38 +01:00
Mate Bartus
b9f5c03099 [ticket/14462] Update ordering in install db config 
PHPBB3-14462
 2016-02-13 15:02:33 +01:00
Joas Schilling
e63493115a [prep-release-3.1.8] Add changelog for 3.1.8-RC1 2016-02-13 14:57:53 +01:00
Joas Schilling
a1a84c9930 [prep-release-3.1.8] Add migration for 3.1.8-RC1 2016-02-13 14:55:24 +01:00
Joas Schilling
3e8a62f309 [prep-release-3.1.8] Update version to 3.1.8-RC1 2016-02-13 14:52:57 +01:00
Mate Bartus
2efceffaeb [ticket/14462] Fix comments 
PHPBB3-14462
 2016-02-12 23:30:32 +01:00
Mate Bartus
97d128a7e4 [ticket/14462] Fix tests 
PHPBB3-14462
 2016-02-12 15:53:36 +01:00
Mate Bartus
7c0fb563ec [ticket/14462] Fix CS and typo 
PHPBB3-14462
 2016-02-12 15:38:34 +01:00
Marc Alexander
90710ffe98 [ticket/14462] Set instance of db driver for database access using global 
PHPBB3-14462
 2016-02-12 14:31:30 +01:00
Mate Bartus
d63b5a1315 [ticket/14462] Fix installation in tests 
PHPBB3-14462
 2016-02-12 14:31:29 +01:00
Mate Bartus
68091561ab [ticket/14462] Refactor tasks to be more modular 
PHPBB3-14462
 2016-02-12 14:31:28 +01:00
Mate Bartus
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
Marc Alexander
05fec8c642 Merge branch '3.2.x' 2016-02-11 23:40:39 +01:00
Marc Alexander
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
Tristan Darricau
5557760ecc [ticket/14440] Add comments 
PHPBB3-14440
 2016-02-11 22:18:09 +01:00
Tristan Darricau
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
Marc Alexander
aa6dd6d4ff Merge pull request #4172 from Crizz0/ticket/14307 
[ticket/14307] Fixes wording in install.php file/dir exist/writeable
 2016-02-10 14:11:18 +01:00
Marc Alexander
0210a6298d Merge branch '3.1.x' 2016-02-09 16:57:29 +01:00
Marc Alexander
ad5d4f6bc3 Merge pull request #4174 from cyberalien/ticket/14467 
[ticket/14467] Fix height calculation in autoResize
 2016-02-09 16:57:25 +01:00
cyberalien
147f929713 [ticket/14467] Fix height calculation in autoResize 
PHPBB3-14467
 2016-02-08 16:47:04 +02:00
Marc Alexander
8cf086ef9b [ticket/14448] Correctly pass verify setting if available 
PHPBB3-14448
 2016-02-08 13:26:19 +01:00
Tristan Darricau
fffbbbdcc4 Merge pull request #4169 from CHItA/ticket/14460 
[ticket/14460] Use the selected language with AJAX requests as well

* CHItA/ticket/14460:
  [ticket/14460] Use the selected language with AJAX requests as well
 2016-02-07 16:19:23 +01:00
Tristan Darricau
f258aebc59 Merge pull request #4161 from CHItA/ticket/14312 
[ticket/14312] Enable running database update only

* CHItA/ticket/14312:
  [ticket/14312] Allow updating without having the update directory
  [ticket/14312] Push migration error messages to the user
 2016-02-07 16:03:52 +01:00