Commit graph

21733 commits

Author SHA1 Message Date
Joas Schilling
a84bb5f6a1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0-b4] Update phpBB Version for b5 development
  [prep-release-3.1.0-b4] Add changelog for 3.1.0-b4
  [prep-release-3.1.0-b4] Prepare Changelog
  [prep-release-3.1.0-b4] Add migration for 3.1.0-b4
  [prep-release-3.1.0-b4] Update version to 3.1.0-b4
2014-05-30 17:53:16 +02:00
Joas Schilling
807e000b91 Merge branch 'prep-release-3.1.0-b4' into develop-ascraeus
* prep-release-3.1.0-b4:
  [prep-release-3.1.0-b4] Update phpBB Version for b5 development
  [prep-release-3.1.0-b4] Add changelog for 3.1.0-b4
  [prep-release-3.1.0-b4] Prepare Changelog
  [prep-release-3.1.0-b4] Add migration for 3.1.0-b4
  [prep-release-3.1.0-b4] Update version to 3.1.0-b4
2014-05-30 17:53:03 +02:00
Joas Schilling
da48b7df22 [prep-release-3.1.0-b4] Update phpBB Version for b5 development 2014-05-30 17:52:38 +02:00
Joas Schilling
f9c6297a09 [prep-release-3.1.0-b4] Add changelog for 3.1.0-b4 2014-05-30 16:33:19 +02:00
Joas Schilling
814b077864 [prep-release-3.1.0-b4] Prepare Changelog 2014-05-30 16:32:30 +02:00
Joas Schilling
0cfc0413ca [prep-release-3.1.0-b4] Add migration for 3.1.0-b4 2014-05-30 16:27:42 +02:00
Joas Schilling
b6135d3d02 [prep-release-3.1.0-b4] Update version to 3.1.0-b4 2014-05-30 16:23:44 +02:00
Joas Schilling
300d68ff53 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12621] schema.json is not up to date with migration files
2014-05-30 16:11:49 +02:00
Joas Schilling
fda2a774b7 Merge pull request #2522 from PayBas/ticket/12621
[ticket/12621] schema.json is not up to date with migration files

* PayBas/ticket/12621:
  [ticket/12621] schema.json is not up to date with migration files
2014-05-30 16:11:18 +02:00
PayBas
5c37d28096 [ticket/12621] schema.json is not up to date with migration files
PHPBB3-12621
2014-05-30 16:07:23 +02:00
Andreas Fischer
993167fee0 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12594] Update file header in non-php files
  [ticket/12594] Fix file headers of new files
2014-05-30 15:40:38 +02:00
Andreas Fischer
89d296a1db Merge pull request #2520 from nickvergessen/ticket/12594
[ticket/12594] Fix file headers of new files

* nickvergessen/ticket/12594:
  [ticket/12594] Update file header in non-php files
  [ticket/12594] Fix file headers of new files
2014-05-30 15:40:37 +02:00
Joas Schilling
9f568959a9 [ticket/12594] Update file header in non-php files
PHPBB3-12594
2014-05-30 15:31:15 +02:00
Joas Schilling
634824e888 [ticket/12594] Fix file headers of new files
PHPBB3-12594
2014-05-30 15:29:10 +02:00
Andreas Fischer
c00bb27219 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12614] Make the post buttons always visible.
2014-05-29 23:21:19 +02:00
Andreas Fischer
59e968cd7d Merge pull request #2513 from prototech/ticket/12614
[ticket/12614] Make the post buttons always visible.

* prototech/ticket/12614:
  [ticket/12614] Make the post buttons always visible.
2014-05-29 23:21:19 +02:00
Cesar G
5310838163 [ticket/12614] Make the post buttons always visible.
PHPBB3-12614
2014-05-29 08:45:22 -07:00
Andreas Fischer
e9d33fd02e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12604] Fix wrong padding when no notifications
2014-05-29 15:42:30 +02:00
Andreas Fischer
f0dcc271ac Merge pull request #2506 from brunoais/ticket/12604
[ticket/12604] Fix wrong padding when no notifications

* brunoais/ticket/12604:
  [ticket/12604] Fix wrong padding when no notifications
2014-05-29 15:42:30 +02:00
Andreas Fischer
4533b4a738 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12611] Remove phpBB Group copyright notice from .gifs
2014-05-29 00:29:44 +02:00
Andreas Fischer
624c0e4ef6 Merge pull request #2511 from Marshalrusty/ticket/12611
[ticket/12611] Remove phpBB Group copyright notice from .gifs

* Marshalrusty/ticket/12611:
  [ticket/12611] Remove phpBB Group copyright notice from .gifs
2014-05-29 00:29:44 +02:00
Joas Schilling
3ea17f1d14 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11226] Explicity set file_moved to false
  [ticket/11226] Add tests
  [ticket/11226] Use $user->lang()
  [ticket/11226] filespec::move_file() should error correctly
2014-05-29 00:15:32 +02:00
Joas Schilling
cae8448fe4 Merge pull request #2432 from Nicofuma/ticket/11226
[ticket/11226] filespec::move_file() should error correctly

* Nicofuma/ticket/11226:
  [ticket/11226] Explicity set file_moved to false
  [ticket/11226] Add tests
  [ticket/11226] Use $user->lang()
  [ticket/11226] filespec::move_file() should error correctly
2014-05-29 00:15:10 +02:00
Joas Schilling
953ca27728 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (29 commits)
  [ticket/11366] Fix headings css in list page
  [ticket/11366] Add config value in schema_data.sql
  [ticket/11366] Fix HTML
  [ticket/11366] Exchange links and settings' form
  [ticket/11366] Remove the extra {S_FORM_TOKEN}
  [ticket/11366] Move the links to the top of the page
  [ticket/11366] Hide the version check settings by default
  [ticket/11366] Versions, options and actions heading should be centered
  [ticket/11366] Better language string for "recheck all"
  [ticket/11366] Move "recheck all" link
  [ticket/11366] Add $config['extension_force_unstable']
  [ticket/11366] Use force_cache on the list page
  [ticket/11366] Add recheck-all link
  [ticket/11366] Force the use of the cache on the list page
  [ticket/11366] Update FILE_NOT_FOUND language string
  [ticket/11366] Fix whitespaces
  [ticket/11366] Update FILE_NOT_FOUND language string
  [ticket/11366] Update var names
  [ticket/11366] Align language strings
  [ticket/11366] Fix detailed view
  ...
2014-05-28 23:46:15 +02:00
Joas Schilling
305be2ae64 Merge pull request #2309 from Nicofuma/ticket/11366
[ticket/11366] Extension's version's check

* Nicofuma/ticket/11366: (29 commits)
  [ticket/11366] Fix headings css in list page
  [ticket/11366] Add config value in schema_data.sql
  [ticket/11366] Fix HTML
  [ticket/11366] Exchange links and settings' form
  [ticket/11366] Remove the extra {S_FORM_TOKEN}
  [ticket/11366] Move the links to the top of the page
  [ticket/11366] Hide the version check settings by default
  [ticket/11366] Versions, options and actions heading should be centered
  [ticket/11366] Better language string for "recheck all"
  [ticket/11366] Move "recheck all" link
  [ticket/11366] Add $config['extension_force_unstable']
  [ticket/11366] Use force_cache on the list page
  [ticket/11366] Add recheck-all link
  [ticket/11366] Force the use of the cache on the list page
  [ticket/11366] Update FILE_NOT_FOUND language string
  [ticket/11366] Fix whitespaces
  [ticket/11366] Update FILE_NOT_FOUND language string
  [ticket/11366] Update var names
  [ticket/11366] Align language strings
  [ticket/11366] Fix detailed view
  ...
2014-05-28 23:46:03 +02:00
Joas Schilling
6df911142c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12561] Reworked tests by nickvergessen
  [ticket/12561] Added tests for "after last", "after missing" and "empty"
  [ticket/12561] Add check to see if "after" column actually exists
  [ticket/12561] Added test for "after"
  [ticket/12561] Add "after" check to schema_generator for columns_add
2014-05-28 23:33:45 +02:00
Joas Schilling
033df350d9 Merge pull request #2474 from PayBas/ticket/12561
[ticket/12561] Add "after" check to schema_generator for columns_add

* PayBas/ticket/12561:
  [ticket/12561] Reworked tests by nickvergessen
  [ticket/12561] Added tests for "after last", "after missing" and "empty"
  [ticket/12561] Add check to see if "after" column actually exists
  [ticket/12561] Added test for "after"
  [ticket/12561] Add "after" check to schema_generator for columns_add
2014-05-28 23:33:25 +02:00
Joas Schilling
480a70ccae Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12384] Use mysqli on hhvm in ascraeus. Keep explicit matrix though.
  [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.
2014-05-28 23:31:23 +02:00
Joas Schilling
1b2238a6b1 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2014-05-28 23:31:13 +02:00
Joas Schilling
1024f3d44e Merge pull request #2292 from bantu/ticket/12384-ascraeus
[ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.

* bantu/ticket/12384-ascraeus:
  [ticket/12384] Use mysqli on hhvm in ascraeus. Keep explicit matrix though.
  [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.
2014-05-28 23:31:05 +02:00
Joas Schilling
a396b647f3 Merge pull request #2282 from bantu/ticket/12384
[ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.

* bantu/ticket/12384:
  [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.
2014-05-28 23:30:03 +02:00
Yuriy Rusko
b934904fbd [ticket/12611] Remove phpBB Group copyright notice from .gifs
PHPBB3-12611
2014-05-28 23:05:32 +02:00
Tristan Darricau
b75fb96bab [ticket/11226] Explicity set file_moved to false
PHPBB3-11226
2014-05-28 22:34:10 +02:00
Tristan Darricau
fde5a9d472 [ticket/11366] Fix headings css in list page
PHPBB3-11366
2014-05-28 22:19:21 +02:00
Tristan Darricau
629c47acfe [ticket/11366] Add config value in schema_data.sql
PHPBB3-11366
2014-05-28 22:19:19 +02:00
Tristan Darricau
73cdfae42b [ticket/11366] Fix HTML
PHPBB3-11366
2014-05-28 22:19:17 +02:00
Tristan Darricau
f3aaab93d6 [ticket/11366] Exchange links and settings' form
PHPBB3-11366
2014-05-28 22:19:16 +02:00
Tristan Darricau
ccddd44105 [ticket/11366] Remove the extra {S_FORM_TOKEN}
PHPBB3-11366
2014-05-28 22:19:14 +02:00
Tristan Darricau
9cbec4deb2 [ticket/11366] Move the links to the top of the page
PHPBB3-11366
2014-05-28 22:19:12 +02:00
Tristan Darricau
edc3b3fb75 [ticket/11366] Hide the version check settings by default
PHPBB3-11366
2014-05-28 22:19:11 +02:00
Tristan Darricau
9b756b9b98 [ticket/11366] Versions, options and actions heading should be centered
PHPBB3-11366
2014-05-28 22:19:09 +02:00
Tristan Darricau
82c97b0a3f [ticket/11366] Better language string for "recheck all"
PHPBB3-11366
2014-05-28 22:19:07 +02:00
Tristan Darricau
b4dec33581 [ticket/11366] Move "recheck all" link
PHPBB3-11366
2014-05-28 22:19:05 +02:00
Tristan Darricau
8dc10d6971 [ticket/11366] Add $config['extension_force_unstable']
PHPBB3-11366
2014-05-28 22:19:03 +02:00
Tristan Darricau
f4d598559f [ticket/11366] Use force_cache on the list page
PHPBB3-11366
2014-05-28 22:19:02 +02:00
Tristan Darricau
13ecddf85b [ticket/11366] Add recheck-all link
PHPBB3-11366
2014-05-28 22:19:00 +02:00
Tristan Darricau
521fe2b8e2 [ticket/11366] Force the use of the cache on the list page
PHPBB3-11366
2014-05-28 22:18:54 +02:00
Tristan Darricau
64467f50db [ticket/11366] Update FILE_NOT_FOUND language string
PHPBB3-11366
2014-05-28 22:17:00 +02:00
Tristan Darricau
537d8b3c16 [ticket/11366] Fix whitespaces
PHPBB3-11366
2014-05-28 22:16:59 +02:00
Tristan Darricau
08ddd1c628 [ticket/11366] Update FILE_NOT_FOUND language string
This var is always used with a colon.

PHPBB3-11366
2014-05-28 22:16:57 +02:00