1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00

21517 Commits

Author SHA1 Message Date
Cesar G
8ba083f886 Merge remote-tracking branch 'PayBas/ticket/12566' into develop-ascraeus
* PayBas/ticket/12566:
  [ticket/12566] Also changed for ucp_pm_viewmessage.php
  [ticket/12566] "Private messages" should be "Send pivate message"
2014-06-02 13:47:37 -07:00
PayBas
0baf501569 [ticket/12566] Also changed for ucp_pm_viewmessage.php
PHPBB3-12566
2014-06-02 22:12:58 +02:00
PayBas
8ecb6b2aa2 [ticket/12566] "Private messages" should be "Send pivate message"
PHPBB3-12566
2014-06-02 13:36:49 +02:00
Andreas Fischer
48679eeff8 Merge pull request #2529 from prototech/ticket/12641
[ticket/12641] Use jQuery's trim() method. IE8 does not support the native one.

* prototech/ticket/12641:
  [ticket/12641] Use jQuery's trim() method. IE8 does not support the native one
2014-05-31 23:00:07 +02:00
Cesar G
6a00ff3fa6 [ticket/12641] Use jQuery's trim() method. IE8 does not support the native one
PHPBB3-12641
2014-05-31 10:56:08 -07:00
Joas Schilling
9c2687ddc9 Merge pull request #2494 from Nicofuma/ticket/12589
[ticket/12589] Search directly in $directory if it's an absolute sub-path

* Nicofuma/ticket/12589:
  [ticket/12589] Add test searching in a non absolute directory
  [ticket/12589] Fix tests
  [ticket/12589] Search directly in $directory if it's an absolute sub-path
2014-05-31 01:35:10 +02:00
Andreas Fischer
f4dcb69dae [develop-ascraeus] Correct capitalisation of NeoThermic. 2014-05-31 00:25:28 +02:00
Joas Schilling
b92787a132 Merge pull request #2524 from bantu/ticket/12637
[ticket/12637] Correct file header in coding-guidelines

* bantu/ticket/12637:
  [ticket/12637] Fixup all incorrect uses of file header.
  [ticket/12637] Correctly escape the file header in coding-guidelines.html.
2014-05-30 23:22:49 +02:00
Joas Schilling
40218ba5e6 Merge pull request #2433 from Nicofuma/ticket/10899
[ticket/10899] Using Delete All in log viewer with keyword search

* Nicofuma/ticket/10899:
  [ticket/10899] Update doc block
  [ticket/10899] Use isset($field_value['IN'])
  [ticket/10899] Add event core.delete_log
  [ticket/10899] Remove trailing ;
  [ticket/10899] Fix typo in the class name
  [ticket/10899] Add unit tests
  [ticket/10899] Get $phpbb_log from the container
  [ticket/10899] Remove extra ';'
  [ticket/10899] Typo
  [ticket/10899] Refactoring in \phpbb\log\log_interface
  [ticket/10899] Using Delete All in log viewer with keyword search
2014-05-30 23:13:00 +02:00
Joas Schilling
be52ea882a Merge pull request #2357 from Nicofuma/ticket/11942
[ticket/11942] Delete post/topic reason should be added to logs

* Nicofuma/ticket/11942:
  [ticket/11942] Don't change the reason to '' when hard deleting
  [ticket/11942] Don't show the checkbox if the post is already soft-deleted
  [ticket/11942] Remove useless IF in templates
  [ticket/11942] Apply the modifications to subsilver
  [ticket/11942] Always display delete reason
  [ticket/11942] Edits messages
  [ticket/11942] Change the formulation
  [ticket/11942] Adding the reason to hard deleted topic/post
  [ticket/11942] Delete post/topic reason should be added to logs
2014-05-30 23:04:02 +02:00
Joas Schilling
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
Joas Schilling
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
Joas Schilling
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
Andreas Fischer
21c6102d55 [ticket/12637] Fixup all incorrect uses of file header.
PHPBB3-12637
2014-05-30 22:34:26 +02:00
Andreas Fischer
b372d515ff [ticket/12637] Correctly escape the file header in coding-guidelines.html.
PHPBB3-12637
2014-05-30 22:30:43 +02:00
Andreas Fischer
cc41e2eef7 [ticket/12597] Update USE_SYSTEM_CRON_EXPLAIN to be a bit more verbose.
PHPBB3-12597
2014-05-30 20:39:06 +02:00
Andreas Fischer
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
Andreas Fischer
4d80d90f73 [ticket/12597] Improve language for cron:run command.
PHPBB3-12597
2014-05-30 19:51:11 +02:00
Andreas Fischer
a8e412e2b7 [ticket/12597] Do not output anything besides the gif image.
PHPBB3-12597
2014-05-30 19:41:49 +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 release-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
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
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
LEZY Thomas
fa3a634ae1 [ticket/12597] Reformating an acp message
PHPBB3-12597
2014-05-30 10:55:03 +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
LEZY Thomas
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
LEZY Thomas
01dba249d7 [ticket/12597] Fix wrong global variable name
$pathEx changed to $phpEx

PHPBB3-12597
2014-05-29 18:27:00 +02:00
LEZY Thomas
43fbb84cc3 [ticket/12597] Typo correction
PHPBB3-12597
2014-05-29 18:09:42 +02:00
LEZY Thomas
3b845b1893 [ticket/12597] Typo corrections
PHPBB3-12597
2014-05-29 18:08:02 +02:00
LEZY Thomas
fda2cc636c [ticket/12597] Changing place of lock release in execute() method
PHPBB3-12597
2014-05-29 18:03:23 +02:00
Cesar G
5310838163 [ticket/12614] Make the post buttons always visible.
PHPBB3-12614
2014-05-29 08:45:22 -07:00
LEZY Thomas
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
LEZY Thomas
335faafae8 Merge branch 'ticket/12597' of github.com:ptitlazy/phpbb into ticket/12597 2014-05-29 17:31:50 +02:00
LEZY Thomas
03e0e736ab [ticket/12597] Typing corrections and improvement of code consistency
PHPBB3-12597
2014-05-29 17:29:22 +02:00
LEZY Thomas
7508d2b546 [ticket/12597] Fix various mistakes
Typing mistakes
Coding style issue
Verbose mode messag

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

PHPBB3-12597
2014-05-29 17:03:34 +02:00
LEZY Thomas
c17a1e92c5 [ticket/12597] Fix visibilty of two functions in run.php
PHPBB3-12597
2014-05-29 16:59:41 +02:00
LEZY Thomas
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
Andreas Fischer
505b26ed86 [ticket/11266] Better message for when composer dependencies are missing.
PHPBB3-11266
2014-05-29 16:13:29 +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
Tristan Darricau
4b3bba6693 [ticket/10899] Update doc block
PHPBB3-10899
2014-05-29 02:30:15 +02:00
Tristan Darricau
70f313eb4f [ticket/11942] Don't change the reason to '' when hard deleting
PHPBB3-11942
2014-05-29 00:49:12 +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