makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
21955 commits 18 branches 192 tags 207 MiB
Commit graph

21955 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
7d18b605a5 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12521] Fix MCP merge topics row overflow
  [ticket/12565] Empty anchors introduce white-space in IE11
  [ticket/12541] Activate attachments tab when files are dropped into textarea
  [ticket/12615] Fixed inproper clearing of .topic-actions
 2014-06-04 23:09:02 -07: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
0326c96e50 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12457] Default to first category if none is selected in gallery avatar
 2014-06-05 02:26:48 +02: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
f1314741fb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:21 +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
b46e68c65d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12640] Preserve the active tab when previewing in posting page.
 2014-06-04 23:26:22 +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
a090260a73 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12566] Also changed for ucp_pm_viewmessage.php
  [ticket/12566] "Private messages" should be "Send pivate message"
 2014-06-02 13:48:01 -07: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
c000520add Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12641] Use jQuery's trim() method. IE8 does not support the native one
 2014-05-31 23:00:07 +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