mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
27,805 Commits 17 Branches 190 Tags
Commit Graph

27805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mate Bartus
7c0fb563ec [ticket/14462] Fix CS and typo 
PHPBB3-14462
 2016-02-12 15:38:34 +01:00
Marc Alexander
90710ffe98 [ticket/14462] Set instance of db driver for database access using global 
PHPBB3-14462
 2016-02-12 14:31:30 +01:00
Mate Bartus
d63b5a1315 [ticket/14462] Fix installation in tests 
PHPBB3-14462
 2016-02-12 14:31:29 +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
0210a6298d Merge branch '3.1.x' 2016-02-09 16:57:29 +01:00
Marc Alexander
ad5d4f6bc3 Merge pull request #4174 from cyberalien/ticket/14467 
[ticket/14467] Fix height calculation in autoResize
 2016-02-09 16:57:25 +01:00
cyberalien
147f929713 [ticket/14467] Fix height calculation in autoResize 
PHPBB3-14467
 2016-02-08 16:47:04 +02: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
Tristan Darricau
39f5aaa526 Merge pull request #4167 from Mauron/ticket/14458 
fixes #4167

* 3.1.x:
  [ticket/14458] Explicitly state RewriteBase into .htaccess root file
 2016-02-07 14:56:09 +01:00
Tristan Darricau
663ee34f66 Merge pull request #4167 from Mauron/ticket/14458 
fixes #4167

* Mauron-ticket/14458:
  [ticket/14458] Explicitly state RewriteBase into .htaccess root file
 2016-02-07 14:54:36 +01:00
Mauron
a705405717 [ticket/14458] Explicitly state RewriteBase into .htaccess root file 
The statement RewriteBase / needs to be explicitly typed down into the .htaccess file in root in order to reduce all the support requests about the implicit statement and the URL rewriting not working.

PHPBB3-14458
 2016-02-07 14:46:45 +01:00
Marc Alexander
01b29b8464 Merge pull request #4170 from Elsensee/ticket/14461 
[ticket/14461] Correctly count up $processed_records
 2016-02-06 16:27:04 +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
df505d772d Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14356] Fix viewtopic_body_postrow_back2top_append description
 2016-02-05 20:36:57 +01:00
Tristan Darricau
8a2f564f3d Merge pull request #4164 from rxu/ticket/14356-fix 
[ticket/14356] Fix viewtopic_body_postrow_back2top_append description

* rxu/ticket/14356-fix:
  [ticket/14356] Fix viewtopic_body_postrow_back2top_append description
 2016-02-05 20:36:47 +01:00
rxu
408ba75321 [ticket/14356] Fix viewtopic_body_postrow_back2top_append description 
PHPBB3-14356
 2016-02-06 00:37:00 +07:00
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
6b19928463 Merge pull request #4162 from marc1706/ticket/14452 
[ticket/14452] Define $progressFillerText in installer.js

* marc1706/ticket/14452:
  [ticket/14452] Define $progressFillerText in installer.js
 2016-02-05 12:16:54 +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
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
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
Tristan Darricau
154c7500ea Merge pull request #4158 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 #4154 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 #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
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