mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 03:54:56 +02:00
Code Issues Releases Wiki Activity
31,618 Commits 18 Branches 192 Tags
Commit Graph

83 Commits

Author SHA1 Message Date
Marc Alexander
3ae0169542
Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into prep-release-3.2.2 2018-01-07 10:48:43 +01:00
Marc Alexander
5def7e255e
[prep-release-3.1.12] Add migration for 3.1.12 2017-12-31 16:39:02 +01:00
Marc Alexander
c56ebb5312
Merge branch 'prep-release-3.1.11' into prep-release-3.2.1 2017-07-16 18:24:47 +02:00
Marc Alexander
6f897568da
Merge pull request #30 from phpbb/ticket/security-181-rhea 
[ticket/security-181] Harden protection of migrations files and other directories
 2017-07-16 15:08:40 +02:00
Marc Alexander
1493752536
[prep-release-3.1.11] Add migration for 3.1.11 2017-07-16 12:18:50 +02:00
Marc Alexander
c99820eb6b
Merge pull request #29 from phpbb/ticket/security-181 
[ticket/security-181] Harden protection of migrations files and other directories
 2017-07-16 10:59:48 +02:00
Marc Alexander
35b7a4fae5
Merge branch 'prep-release-3.1.11' into prep-release-3.2.1 2017-06-25 21:53:12 +02:00
Marc Alexander
65f7137825
[prep-release-3.1.11] Add migration for update to 3.1.11-RC1 2017-06-25 17:45:07 +02:00
Tristan Darricau
1571c76ccd
Merge pull request #4826 from marc1706/ticket/15219-rhea 
[ticket/15219] Update hashes to bcrypt with cron -- Rhea

* github.com:phpbb/phpbb:
  [ticket/15219] Add console command for updating hashes to bcrypt
  [ticket/15219] Add missing space
  [ticket/15219] Update hashes to bcrypt with cron
 2017-06-06 09:33:22 +02:00
Tristan Darricau
2a49420124
Merge pull request #4825 from marc1706/ticket/15219 
[ticket/15219] Update hashes to bcrypt with cron

* github.com:phpbb/phpbb:
  [ticket/15219] Add console command for updating hashes to bcrypt
  [ticket/15219] Add missing space
  [ticket/15219] Update hashes to bcrypt with cron
 2017-06-06 09:32:45 +02:00
Marc Alexander
346c784bf3
Merge branch '3.1.x' into 3.2.x 2017-06-05 11:02:30 +02:00
Marc Alexander
a6939fcb8e
Merge pull request #4784 from rubencm/ticket/15150 
[ticket/15150] Add Jabber SSL context configuration options
 2017-06-05 11:00:38 +02:00
Tristan Darricau
60d1e49e43
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/15226] Add index for latest topics to topics table
 2017-05-12 17:27:01 +02:00
Marc Alexander
18b29ca074
[ticket/15226] Add index for latest topics to topics table 
PHPBB3-15226
 2017-05-11 18:30:51 +02:00
Marc Alexander
710a943b00
Merge branch 'ticket/15219' into ticket/15219-rhea 2017-05-05 21:08:13 -04:00
Marc Alexander
18fe3b2833
[ticket/15219] Update hashes to bcrypt with cron 
PHPBB3-15219
 2017-05-05 20:52:21 -04:00
Rubén Calvo
32f3ddca70 [ticket/15150] Add Jabber SSL context configuration options 
PHPBB3-15150
 2017-03-30 10:04:50 +02:00
Tristan Darricau
552da2e805
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/13558] Change options prefix and add settings precautions.
  [ticket/13558] Make SSL context specific options more SMTP general
  [ticket/13558] Add smtp SSL context configuration options
 2017-03-19 18:07:14 +01:00
rxu
22b8632426 [ticket/13558] Change options prefix and add settings precautions. 
PHPBB3-13558
 2017-03-19 14:32:53 +07:00
rxu
ac87784a11 [ticket/13558] Add smtp SSL context configuration options 
PHPBB3-13558
 2017-03-17 01:21:57 +07:00
Marc Alexander
7d3300f99d
Merge branch '3.1.x' into 3.2.x 2016-12-18 21:10:25 +01:00
Jakub Senko
7e2d544016
[ticket/14874] Increase size of emotion 
PHPBB3-14874
 2016-12-12 19:44:41 +01:00
Tristan Darricau
edaa36205f
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14831] Rename migration and replace preg_replace() with simpler methods
  [ticket/14831] Compare depends_on for migrations and remove prefixless names
  [ticket/14831] Add migration for deduplicating entries and fix typo
  [ticket/14831] Add method for getting valid migration name
  [ticket/14831] Fall back to possible migration names instead of adding prefix
  [ticket/14831] Make sure migrations always start with backslash
 2016-11-14 21:22:14 +01:00
Marc Alexander
a2953cb10c
Merge branch 'ticket/security-181' into ticket/security-181-rhea 2016-11-13 12:29:28 +01:00
Marc Alexander
61683f895c
[ticket/security-181] Deny access to migrations folders 
SECURITY-181
 2016-11-13 11:43:17 +01:00
Marc Alexander
ffc6623dd4
[ticket/14831] Rename migration and replace preg_replace() with simpler methods 
PHPBB3-14831
 2016-10-25 20:25:57 +02:00
Marc Alexander
6f8c0df1c6
[ticket/14831] Compare depends_on for migrations and remove prefixless names 
PHPBB3-14831
 2016-10-23 22:17:19 +02:00
Marc Alexander
c891277996
[ticket/14831] Add migration for deduplicating entries and fix typo 
PHPBB3-14831
 2016-10-23 22:00:02 +02: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
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
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
Joas Schilling
7f7b09fdeb Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/acp/acp_bbcodes.php
 2016-01-09 18:45:32 +01:00
Joas Schilling
fd5e66cbf1 Merge branch 'prep-release-3.1.7' into 3.1.x 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2016-01-09 18:42:07 +01:00
Tristan Darricau
b2324607ad Merge pull request #4058 from marc1706/ticket/13454 
[ticket/13454] Remove unused variables, globals, and parameters

* marc1706/ticket/13454:
  [ticket/13454] Add excessively removed code back
  [ticket/13454] Remove more unused variables
  [ticket/13454] Remove double semi-colons
  [ticket/13454] Remove unused variables
  [ticket/13454] Fix code sniffer complaints
  [ticket/13454] Fix a few issues introduced by overdeleting stuff
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
 2016-01-09 17:53:04 +01:00
Joas Schilling
29a239a4db [prep-release-3.1.7] Add migration for 3.1.7-pl1 2016-01-09 09:35:53 +01:00
Marc Alexander
9fe8d05d5b [ticket/14396] Use VCHAR_UNI and correct depends_on() version 
PHPBB3-14396
 2016-01-08 16:55:40 +01:00