makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-24 20:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
30616 commits 18 branches 192 tags 207 MiB
Commit graph

3740 commits

Author SHA1 Message Date
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
Marc Alexander
daa92f7996 [ticket/14436] Add dependency on oauth_states migration 
PHPBB3-14436
 2016-01-27 16:51:34 +01:00
Tristan Darricau
f5ca8c363b [ticket/14432] Adds a method to get raw language values 
PHPBB3-14432
 2016-01-26 23:45:51 +01:00
Tristan Darricau
cc38bf550b [ticket/14129] Caches extensions autoloaders 
PHPBB3-14129
 2016-01-26 22:13:26 +01:00
Matt Friedman
7d2a58e271 [ticket/14434] Schema generator should ignore migration helpers 
PHPBB3-14434
 2016-01-26 11:45:06 -08:00
Marc Alexander
8e8051f41d Merge pull request #4131 from Nicofuma/ticket/13717 
[ticket/13717] Set the assets after rendering the whole template
 2016-01-25 10:31:23 +01:00
Tristan Darricau
b7db2717b2 Merge pull request #4126 from marc1706/ticket/13733 
[ticket/13733] Allow non-migration files inside migrations folder

* marc1706/ticket/13733:
  [ticket/13733] Remove validate_classes method argument
  [ticket/13733] Make sure migration classes always have same order in tests
  [ticket/13733] Properly test setting validate_classes to false/true
  [ticket/13733] Use interface for migratinos
  [ticket/13733] Update comment explaining migration class validation
  [ticket/13733] Add isInstantiable() check.
  [ticket/13733] Braces on their own lines
  [ticket/13733] Allow tests the skip class validation
  [ticket/13733] Properly handle nonexistent classes as well
  [ticket/13733] Handle nonexistent classes as well
  [ticket/13733] Only use migration classes that extension the base migration class.
 2016-01-25 09:08:23 +01:00
Tristan Darricau
e91b1fa464 [ticket/13717] Fix tests 
PHPBB3-13717
 2016-01-25 00:31:45 +01:00
Tristan Darricau
52b3d54805 [ticket/13717] Set the assets after rendering the whole template 
The goal being to be able to call INCLUDECSS/JS from anywhere in any tempalte or event

PHPBB3-13717
 2016-01-25 00:31:45 +01:00
Marc Alexander
fac4672f3f [ticket/13733] Remove validate_classes method argument 
PHPBB3-13733
 2016-01-24 22:39:37 +01:00
Tristan Darricau
77d033f99e Merge pull request #4116 from marc1706/ticket/14402 
[ticket/14402] Tidy plupload cron should not rely on user id/ip being available

* marc1706/ticket/14402:
  [ticket/14402] Directly pass user id and ip
  [ticket/14402] Get rid of globals in tidy_plupload cron
  [ticket/14402] Do not expect user id and ip to be available in cron
 2016-01-18 23:46:22 +01:00
Tristan Darricau
39c9baa574 Merge pull request #4121 from marc1706/ticket/11875 
[ticket/11875] Use 4-byte integer instead of 3-byte integer for ID columns

* marc1706/ticket/11875:
  [ticket/11875] Add back new line
  [ticket/11875] Change more columns to use UINT and add missings ones
  [ticket/11875] Add migration file
  [ticket/11875] Recreate schemas for install
  [ticket/11875] Create new map for UNSIGNED 4-byte integer
  [ticket/11875] Upgrade default data type from MEDIUMINT to INT
 2016-01-18 23:29:41 +01:00
Marc Alexander
e954b0b82b [ticket/13733] Use interface for migratinos 
PHPBB3-13733
 2016-01-18 14:54:54 +01:00
Marc Alexander
a30ecb81f8 Merge branch '3.1.x' 2016-01-17 23:28:33 +01:00
Marc Alexander
0c34641abd Merge pull request #3718 from javiexin/ticket/13908 
[ticket/13908] "After" clause in migration not working
 2016-01-17 23:28:29 +01:00
Marc Alexander
b908524853 [ticket/13733] Update comment explaining migration class validation 
PHPBB3-13733
 2016-01-15 18:34:12 +01:00
Marc Alexander
0178c27092 Merge pull request #3626 from imkingdavid/ticket/13733 
[ticket/13733] Allow non-migration files inside migrations folder
 2016-01-15 18:31:27 +01:00
Marc Alexander
8e584dfa6b Merge pull request #4077 from Nicofuma/ticket/14306 
[ticket/14306] Automatically enable a safe mode when container building fails
 2016-01-15 18:13:34 +01:00
Marc Alexander
6710ea3947 [ticket/14402] Directly pass user id and ip 
PHPBB3-14402
 2016-01-15 11:22:13 +01:00
Marc Alexander
3a555d94af [ticket/14402] Get rid of globals in tidy_plupload cron 
PHPBB3-14402
 2016-01-15 11:21:08 +01:00