1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 12:46:38 +02:00
Commit Graph

2881 Commits

Author SHA1 Message Date
0ca4484525 [ticket/12684] Move all lang keys to cli
PHPBB3-12684
2016-02-29 21:03:32 -08:00
e905c6226d [ticket/12684] Fix a few mistakes and clean it up
PHPBB3-12684
2016-02-29 16:52:17 -08:00
97c6cce687 [ticket/12684] Some code clean up
PHPBB3-12684
2016-02-29 14:50:19 -08:00
a84f77bf25 [ticket/12684] Another little fix
PHPBB3-12684
2016-02-29 14:28:02 -08:00
fe31060fca [ticket/12684] Fix tests
PHPBB3-12684
2016-02-29 14:23:32 -08:00
637b02690d [ticket/12684] Update to use non-deprecated methods
PHPBB3-12684
2016-02-29 13:28:42 -08:00
f32b4c0547 [ticket/12684] Add send email option
PHPBB3-12684
2016-02-29 11:42:23 -08:00
d373428180 [ticket/12684] Add input validation
PHPBB3-12684
2016-02-29 11:41:47 -08:00
6fe084a2fd [ticket/12684] Updates for 3.2 API
PHPBB3-12684
2016-02-29 11:41:07 -08:00
8f7aba6582 [ticket/12684] Fix header file
PHPBB3-12684
2016-02-29 08:14:29 -08:00
df4a620ba1 [ticket/12684] Fix tests
PHPBB3-12684
2016-02-29 08:14:29 -08:00
50761104ba [ticket/12684] Add doc blocks and test file for user:add
PHPBB3-12684
2016-02-29 08:13:42 -08:00
0102fa3f2d [ticket/12684] Add command user:add
PHPBB3-12684
2016-02-29 08:13:42 -08:00
b490be1f81 Merge branch '3.1.x' into 3.2.x 2016-02-28 10:15:47 +01:00
a4040e53b7 Merge pull request #4153 from gn36/ticket/14443
[ticket/14443] Introduce additional parameter to messenger
2016-02-28 10:15:41 +01:00
632418ad6e [ticket/14489] Fix bug where extension custom compiler pass cannot be found.
This is returning an extra / on my machine which throws off the next code block, and then the class can't be found.

PHPBB3-14489
2016-02-18 23:56:53 -05:00
b7deef46ac Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13681] Invalidate and reset opcache where necessary
2016-02-18 22:00:10 +01:00
6e4ab6509b Merge pull request #4185 from marc1706/ticket/13681
[ticket/13681] Invalidate and reset opcache where necessary

* marc1706/ticket/13681:
  [ticket/13681] Invalidate and reset opcache where necessary
2016-02-18 21:55:11 +01:00
f6fd819764 Merge pull request #4165 from Nicofuma/ticket/14457
[ticket/14457] Uses a random placeholder to inject css and js
2016-02-18 21:52:48 +01:00
bd12427fd4 [ticket/13681] Invalidate and reset opcache where necessary
PHPBB3-13681
2016-02-18 19:03:56 +01:00
ab6e0bbef9 Merge branch '3.1.x' into 3.2.x
Conflicts:
	build/build.xml
	phpBB/composer.lock
2016-02-18 18:42:39 +01:00
9745d8d80e Add migration for 3.1.8 2016-02-18 18:04:47 +01:00
97bbf2d2b8 [ticket/14457] Handle the case where there isn't any 'definition' bag
PHPBB3-14457
2016-02-18 17:30:31 +01:00
99ace63e62 [ticket/14457] Don't set CSS to JS and JS to CSS
PHPBB3-14457
2016-02-18 17:30:31 +01:00
f7c5098c60 [ticket/14457] CS
PHPBB3-14457
2016-02-18 17:30:31 +01:00
f253a853b8 [ticket/14457] Fix twig/twig::assign_display
PHPBB3-14457
2016-02-18 17:30:31 +01:00
d34ffda9c1 [ticket/14457] Uses a random placeholder to inject css and js
PHPBB3-14457
2016-02-18 17:30:31 +01:00
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
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
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
1bd4895d7a [ticket/14409] Update session page info before displaying online list
PHPBB3-14409
2016-02-13 15:58:05 +01:00
a1a84c9930 [prep-release-3.1.8] Add migration for 3.1.8-RC1 2016-02-13 14:55:24 +01:00
2efceffaeb [ticket/14462] Fix comments
PHPBB3-14462
2016-02-12 23:30:32 +01:00
7c0fb563ec [ticket/14462] Fix CS and typo
PHPBB3-14462
2016-02-12 15:38:34 +01:00
68091561ab [ticket/14462] Refactor tasks to be more modular
PHPBB3-14462
2016-02-12 14:31:28 +01:00
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
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
5557760ecc [ticket/14440] Add comments
PHPBB3-14440
2016-02-11 22:18:09 +01:00
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
8cf086ef9b [ticket/14448] Correctly pass verify setting if available
PHPBB3-14448
2016-02-08 13:26:19 +01:00
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
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
da08a6e3cb [ticket/14461] Correctly count up $processed_records
PHPBB3-14461
2016-02-06 14:45:20 +01:00
37705353c5 [ticket/14460] Use the selected language with AJAX requests as well
PHPBB3-14460
2016-02-06 14:14:26 +01:00
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
b40f9ce6e1 [ticket/14453] Add missing dependency in the text_reparser migration
PHPBB3-14453
2016-02-05 15:56:28 +01:00
379634a102 [prep-release-3.2.0-b1] Add migration for 3.2.0-b1 2016-02-05 15:56:28 +01:00
3846b6a6e3 [ticket/14453] Add missing dependency in the text_reparser migration
PHPBB3-14453
2016-02-05 12:16:34 +01:00
ad7b3ed178 [ticket/14312] Allow updating without having the update directory
PHPBB3-14312
2016-02-04 22:01:38 +01:00
2f6f9a05eb [ticket/14312] Push migration error messages to the user
PHPBB3-14312
2016-02-04 21:20:02 +01:00