1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-11 18:15:20 +02:00

27771 Commits

Author SHA1 Message Date
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
b50f4d266d [prep-release-3.2.0-b1] Update language help files 2016-02-03 22:33:03 +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
Tristan Darricau
03fba99074 Merge pull request 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 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 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
Tristan Darricau
154c7500ea Merge pull request from CHItA/ticket/14321
[ticket/14321] Clean up arcihve controller logic

* CHItA/ticket/14321:
  [ticket/14321] Clean up arcihve controller logic
2016-02-02 21:15:17 +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
Mate Bartus
91f809dc3d [ticket/14262] Add error handling and small CS fixes
PHPBB3-14262
2016-02-02 16:09:40 +01:00
Marc Alexander
b432f33b49 Merge pull request from Nicofuma/ticket/14444
[ticket/14444] Fix fatal error in functions_messenger.php
2016-02-02 15:52:43 +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 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 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
Oliver Schramm
b2b99e5da8 Merge pull request from marc1706/ticket/14436
[ticket/14436] Add dependency on oauth_states migration
2016-02-01 20:25:13 +01:00
Marc Alexander
fdb1622588 [ticket/14442] Use get_content() in functional test case
PHPBB3-14442
2016-02-01 19:34:58 +01:00
Marc Alexander
2353fe39c0 [ticket/14442] Properly set plupload header
PHPBB3-14442
2016-02-01 19:33:34 +01:00
Marc Alexander
105ffe8da3 [ticket/14442] Use get_content() in plupload functional tests
PHPBB3-14442
2016-02-01 17:00:56 +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 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 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
Marc Alexander
89a34ff033 Merge pull request from rxu/ticket/14439
[ticket/14439] Do not call avatar manager if avatars are disabled
2016-01-31 20:05:03 +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
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
Marc Alexander
3a4dae369d Merge branch '3.1.x' 2016-01-27 14:31:29 +01:00
Marc Alexander
3c4f150859 Merge pull request from RMcGirr83/ticket_14289
[ticket/14289] Add events to navbar header
2016-01-27 14:29:14 +01:00
Marc Alexander
b8b419704c Merge pull request from Nicofuma/ticket/14129
[ticket/14129] Caches extensions autoloaders
2016-01-27 10:44:47 +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
ad914a6880 Merge branch '3.1.x' 2016-01-26 08:57:36 +01:00
Marc Alexander
4250bfee29 Merge pull request from VSEphpbb/ticket/14433
[ticket/14433] Purge cache setting up extension functional tests
2016-01-26 08:57:33 +01:00
Matt Friedman
9940775550 [ticket/14433] Purge cache setting up extension functional tests
PHPBB3-14433
2016-01-25 17:49:50 -08:00
Tristan Darricau
56062a2635 Merge pull request from cunha17/ticket/14253
* cunha17-master:
  [ticket/14253] Show group requests pending aproval at the ACP groups summary
  [ticket/14253] Show group requests pending aproval at the ACP groups summary

fixes 
2016-01-25 13:15:52 +01:00
cunha17
57ce891d5f [ticket/14253] Show group requests pending aproval at the ACP groups summary
Currenty, you need to open each existing group in ACP to know if there
are pending group requests or not. Doing so is really boring and
annoying... :/
This patch displays the number of pending group requests at the ACP groups
summary page.

PHPBB3-14253
2016-01-25 13:13:05 +01:00
cunha17
3d03c834d0 [ticket/14253] Show group requests pending aproval at the ACP groups summary
Currenty, you need to open each existing group in ACP to know if there are
pending group requests or not. Doing so is really boring and annoying... :/
This patch displays the number of pending group requests at the ACP groups
summary page.

PHPBB3-14253
2016-01-25 13:13:05 +01:00