1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-23 19:51:26 +02:00
Commit Graph

21776 Commits

Author SHA1 Message Date
e8af120037 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11467] Add user object to extension manager for tests
  [ticket/11467] Add language variables to tests
  [ticket/11467] Add language variables for extension exception messages
2014-05-30 23:01:57 +02:00
9f87c497fe Merge pull request #2447 from n-aleha/ticket/11467
[ticket/11467] Add language variables for extension exception messages

* n-aleha/ticket/11467:
  [ticket/11467] Add user object to extension manager for tests
  [ticket/11467] Add language variables to tests
  [ticket/11467] Add language variables for extension exception messages
2014-05-30 23:01:19 +02:00
be8770532c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11266] Better message for when composer dependencies are missing.
2014-05-30 22:58:17 +02:00
669a6c3e3d Merge pull request #2512 from bantu/ticket/11266
[ticket/11266] Better message for when composer dependencies are missing...

* bantu/ticket/11266:
  [ticket/11266] Better message for when composer dependencies are missing.
2014-05-30 22:57:43 +02:00
ee8e5bcf37 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12597] Update USE_SYSTEM_CRON_EXPLAIN to be a bit more verbose.
  [ticket/12597] Improve language for cron:run command.
  [ticket/12597] Do not output anything besides the gif image.
2014-05-30 22:52:14 +02:00
a6a2d1bc2d Merge pull request #2523 from bantu/ticket/12597
[ticket/12597] Command for executing all available cron tasks

* bantu/ticket/12597:
  [ticket/12597] Update USE_SYSTEM_CRON_EXPLAIN to be a bit more verbose.
  [ticket/12597] Improve language for cron:run command.
  [ticket/12597] Do not output anything besides the gif image.
2014-05-30 22:52:01 +02:00
cc41e2eef7 [ticket/12597] Update USE_SYSTEM_CRON_EXPLAIN to be a bit more verbose.
PHPBB3-12597
2014-05-30 20:39:06 +02:00
64f8163652 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (27 commits)
  [ticket/12597] Reformating an acp message
  [ticket/12597] Modifiying acp message
  [ticket/12597] Fix wrong global variable name
  [ticket/12597] Typo correction
  [ticket/12597] Typo corrections
  [ticket/12597] Changing place of lock release in execute() method
  [ticket/12597] Fix test file
  [ticket/12597] Typing corrections and improvement of code consistency
  [ticket/12597] Fix various mistakes
  [ticket/12597] Fix various mistakes
  [ticket/12597] Fix visibilty of two functions in run.php
  [ticket/12597] Refactoring and test improving
  [ticket/12597] Fix language key name
  [ticket/12597] Fix coding style and typing mistakes
  [ticket/12597] Changes name of command  cron:run-all to cron:run.
  [ticket/12597] Fix various problems
  [ticket/12597] Fix constructor bug and servral doc blocs
  [ticket/12597] Modification of return statuses and of test files
  [ticket/12597] Fix misplaced release of db lock
  [ticket/12597] Change EXECUTE to RUN in language
  ...
2014-05-30 20:12:15 +02:00
bbb83c09c0 Merge pull request #2508 from ptitlazy/ticket/12597
[ticket/12597] Command for executing all available cron tasks

* ptitlazy/ticket/12597: (27 commits)
  [ticket/12597] Reformating an acp message
  [ticket/12597] Modifiying acp message
  [ticket/12597] Fix wrong global variable name
  [ticket/12597] Typo correction
  [ticket/12597] Typo corrections
  [ticket/12597] Changing place of lock release in execute() method
  [ticket/12597] Fix test file
  [ticket/12597] Typing corrections and improvement of code consistency
  [ticket/12597] Fix various mistakes
  [ticket/12597] Fix various mistakes
  [ticket/12597] Fix visibilty of two functions in run.php
  [ticket/12597] Refactoring and test improving
  [ticket/12597] Fix language key name
  [ticket/12597] Fix coding style and typing mistakes
  [ticket/12597] Changes name of command  cron:run-all to cron:run.
  [ticket/12597] Fix various problems
  [ticket/12597] Fix constructor bug and servral doc blocs
  [ticket/12597] Modification of return statuses and of test files
  [ticket/12597] Fix misplaced release of db lock
  [ticket/12597] Change EXECUTE to RUN in language
  ...
2014-05-30 20:12:15 +02:00
4d80d90f73 [ticket/12597] Improve language for cron:run command.
PHPBB3-12597
2014-05-30 19:51:11 +02:00
a8e412e2b7 [ticket/12597] Do not output anything besides the gif image.
PHPBB3-12597
2014-05-30 19:41:49 +02:00
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
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
da48b7df22 [prep-release-3.1.0-b4] Update phpBB Version for b5 development 2014-05-30 17:52:38 +02:00
f9c6297a09 [prep-release-3.1.0-b4] Add changelog for 3.1.0-b4 release-3.1.0-b4 2014-05-30 16:33:19 +02:00
814b077864 [prep-release-3.1.0-b4] Prepare Changelog 2014-05-30 16:32:30 +02:00
0cfc0413ca [prep-release-3.1.0-b4] Add migration for 3.1.0-b4 2014-05-30 16:27:42 +02:00
b6135d3d02 [prep-release-3.1.0-b4] Update version to 3.1.0-b4 2014-05-30 16:23:44 +02:00
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
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
5c37d28096 [ticket/12621] schema.json is not up to date with migration files
PHPBB3-12621
2014-05-30 16:07:23 +02:00
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
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
9f568959a9 [ticket/12594] Update file header in non-php files
PHPBB3-12594
2014-05-30 15:31:15 +02:00
634824e888 [ticket/12594] Fix file headers of new files
PHPBB3-12594
2014-05-30 15:29:10 +02:00
fa3a634ae1 [ticket/12597] Reformating an acp message
PHPBB3-12597
2014-05-30 10:55:03 +02:00
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
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
9cda850b3a [ticket/12597] Modifiying acp message
Modifying an acp message in order to include the use of the command

PHPBB3-12597
2014-05-29 20:46:23 +02:00
01dba249d7 [ticket/12597] Fix wrong global variable name
$pathEx changed to $phpEx

PHPBB3-12597
2014-05-29 18:27:00 +02:00
43fbb84cc3 [ticket/12597] Typo correction
PHPBB3-12597
2014-05-29 18:09:42 +02:00
3b845b1893 [ticket/12597] Typo corrections
PHPBB3-12597
2014-05-29 18:08:02 +02:00
fda2cc636c [ticket/12597] Changing place of lock release in execute() method
PHPBB3-12597
2014-05-29 18:03:23 +02:00
5310838163 [ticket/12614] Make the post buttons always visible.
PHPBB3-12614
2014-05-29 08:45:22 -07:00
2f2e404639 [ticket/12597] Fix test file
Fix bug of test_no_task that expected a message where none was supposed
to exist.

PHPBB3-12597
2014-05-29 17:40:57 +02:00
335faafae8 Merge branch 'ticket/12597' of github.com:ptitlazy/phpbb into ticket/12597 2014-05-29 17:31:50 +02:00
03e0e736ab [ticket/12597] Typing corrections and improvement of code consistency
PHPBB3-12597
2014-05-29 17:29:22 +02:00
7508d2b546 [ticket/12597] Fix various mistakes
Typing mistakes
Coding style issue
Verbose mode messag

PHPBB3-12597
2014-05-29 17:26:31 +02:00
79bdcdf988 [ticket/12597] Fix various mistakes
Typing mistakes
Coding style issue
Verbose mode messag

PHPBB3-12597
2014-05-29 17:03:34 +02:00
c17a1e92c5 [ticket/12597] Fix visibilty of two functions in run.php
PHPBB3-12597
2014-05-29 16:59:41 +02:00
e7fd259766 [ticket/12597] Refactoring and test improving
Adding tests of return status
Refactoring code
Adding consistency in verbose mode

PHPBB3-12597
2014-05-29 16:37:45 +02:00
505b26ed86 [ticket/11266] Better message for when composer dependencies are missing.
PHPBB3-11266
2014-05-29 16:13:29 +02:00
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
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
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
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
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
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
7f00c38c50 [ticket/11467] Add user object to extension manager for tests
PHPBB3-11467
2014-05-29 01:07:44 +03:00
56959a2f83 [ticket/11467] Add language variables to tests
Convert the hardcoded strings to language variables.

PHPBB3-11467
2014-05-29 01:07:44 +03:00