mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity
21,589 Commits 17 Branches 190 Tags
Commit Graph

21589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Etienne Baroux
760aa9d402 [ticket/12602] Changes to respect coding style and to factorize code. 
PHPBB3-12602
 2014-06-03 10:42:50 +02:00
Marc Alexander
2d47f85801 [ticket/12457] Default to first category if none is selected in gallery avatar 
If any category exists, the key() function should always return the first
key of the $avatar_list array.

PHPBB3-12457
 2014-06-03 00:31:17 +02:00
Tristan Darricau
f980fed5d2 [ticket/12639] Handle $conditions['keywords'] outside of the loop 
PHPBB3-12639
 2014-06-02 23:35:35 +02:00
Tristan Darricau
3e31764007 [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs 
PHPBB3-12639
 2014-06-02 23:22:36 +02:00
Tristan Darricau
5b5f3a5d0c [ticket/12639] Send a correct IN entry when deleting marked logs 
PHPBB3-12639
 2014-06-02 23:15:25 +02:00
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
Stephannos
71fb956498 Merge pull request #3 from Nicofuma/Stephannos-ticket/12602 
[ticket/12602] Cleanup tests
 2014-06-02 16:25:19 +02:00
Tristan Darricau
c3ccef10d1 [ticket/12602] Cleanup tests 
PHPBB3-12602
 2014-06-02 16:21:25 +02:00
Etienne Baroux
85e8d1c2ef [ticket/12602] Add function get_tasks. 
PHPBB3-12602
 2014-06-02 16:12:47 +02:00
Etienne Baroux
dc7be4f273 [ticket/12602] Correction of the output message for the cron list 
PHPBB3-12602
 2014-06-02 15:58:02 +02:00
PayBas
dc43073450 [ticket/12521] Fix MCP merge topics row overflow 
PHPBB3-12521
 2014-06-02 14:22:31 +02:00
PayBas
560e0f97be [ticket/12565] Empty anchors introduce white-space in IE11 
PHPBB3-12565
 2014-06-02 14:05:46 +02:00
PayBas
8ecb6b2aa2 [ticket/12566] "Private messages" should be "Send pivate message" 
PHPBB3-12566
 2014-06-02 13:36:49 +02:00
PayBas
082a6b29a9 [ticket/12541] Activate attachments tab when files are dropped into textarea 
PHPBB3-12541
 2014-06-02 12:42:45 +02:00
Etienne Baroux
58d7302b49 [ticket/12602] Add files to print the cron list and test files. 
PHPBB3-12602
 2014-06-02 12:17:37 +02:00
Tristan Darricau
8e2a0caf54 [ticket/12639] Use assertSame 
PHPBB3-12639
 2014-06-01 02:57:16 +02:00
Tristan Darricau
6794c6b79b [ticket/12639] Remove old commented tests 
PHPBB3-12639
 2014-06-01 01:59:29 +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
Cesar G
95b9c93892 [ticket/12640] Preserve the active tab when previewing in posting page. 
PHPBB3-12640
 2014-05-31 10:12:24 -07:00
Tristan Darricau
6d3bc7a60b [ticket/12639] Order the results correctly in the test 
PHPBB3-12639
 2014-05-31 19:00:15 +02:00
Tristan Darricau
dce7c7e0e0 [ticket/12639] Fix tests on postgres 
PHPBB3-12639
 2014-05-31 18:10:12 +02:00
Tristan Darricau
fd9c17ca04 [ticket/12639] Update tests to use a dataProvider 
PHPBB3-12639
 2014-05-31 17:42:40 +02:00
Tristan Darricau
9c497a7b46 [ticket/12639] Add a test case with an empty keywords list 
PHPBB3-12639
 2014-05-31 13:34:04 +02:00
Tristan Darricau
36071ded9d [ticket/12639] Delete entry in admin-log leads to mysql-error 
PHPBB3-12639
 2014-05-31 12:56:44 +02: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