Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into ↵ | Marc Alexander | 2018-01-07 | 1 | -0/+36 |
|\ | | | | | | | prep-release-3.2.2 | ||||
| * | [prep-release-3.1.12] Add migration for 3.1.12 | Marc Alexander | 2017-12-31 | 1 | -0/+36 |
| | | |||||
* | | Merge branch 'prep-release-3.1.11' into prep-release-3.2.1 | Marc Alexander | 2017-07-16 | 1 | -0/+36 |
|\ \ | |/ | |||||
| * | [prep-release-3.1.11] Add migration for 3.1.11 | Marc Alexander | 2017-07-16 | 1 | -0/+36 |
| | | |||||
| * | Merge pull request #29 from phpbb/ticket/security-181 | Marc Alexander | 2017-07-16 | 1 | -0/+33 |
| |\ | | | | | | | | | | [ticket/security-181] Harden protection of migrations files and other directories | ||||
* | \ | Merge pull request #30 from phpbb/ticket/security-181-rhea | Marc Alexander | 2017-07-16 | 1 | -0/+33 |
|\ \ \ | | | | | | | | | | | | | [ticket/security-181] Harden protection of migrations files and other directories | ||||
| * \ \ | Merge branch 'ticket/security-181' into ticket/security-181-rhea | Marc Alexander | 2016-11-13 | 1 | -0/+33 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | [ticket/security-181] Deny access to migrations folders | Marc Alexander | 2016-11-13 | 1 | -0/+33 |
| | | | | | | | | | | | | | | | | SECURITY-181 | ||||
* | | | | Merge branch 'prep-release-3.1.11' into prep-release-3.2.1 | Marc Alexander | 2017-06-25 | 1 | -0/+43 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | [prep-release-3.1.11] Add migration for update to 3.1.11-RC1 | Marc Alexander | 2017-06-25 | 1 | -0/+43 |
| | | | | |||||
| * | | | Merge pull request #4825 from marc1706/ticket/15219 | Tristan Darricau | 2017-06-06 | 1 | -0/+33 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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 | ||||
* | \ \ \ | Merge pull request #4826 from marc1706/ticket/15219-rhea | Tristan Darricau | 2017-06-06 | 1 | -0/+33 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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 | ||||
| * \ \ \ \ | Merge branch 'ticket/15219' into ticket/15219-rhea | Marc Alexander | 2017-05-05 | 1 | -0/+33 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | [ticket/15219] Update hashes to bcrypt with cron | Marc Alexander | 2017-05-05 | 1 | -0/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15219 | ||||
* | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-06-05 | 1 | -0/+32 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge pull request #4784 from rubencm/ticket/15150 | Marc Alexander | 2017-06-05 | 1 | -0/+32 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/15150] Add Jabber SSL context configuration options | ||||
| | * | | | | | [ticket/15150] Add Jabber SSL context configuration options | Rubén Calvo | 2017-03-30 | 1 | -0/+32 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | PHPBB3-15150 | ||||
* | | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2017-05-12 | 1 | -0/+51 |
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | * 3.1.x: [ticket/15226] Add index for latest topics to topics table | ||||
| * | | | | [ticket/15226] Add index for latest topics to topics table | Marc Alexander | 2017-05-11 | 1 | -0/+51 |
| |/ / / | | | | | | | | | | | | | PHPBB3-15226 | ||||
* | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2017-03-19 | 1 | -0/+32 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | | [ticket/13558] Change options prefix and add settings precautions. | rxu | 2017-03-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | PHPBB3-13558 | ||||
| * | | | [ticket/13558] Add smtp SSL context configuration options | rxu | 2017-03-17 | 1 | -0/+32 |
| | | | | | | | | | | | | | | | | PHPBB3-13558 | ||||
* | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-12-18 | 1 | -0/+46 |
|\ \ \ \ | |/ / / | |||||
| * | | | [ticket/14874] Increase size of emotion | Jakub Senko | 2016-12-12 | 1 | -0/+46 |
| | | | | | | | | | | | | | | | | PHPBB3-14874 | ||||
* | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-11-14 | 1 | -0/+77 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | [ticket/14831] Rename migration and replace preg_replace() with simpler methods | Marc Alexander | 2016-10-25 | 1 | -4/+3 |
| | | | | | | | | | | | | PHPBB3-14831 | ||||
| * | | [ticket/14831] Compare depends_on for migrations and remove prefixless names | Marc Alexander | 2016-10-23 | 1 | -4/+4 |
| | | | | | | | | | | | | PHPBB3-14831 | ||||
| * | | [ticket/14831] Add migration for deduplicating entries and fix typo | Marc Alexander | 2016-10-23 | 1 | -0/+78 |
| |/ | | | | | | | PHPBB3-14831 | ||||
* | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-10-12 | 1 | -0/+36 |
|\ \ | |/ | |||||
| * | [prep-release-3.1.10] Add 3.1.10 migration | Marc Alexander | 2016-10-02 | 1 | -0/+36 |
| | | |||||
* | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-10-01 | 1 | -0/+46 |
|\ \ | |/ | |||||
| * | [ticket/8301] Add log_time index | Jakub Senko | 2016-09-25 | 1 | -0/+46 |
| | | | | | | | | PHPBB3-8301 | ||||
* | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-09-24 | 1 | -0/+36 |
|\ \ | |/ | |||||
| * | [prep-release-3.1.10] Add migration for 3.1.10-RC1 | Marc Alexander | 2016-09-24 | 1 | -0/+36 |
| | | |||||
* | | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-04-16 | 1 | -0/+36 |
|\ \ | |/ | |||||
| * | [prep-release-3.1.9] Add migration for 3.1.9 | Joas Schilling | 2016-04-16 | 1 | -0/+36 |
| | | |||||
* | | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-04-09 | 1 | -0/+36 |
|\ \ | |/ | |||||
| * | [prep-release-3.1.9] Add migration for 3.1.9-RC1 | Joas Schilling | 2016-04-09 | 1 | -0/+36 |
| | | |||||
* | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-03-31 | 18 | -0/+90 |
|\ \ | |/ | |||||
| * | [ticket/14570] Use phpbb_version_compare | Matt Friedman | 2016-03-29 | 18 | -18/+18 |
| | | | | | | | | PHPBB3-14570 | ||||
| * | [ticket/14570] Add effectively installed to 3.1.x versions | Matt Friedman | 2016-03-29 | 18 | -0/+90 |
| | | | | | | | | PHPBB3-14570 | ||||
* | | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-02-18 | 1 | -0/+31 |
|\ \ | |/ | | | | | | | | | Conflicts: build/build.xml phpBB/composer.lock | ||||
| * | Add migration for 3.1.8 | Joas Schilling | 2016-02-18 | 1 | -0/+31 |
| | | |||||
* | | Merge branch '3.1.x' into 3.2.x | Joas Schilling | 2016-02-13 | 1 | -0/+32 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | [prep-release-3.1.8] Add migration for 3.1.8-RC1 | Joas Schilling | 2016-02-13 | 1 | -0/+32 |
| | | |||||
* | | Merge branch '3.1.x' | Joas Schilling | 2016-01-09 | 1 | -0/+31 |
|\ \ | |/ | | | | | | | | | | | Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/includes/acp/acp_bbcodes.php | ||||
| * | Merge branch 'prep-release-3.1.7' into 3.1.x | Joas Schilling | 2016-01-09 | 1 | -0/+31 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql | ||||
| | * | [prep-release-3.1.7] Add migration for 3.1.7-pl1 | Joas Schilling | 2016-01-09 | 1 | -0/+31 |
| | | | |||||
* | | | Merge pull request #4058 from marc1706/ticket/13454 | Tristan Darricau | 2016-01-09 | 1 | -1/+0 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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 | ||||
| * | | [ticket/13454] Remove unused variables | Marc Alexander | 2016-01-06 | 1 | -1/+0 |
| |/ | | | | | | | | | | | This is the first part of the changes. More to come. PHPBB3-13454 |