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

21742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
69e50dffae Merge pull request #2509 from Stephannos/ticket/12602 
[ticket/12602] Add command to print the cron list

* Stephannos/ticket/12602:
  [ticket/12602] Fix language key removal.
  [ticket/12602] Rectify language keys.
  [ticket/12602] Fix test mistake.
  [ticket/12602] Fix language var mistakes.
  [ticket/12602] Add types, change description of cron:list.
  [ticket/12602] Fix internationalisation of cron_list.php
  [ticket/12602] Fix spaces issues.
  [ticket/12602] Coding style correction.
  [ticket/12602] Fix coding style mistakes.
  [ticket/12602] Headers updated.
  [ticket/12602] Changes to respect coding style and to factorize code.
  [ticket/12602] Cleanup tests
  [ticket/12602] Add function get_tasks.
  [ticket/12602] Correction of the output message for the cron list
  [ticket/12602] Add files to print the cron list and test files.
 2014-06-06 19:43:09 +02:00
Etienne Baroux
088ce641be [ticket/12602] Fix language key removal. 
PHPBB3-12602
 2014-06-06 17:49:18 +02:00
Andreas Fischer
1f78ab536b Merge pull request #2552 from marc1706/ticket/12666 
[ticket/12666] Use "None" for images in root of gallery avatar path

* marc1706/ticket/12666:
  [ticket/12666] Use "None" for images in root of gallery avatar path
 2014-06-06 16:03:08 +02:00
Etienne Baroux
347de7f060 [ticket/12602] Rectify language keys. 
PHPBB3-12602
 2014-06-06 14:55:37 +02:00
Etienne Baroux
49beb2075b [ticket/12602] Fix test mistake. 
PHPBB3-12602
 2014-06-06 10:29:58 +02:00
Etienne Baroux
8f0a04f318 [ticket/12602] Fix language var mistakes. 
PHPBB3-12602
 2014-06-06 10:21:00 +02:00
Marc Alexander
4d24681259 [ticket/12666] Use "None" for images in root of gallery avatar path 
"None" serves no real purpose right now. After this it will be used instead
of "Main" for images in the root of the gallery avatar path.

PHPBB3-12666
 2014-06-05 23:28:00 +02:00
Etienne Baroux
c6999481e7 [ticket/12602] Add types, change description of cron:list. 
PHPBB3-12602
 2014-06-05 15:11:15 +02:00
Etienne Baroux
f119e060b7 [ticket/12602] Fix internationalisation of cron_list.php 
PHPBB3-12602
 2014-06-05 09:12:44 +02:00
Cesar G
49c875413c Merge remote-tracking branch 'PayBas/ticket/12541' into develop-ascraeus 
* PayBas/ticket/12541:
  [ticket/12541] Activate attachments tab when files are dropped into textarea

Conflicts:
	phpBB/styles/prosilver/template/forum_fn.js
 2014-06-04 23:07:02 -07:00
Cesar G
e67a19a940 Merge remote-tracking branch 'PayBas/ticket/12615' into develop-ascraeus 
* PayBas/ticket/12615:
  [ticket/12615] Fixed inproper clearing of .topic-actions
 2014-06-04 22:59:37 -07:00
Cesar G
3c3a182f07 Merge remote-tracking branch 'PayBas/ticket/12565' into develop-ascraeus 
* PayBas/ticket/12565:
  [ticket/12565] Empty anchors introduce white-space in IE11
 2014-06-04 22:58:19 -07:00
Cesar G
5ae331a27a Merge pull request #2536 from PayBas/ticket/12521 
[ticket/12521] Fix MCP merge topics row overflow
 2014-06-04 21:54:41 -07:00
Andreas Fischer
d79ad22a21 Merge pull request #2539 from marc1706/ticket/12457 
[ticket/12457] Default to first category if none is selected in gallery avatar

* marc1706/ticket/12457:
  [ticket/12457] Default to first category if none is selected in gallery avatar
 2014-06-05 02:26:48 +02:00
Tristan Darricau
5b51acf245 [ticket/12655] Set register_container_commands as public 
PHPBB3-12655
 2014-06-05 01:03:16 +02:00
Tristan Darricau
5e9c8a0cea [ticket/12655] Don't try to restore the definition in the help 
PHPBB3-12655
 2014-06-05 01:00:33 +02:00
Tristan Darricau
012702307b [ticket/12655] Fix coding style 
PHPBB3-12655
 2014-06-05 00:21:53 +02:00
Andreas Fischer
f9c0a6b96e Merge pull request #2526 from Nicofuma/ticket/12639 
[ticket/12639] Delete entry in admin-log leads to mysql-error

* Nicofuma/ticket/12639:
  [ticket/12639] Add a space in the code generated by generate_sql_keyword()
  [ticket/12639] Handle $conditions['keywords'] outside of the loop
  [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs
  [ticket/12639] Send a correct IN entry when deleting marked logs
  [ticket/12639] Use assertSame
  [ticket/12639] Remove old commented tests
  [ticket/12639] Order the results correctly in the test
  [ticket/12639] Fix tests on postgres
  [ticket/12639] Update tests to use a dataProvider
  [ticket/12639] Add a test case with an empty keywords list
  [ticket/12639] Delete entry in admin-log leads to mysql-error
 2014-06-04 23:59:20 +02:00
Marc Alexander
1e7a782fb3 Merge remote-tracking branch 'prototech/ticket/12640' into develop-ascraeus 
* prototech/ticket/12640:
  [ticket/12640] Preserve the active tab when previewing in posting page.
 2014-06-04 23:25:48 +02:00
Tristan Darricau
ce104e2c72 [ticket/12655] Make the --shell option available only for phpbbcli.php 
PHPBB3-12655
 2014-06-04 22:33:05 +02:00
Etienne Baroux
442e12828b [ticket/12602] Fix spaces issues. 
PHPBB3-12602
 2014-06-04 21:56:55 +02:00
Tristan Darricau
99ebf4b8dd [ticket/12655] Fix coding style in \phpbb\console\application 
PHPBB3-12655
 2014-06-04 21:08:11 +02:00
Tristan Darricau
fb46e42ab3 [ticket/12639] Add a space in the code generated by generate_sql_keyword() 
PHPBB3-12639
 2014-06-04 20:22:22 +02:00
Etienne Baroux
7c22d653e9 [ticket/12602] Coding style correction. 
PHPBB3-12602
 2014-06-04 15:50:09 +02:00
Tristan Darricau
a14d16172c [ticket/12655] Set the arguments of \phpbb\console\application as required 
PHPBB3-12655
 2014-06-04 15:34:11 +02:00
Tristan Darricau
6c9518ea32 [ticket/12655] Don't require acp/common again in the commands 
PHPBB3-12655
 2014-06-04 14:47:00 +02:00
Tristan Darricau
5efd55a348 [ticket/12655] Run the shell when --shell is used 
PHPBB3-12655
 2014-06-04 14:46:40 +02:00
Etienne Baroux
5aca27e8cf [ticket/12602] Fix coding style mistakes. 
PHPBB3-12602
 2014-06-03 10:54:28 +02:00
Etienne Baroux
721a1d0bc4 [ticket/12602] Headers updated. 
PHPBB3-12602
 2014-06-03 10:50:00 +02:00
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
Marc Alexander
ac311e1b39 [ticket/12352] Do not check hashes that don't have the necessary length 
This should significantly reduce the time spent on checking hashes of
passwords that should be converted.

PHPBB3-12352
 2014-06-02 10:14:26 +02:00
Marc Alexander
94b2b64ca1 [ticket/12352] Update file headers to fit new format 
PHPBB3-12352
 2014-06-01 21:36:53 +02:00
Marc Alexander
6f5f0d6d8d [ticket/12352] Use custom provider collection for auth providers 
Using this custom provider collection, we can properly check whether the
configured auth provider does exist. The method get_provider() has been added
for returning the default auth provider or the standard db auth provider if
the specified one does not exist.
Additionally, the method get_provider() will throw an RuntimeException if
none of the above exist.

PHPBB3-12352
 2014-06-01 21:31:06 +02:00
Marc Alexander
306beab4cb [ticket/12352] Add checks for existing user_pass_convert to migrations 
PHPBB3-12352
 2014-06-01 21:31:05 +02:00
Marc Alexander
4698f6928e [ticket/12352] Remove usages of user_pass_convert column 
PHPBB3-12352
 2014-06-01 21:31:05 +02:00