mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 21:44:57 +02:00
Code Issues Releases Wiki Activity
28,507 Commits 18 Branches 192 Tags
Commit Graph

3059 Commits

Author SHA1 Message Date
Tristan Darricau
f253a853b8 [ticket/14457] Fix twig/twig::assign_display 
PHPBB3-14457
 2016-02-18 17:30:31 +01:00
Tristan Darricau
d34ffda9c1 [ticket/14457] Uses a random placeholder to inject css and js 
PHPBB3-14457
 2016-02-18 17:30:31 +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
Marc Alexander
accf8f8625 [ticket/14481] Respect HTTP_X_FORWARDED headers for implying https 
PHPBB3-14481
 2016-02-15 22:06:25 +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
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
Oliver Schramm
1bd4895d7a [ticket/14409] Update session page info before displaying online list 
PHPBB3-14409
 2016-02-13 15:58:05 +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
Mate Bartus
2efceffaeb [ticket/14462] Fix comments 
PHPBB3-14462
 2016-02-12 23:30:32 +01:00
Mate Bartus
7c0fb563ec [ticket/14462] Fix CS and typo 
PHPBB3-14462
 2016-02-12 15:38:34 +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
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
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
Oliver Schramm
da08a6e3cb [ticket/14461] Correctly count up $processed_records 
PHPBB3-14461
 2016-02-06 14:45:20 +01:00
Mate Bartus
37705353c5 [ticket/14460] Use the selected language with AJAX requests as well 
PHPBB3-14460
 2016-02-06 14:14:26 +01:00
Tristan Darricau
123422d1ef Merge branch 'prep-release-3.2.0-b1' 
* prep-release-3.2.0-b1:
  [prep-release-3.2.0-b1] Add changelog for 3.2.0-b1
  [ticket/14453] Add missing dependency in the text_reparser migration
  [ticket/14452] Define $progressFillerText in installer.js
  [prep-release-3.2.0-b1] Add migration for 3.2.0-b1
  [prep-release-3.2.0-b1] Update language help files
  [prep-release-3.2.0-b1] Add schema.json
  [prep-release-3.2.0-b1] Update version to 3.2.0-b1
 2016-02-05 17:05:52 +01:00
Tristan Darricau
b40f9ce6e1 [ticket/14453] Add missing dependency in the text_reparser migration 
PHPBB3-14453
 2016-02-05 15:56:28 +01:00
Tristan Darricau
379634a102 [prep-release-3.2.0-b1] Add migration for 3.2.0-b1 2016-02-05 15:56:28 +01:00
Tristan Darricau
3846b6a6e3 [ticket/14453] Add missing dependency in the text_reparser migration 
PHPBB3-14453
 2016-02-05 12:16:34 +01:00
Mate Bartus
ad7b3ed178 [ticket/14312] Allow updating without having the update directory 
PHPBB3-14312
 2016-02-04 22:01:38 +01:00
Mate Bartus
2f6f9a05eb [ticket/14312] Push migration error messages to the user 
PHPBB3-14312
 2016-02-04 21:20:02 +01:00
Marc Alexander
fd9c05309d [ticket/14448] Let user decide if remote upload certs should be checked 
Also fixed some minor issues like coding style.

PHPBB3-14448
 2016-02-04 17:14:48 +01:00
Tristan Darricau
7ec6dd75f3 [ticket/14440] Correctly remove the web root path in update_web_root_path 
PHPBB3-14440
 2016-02-04 00:27:12 +01:00
Marc Alexander
c83db45f55 [ticket/14448] Use GuzzleHttp and try to verify certs 
PHPBB3-14448
 2016-02-03 14:06:10 +01:00
Scott Dutton
49dd9f0219 [ticket/14431] Remote avatar uploading 
Fixed content length bug
Ran composer update

PHPBB3-14431
 2016-02-03 11:26:32 +01:00
Scott Dutton
cec63974c3 [ticket/14431] Remote avatar uploading 
replace the 3.1 way with guzzle
Adds guzzle as a dependency
Removed a test as it wont wont with guzzle (as far as I know)

PHPBB3-14431
 2016-02-03 11:24:47 +01:00
Marc Alexander
013d4d4633 Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/functions_upload.php
 2016-02-03 10:31:56 +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
Tristan Darricau
724bd471a7 Merge pull request #4155 from marc1706/ticket/14446 
[ticket/14446] Add predefined placeholder variables to twig definition

* marc1706/ticket/14446:
  [ticket/14446] Add predefined placeholder variables to twig definition
 2016-02-02 21:18:09 +01:00
Tristan Darricau
4133d8a5f1 Merge pull request #4156 from CHItA/ticket/14445 
[ticket/14445] Force refresh before schema generation

* CHItA/ticket/14445:
  [ticket/14445] Force refresh before schema generation
 2016-02-02 21:16:37 +01:00
Mate Bartus
8f4889da58 [ticket/14445] Force refresh before schema generation 
PHPBB3-14445
 2016-02-02 19:48:06 +01:00
Mate Bartus
debd1bb9d6 [ticket/14321] Clean up arcihve controller logic 
PHPBB3-14321
 2016-02-02 18:17:11 +01:00
Marc Alexander
94f87d9318 [ticket/14446] Add predefined placeholder variables to twig definition 
PHPBB3-14446
 2016-02-02 17:13:47 +01:00
Tristan Darricau
8e100f000e Merge pull request #4144 from VSEphpbb/ticket/14434 
[ticket/14434] Allow non-migration files inside migrations folder (continued)

* VSEphpbb/ticket/14434:
  [ticket/14434] Refactored to check migrations when setting them
  [ticket/14434] Check migrations in the database updater task
  [ticket/14434] Do not include non-migrations in CLI list
  [ticket/14434] Remove redundant conditional
  [ticket/14434] Fix whitespace mistakes
  [ticket/14434] Remove recursion to simplify is_migration method
  [ticket/14434] Extract migration check to a reusable method
  [ticket/14434] Schema generator should ignore migration helpers
 2016-02-02 13:12:25 +01:00
Martin Beckmann
fdd5a18763 [ticket/14443] Introduce additional parameter to messenger 
PHPBB3-14443
 2016-02-01 23:11:39 +01:00
Oliver Schramm
b2b99e5da8 Merge pull request #4147 from marc1706/ticket/14436 
[ticket/14436] Add dependency on oauth_states migration
 2016-02-01 20:25:13 +01:00
Marc Alexander
3d67606e16 Merge pull request #4145 from Nicofuma/ticket/14432 
[ticket/14432] Adds a method to get raw language values
 2016-02-01 12:07:02 +01:00
Mate Bartus
a649768e17 [ticket/14262] Move convertor to controller 
PHPBB3-14262
 2016-01-29 00:03:44 +01:00
Matt Friedman
27027deb9c [ticket/14434] Refactored to check migrations when setting them 
PHPBB3-14434
 2016-01-28 12:17:35 -08:00
Matt Friedman
fb1acb0ef4 [ticket/14434] Check migrations in the database updater task 
PHPBB3-14434
 2016-01-28 07:04:55 -08:00
Matt Friedman
fc72862ca4 [ticket/14434] Do not include non-migrations in CLI list 
PHPBB3-14434
 2016-01-27 12:47:31 -08:00
Matt Friedman
996441a1da [ticket/14434] Remove redundant conditional 
PHPBB3-14434
 2016-01-27 12:24:18 -08:00
Matt Friedman
ae7aa5dc57 [ticket/14434] Fix whitespace mistakes 
PHPBB3-14434
 2016-01-27 11:48:24 -08:00
Matt Friedman
3bd8a2ba19 [ticket/14434] Remove recursion to simplify is_migration method 
PHPBB3-14434
 2016-01-27 11:46:04 -08:00
Matt Friedman
47d8aeebde [ticket/14434] Extract migration check to a reusable method 
PHPBB3-14434
 2016-01-27 10:50:22 -08:00