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

25179 commits

Author SHA1 Message Date
Tristan Darricau
dab282e664 [release-3.2.0-b1] Update version to 3.2.0-b2-dev 2016-02-05 17:12:39 +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
3e0aa1b3a4 [prep-release-3.2.0-b1] Add changelog for 3.2.0-b1 2016-02-05 15:56:28 +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
Marc Alexander
7e0878bedb [ticket/14452] Define $progressFillerText in installer.js 
PHPBB3-14452
 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
e2440bad17 Merge pull request #4163 from Nicofuma/ticket/14453 
[ticket/14453] Add missing dependency in the text_reparser migration

* Nicofuma/ticket/14453:
  [ticket/14453] Add missing dependency in the text_reparser migration
 2016-02-05 12:18:39 +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
Marc Alexander
7cdeb70bcf [ticket/14452] Define $progressFillerText in installer.js 
PHPBB3-14452
 2016-02-05 10:29:49 +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
Tristan Darricau
b50f4d266d [prep-release-3.2.0-b1] Update language help files 2016-02-03 22:33:03 +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
3aee46109b [prep-release-3.2.0-b1] Add schema.json 2016-02-03 21:43:32 +01:00
Tristan Darricau
f80ec7e786 [prep-release-3.2.0-b1] Update version to 3.2.0-b1 2016-02-03 21:41:22 +01:00
Marc Alexander
9ce4ceb9c1 [ticket/14448] Remove no longer needed guzzle 3.9.3 
PHPBB3-14448
 2016-02-03 16:55:03 +01:00
Marc Alexander
c83db45f55 [ticket/14448] Use GuzzleHttp and try to verify certs 
PHPBB3-14448
 2016-02-03 14:06:10 +01:00
Richard McGirr
b9df08e97f [ticket/14416] Revert changes and use twig spaceless 
PHPBB3-14416
 2016-02-03 06:29:21 -05:00
Marc Alexander
5ee559d524 [ticket/14448] Update composer.json and lock file for guzzlehttp 
PHPBB3-14448
 2016-02-03 11:30:44 +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
Marc Alexander
f2f9ce544f Merge pull request #4141 from exussum12/ticket/14431-3.1 
[ticket/14431] Remote avatar uploading
 2016-02-03 10:29:39 +01:00
Scott Dutton
366a92c36a [ticket/14430] Remote avatar uploading 
Remove support for redirects

PHPBB3-14431
 2016-02-03 05:33:45 +00: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
Martin Beckmann
a35314c6ea [ticket/14443] Avoid duplicate slashes 
PHPBB3-14443
 2016-02-02 20:30:57 +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
Matt Friedman
93a25893d5 [ticket/14447] Remove trailing white spaces in Prosilver 
PHPBB3-14447
 2016-02-02 08:42:53 -08:00
Marc Alexander
94f87d9318 [ticket/14446] Add predefined placeholder variables to twig definition 
PHPBB3-14446
 2016-02-02 17:13:47 +01:00
Mate Bartus
91f809dc3d [ticket/14262] Add error handling and small CS fixes 
PHPBB3-14262
 2016-02-02 16:09:40 +01:00
Tristan Darricau
60c9ee068e [ticket/14444] Fix fatal error in functions_messenger.php 
PHPBB3-14444
 2016-02-02 15:45:03 +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
Tristan Darricau
15e9367b5b Merge pull request #4152 from marc1706/ticket/14442 
[ticket/14442] Use Goutte 2.0 for functional tests

* marc1706/ticket/14442:
  [ticket/14442] Use get_content() in functional test case
  [ticket/14442] Properly set plupload header
  [ticket/14442] Use get_content() in plupload functional tests
  [ticket/14442] Use Goutte 2.0 instead of outdated 1.0
 2016-02-02 13:01: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
e4f562bdba [ticket/14442] Use Goutte 2.0 instead of outdated 1.0 
PHPBB3-14442
 2016-02-01 15:25:31 +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
Marc Alexander
63fd2159e0 Merge pull request #4149 from CHItA/ticket/14438 
[ticket/14438] Allign progressbar text to center
 2016-01-31 20:08:39 +01:00
Marc Alexander
0d93af8324 Merge branch '3.1.x' 2016-01-31 20:05:07 +01:00
rxu
68abcb9058 [ticket/14439] Do not call avatar manager if avatars are disabled 
PHPBB3-14439
 2016-01-31 23:45:24 +07:00
Mate Bartus
43cdb35b84 [ticket/14438] Allign progressbar text to center 
PHPBB3-14438
 2016-01-29 17:17:59 +01:00
Mate Bartus
a3f16c1f5f [ticket/14262] Remove converter template duplicate 
PHPBB3-14262
 2016-01-29 13:55:49 +01:00
Mate Bartus
6be1c6049d [ticket/14262] Fix stage navigation 
PHPBB3-14262
 2016-01-29 13:52:07 +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