mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-29 10:39:19 +02:00
Code Issues Releases Wiki Activity
28,819 Commits 18 Branches 192 Tags
Commit Graph

465 Commits

Author SHA1 Message Date
Marc Alexander
ecb81894cc
Merge remote-tracking branch 'nicofuma/ticket/14814' into 3.2.x 2016-11-05 21:35:06 +01:00
Tristan Darricau
d90afa67d8
[ticket/14814] Fix reparser cron 
PHPBB3-14814
 2016-11-02 19:38:33 +01:00
Tristan Darricau
b13910ee45
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14831] Optimize code construction
  [ticket/14831] Add more tests against UCP modules
  [ticket/14831] Add more tests, better name for $e placeholder
  [ticket/14831] Do not throw exception on the module existence checking
  [ticket/14831] Fix module migrator tool
 2016-10-24 22:24:26 +02:00
rxu
77f1bac64b [ticket/14831] Optimize code construction 
PHPBB3-14831
 2016-10-24 01:41:24 +07:00
rxu
51ef1ae346 [ticket/14831] Add more tests, better name for $e placeholder 
PHPBB3-14831
 2016-10-23 22:44:47 +07:00
rxu
a02b124dd0 [ticket/14831] Do not throw exception on the module existence checking 
PHPBB3-14831
 2016-10-23 21:58:29 +07:00
rxu
0cc0920734 [ticket/14831] Fix module migrator tool 
PHPBB3-14831
 2016-10-23 00:57:37 +07:00
Marc Alexander
84a8cf00ad
Merge branch '3.1.x' into 3.2.x 2016-10-12 21:43:35 +02:00
Marc Alexander
71e632b9f0
[prep-release-3.1.10] Add 3.1.10 migration 2016-10-02 21:07:18 +01:00
Marc Alexander
57fc321c4d
Merge branch '3.1.x' into 3.2.x 2016-10-01 11:07:43 +01:00
Jakub Senko
ec24f739e8 [ticket/8301] Add log_time index 
PHPBB3-8301
 2016-09-25 19:51:37 +02:00
Marc Alexander
164f0e031d
Merge branch '3.1.x' into 3.2.x 2016-09-24 21:45:17 +02:00
Marc Alexander
c958ba13e8
[prep-release-3.1.10] Add migration for 3.1.10-RC1 2016-09-24 14:50:46 +02:00
rxu
35c62d1e74 [ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+ 
PHPBB3-14793
 2016-09-22 22:29:18 +07:00
Marc Alexander
dff950162c Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/phpbb/db/migration/tool/module.php
 2016-08-31 21:41:17 +02:00
Marc Alexander
f008708d5c Merge pull request #4377 from rxu/ticket/14703 
[ticket/14703] Fix parent module selection for custom extension modules
 2016-08-31 21:39:09 +02:00
Oliver Schramm
88384a1e63 Merge branch 'ticket/14742' into ticket/14742-32x 
Conflicts:
	phpBB/phpbb/db/migrator.php
 2016-08-20 22:38:45 +02:00
Oliver Schramm
e050cf5c11 [ticket/14742] Fix comments in migrator 
PHPBB3-14742
 2016-08-20 03:35:38 +02:00
Oliver Schramm
4938887e5d Merge branch 'ticket/14742' into ticket/14742-32x 2016-08-11 01:20:59 +02:00
Oliver Schramm
8e1461ca61 [ticket/14742] Avoid loop while reverting data 
This combines reverted updata_data and revert_data into a single array.

PHPBB3-14742
 2016-08-11 01:09:11 +02:00
rxu
8e8e25cc1f [ticket/14703] Fix the docblock 
PHPBB3-14703
 2016-07-24 23:35:20 +07:00
rxu
5eb493fa86 [ticket/14703] Fix existance checking if multiple parent module_langname found 
PHPBB3-14703
 2016-07-24 21:22:37 +07:00
rxu
8cf2790d55 [ticket/14703] Add test for the case multiple parent module_langname found 
PHPBB3-14703
 2016-07-24 02:31:44 +07:00
rxu
eaafb758ce [ticket/14703] Select the parent module id from the several found 
PHPBB3-14703
 2016-07-23 21:34:05 +07:00
Andreas Fischer
c1cb59c237 Merge pull request #4349 from marc1706/ticket/14665 
[ticket/14665] Remove invalid syntax in report_id_auto_increment migration

* marc1706/ticket/14665:
  [ticket/14665] Remove invalid syntax in report_id_auto_increment migration
 2016-07-10 20:06:43 +02:00
rxu
652e3da28d [ticket/14703] Refine the parent module selection for custom extension modules 
PHPBB3-14703
 2016-07-10 21:47:04 +07:00
rxu
a3c10f575b [ticket/14703] Fix parent module selection for custom modules removal 
PHPBB3-14703
 2016-07-03 02:23:34 +07:00
rxu
2f53761eaf [ticket/14703] Fix parent module selection for custom extension modules 
PHPBB3-14703
 2016-07-03 01:31:42 +07:00
Tristan Darricau
7cbb049572
[prep-release-3.2.0-RC1] Add migration 2016-06-19 17:51:51 +02:00
Marc Alexander
a90d8fa8d4 [ticket/14665] Remove invalid syntax in report_id_auto_increment migration 
PHPBB3-14665
 2016-06-08 08:38:55 +02:00
Marc Alexander
6eda942a7f [ticket/14607] Add missing auto_increment to report_id 
PHPBB3-14607
 2016-05-01 17:29:10 +02:00
Tristan Darricau
829a8ac15a
Merge branch 'prep-release-3.2.0-b2' into 3.2.x 
* prep-release-3.2.0-b2:
  [prep-release-3.2.0-b2] Add schema.json
  [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2
  [prep-release-3.2.0-b2] Add migration for 3.2.0-b2
  [prep-release-3.2.0-b2] Update version to 3.2.0-b2
 2016-04-28 21:58:16 +02:00
Joas Schilling
29bb1ab72d Merge branch '3.1.x' into 3.2.x 2016-04-16 12:50:31 +02:00
Joas Schilling
1b01667c7b [prep-release-3.1.9] Add migration for 3.1.9 2016-04-16 12:16:23 +02:00
Joas Schilling
d89b75bd36 Merge branch '3.1.x' into 3.2.x 2016-04-09 19:53:39 +02:00
Joas Schilling
5ee6c216e5 [prep-release-3.1.9] Add migration for 3.1.9-RC1 2016-04-09 08:13:31 +02:00
Marc Alexander
c9ffef2c57 Merge branch '3.1.x' into 3.2.x 2016-03-31 12:30:14 +02:00
Matt Friedman
39de59e65f [ticket/14570] Use phpbb_version_compare 
PHPBB3-14570
 2016-03-29 10:01:03 -07:00
Matt Friedman
b8dd3ef43a [ticket/14570] Add effectively installed to 3.1.x versions 
PHPBB3-14570
 2016-03-29 09:54:22 -07:00
Jakub Senko
933938a1d8 [ticket/14318] Fix SQL error in Notifications Board migration 
PHPBB3-14318
 2016-03-18 11:04:01 +01:00
Marc Alexander
c00e45d30e Merge branch '3.1.x' into 3.2.x 2016-03-07 09:52:30 +01:00
Oliver Schramm
b77856a903 [ticket/14514] Don't skip users when converting passwords 
PHPBB3-14514
 2016-03-06 16:11:29 +01:00
Tristan Darricau
517c1f8825 [prep-release-3.2.0-b2] Add migration for 3.2.0-b2 2016-03-03 22:53:53 +01:00
Joas Schilling
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
Joas Schilling
9745d8d80e Add migration for 3.1.8 2016-02-18 18:04:47 +01:00
Joas Schilling
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
Joas Schilling
a1a84c9930 [prep-release-3.1.8] Add migration for 3.1.8-RC1 2016-02-13 14:55:24 +01:00
Tristan Darricau
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
Oliver Schramm
da08a6e3cb [ticket/14461] Correctly count up $processed_records 
PHPBB3-14461
 2016-02-06 14:45:20 +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