1
0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-10-31 14:10:08 +00:00
Commit Graph

1312 Commits

Author SHA1 Message Date
db4bfcf48a Merge branch '3.0.x'
Conflicts:
	.travis.yml
2015-01-10 15:46:14 +01:00
b8fb128dc5 Remove phpcpd from .travis.yml 2015-01-10 15:45:45 +01:00
5354913ce5 Fix typo in RoomAddForm.class.php 2015-01-10 15:44:09 +01:00
cf4f55d922 Merge branch '3.0.x' 2015-01-10 01:58:21 +01:00
5941420ce9 Fix attachment upload button in mobile view 2015-01-10 01:55:38 +01:00
e2372ca799 Merge branch 'RoomUserLimit' 2015-01-10 01:42:33 +01:00
3c668cf630 Add language variables 2015-01-10 01:03:24 +01:00
d78df587f1 Add handling of maxUsers in be.bastelstu.Chat.litcoffee 2015-01-10 01:03:24 +01:00
45aa96376d Show maxUsers in boxRoomList 2015-01-10 01:03:24 +01:00
1e3852f5ae Check for maxUsers in chat.tpl 2015-01-10 01:03:24 +01:00
48976d793b Implement maxUsers in RoomAction 2015-01-10 01:03:23 +01:00
f5edd74642 Add input for maxUsers to roomAdd.tpl 2015-01-10 01:03:23 +01:00
418443bb45 Update RoomEditForm according to RoomAddForm 2015-01-10 01:03:17 +01:00
8c68694c00 Add possibility to define maxUsers in RoomAddForm 2015-01-10 01:03:10 +01:00
16643a4ed3 Add maxUsers column to room database definition 2015-01-10 00:42:32 +01:00
0e7d4d9c07 Make smiley selection compatible with WCF 2.0 and 2.1 2015-01-09 20:16:47 +01:00
Tim Düsterhus
3758f008b0 Force room select by default 2014-12-19 00:27:45 +01:00
47f23090a5 Directly send auto away message
This avoids problems when “Channel 0” is not opened
2014-12-18 23:43:53 +01:00
e2aebcf7a2 Merge branch '3.0.x' 2014-12-18 16:10:29 +01:00
b9f5f46df9 Properly encode username in tab menu tabs 2014-12-18 15:58:55 +01:00
5d43af828b Add user option to limit maximum amount of messages per tab 2014-12-17 21:04:55 +01:00
ea693dae00 Add auto away function 2014-12-16 23:45:28 +01:00
43100bcdf9 Merge branch 'UserOptions' 2014-12-14 01:51:09 +01:00
a2a1a86324 Allow saving of button statuses
Closes #65
2014-12-14 01:50:53 +01:00
a30a922a64 Properly encode username in Message::getUsername() 2014-12-12 21:13:30 +01:00
d0b9eff8eb Fix code style 2014-12-10 00:15:48 +01:00
e153bc5493 Merge branch '3.0.x' 2014-12-09 23:22:05 +01:00
fed02ce18b Backport: Improve clearfix 2014-12-09 23:21:53 +01:00
63adcd13d3 Merge branch '3.0.x' 2014-12-02 18:17:24 +01:00
73e8f053ee Properly hide dashboard box for guests 2014-12-02 18:16:50 +01:00
Tim Düsterhus
2a3f706f58 Update .travis.yml 2014-11-28 02:47:30 +01:00
7ca0420e17 Merge branch '3.0.x' 2014-11-15 16:37:43 +01:00
2400564500 Fix WCF 2.1 compatibility 2014-11-15 16:19:53 +01:00
80db5cf3c9 Add date to message if they are from a previous day 2014-10-31 02:20:23 +01:00
979fe68fc2 Merge branch '3.0.x' 2014-10-31 02:04:08 +01:00
79196bade9 Fix clock shift issue in MessageLogDownloadPage 2014-10-31 02:01:32 +01:00
7209b1b0ac Merge branch '3.0.x' 2014-10-18 22:14:34 +02:00
dad63c7967 Bump version number 2014-10-18 22:13:47 +02:00
12517f8fdd Merge branch '3.0.x' 2014-10-18 21:49:07 +02:00
9ad0c840a6 Fixup "Fix chat room pruning" 2014-10-18 21:48:33 +02:00
7871f022e1 Merge branch '3.0.x' 2014-10-18 19:38:53 +02:00
47bce1e4aa Fix chat room pruning 2014-10-18 19:38:01 +02:00
e694e51354 Merge branch 'push' 2014-09-29 01:39:45 +02:00
d4e6d3faef Depend on Push instead of nodePush 2014-09-29 01:39:45 +02:00
Tim Düsterhus
88d5e9a11f Remove obsolete cruft from objectType.xml 2014-09-29 01:01:57 +02:00
a6e6184da6 Improve clearfix 2014-09-20 21:57:17 +02:00
3f632571f2 Merge branch '3.0.x' 2014-09-19 23:20:00 +02:00
0f4b99da26 Merge branch '3.0.x' of github.com:wbbaddons/Tims-Chat into 3.0.x 2014-09-19 23:19:54 +02:00
11099fda25 Merge branch '3.0.x' 2014-09-19 23:19:20 +02:00
6a0d0a6ec6 Fix typo in RoomAction 2014-09-19 23:19:07 +02:00