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

1284 Commits

Author SHA1 Message Date
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
c074261521 Fix system breaking bug(s). 2014-09-09 23:58:07 +02:00
19f6cf0215 Merge branch '3.0.x' 2014-09-05 21:14:57 +02:00
ba646da078 Fix typo in be.bastelstu.Chat.litcoffee 2014-09-05 21:12:48 +02:00
ca203333d7 Allow showing the number of chatters in main menu 2014-09-05 20:42:37 +02:00
c745c6f663 Add update_3.0.x_3.1.0.sql 2014-08-20 00:42:43 +02:00
58e5fa4f58 Merge branch '3.0.x' 2014-08-18 18:20:24 +02:00
5b8dbe7d3b Fix redirect to first room in ChatPage 2014-08-18 18:20:06 +02:00
d462381f88 Merge branch '3.0.x' 2014-08-17 02:56:00 +02:00
74a1b58085 Remove relicts 2014-08-17 02:54:07 +02:00
19f613a9f0 Merge branch '3.0.x' 2014-08-14 19:27:50 +02:00
83f41f2113 Merge remote-tracking branch 'origin/3.0.x' into 3.0.x 2014-08-14 19:27:10 +02:00
d09606dda8 Merge branch '3.0.x' 2014-08-14 19:24:20 +02:00
5f9c3f8058 Bump version number 2014-08-14 19:16:15 +02:00
1a3ab20b6a Merge branch '3.0.x' 2014-08-14 19:12:02 +02:00
3bd77176e7 Merge branch '3.0.x' 2014-08-14 19:12:00 +02:00
4145715b06 Fix permission check in WhereCommand 2014-08-14 19:10:30 +02:00
Maximilian Mader
bd08731325 Merge branch '3.0.x' 2014-08-12 21:14:47 +02:00
Maximilian Mader
61bba5529c Add clearfix to .timsChatText to prevent floated content destroying the layout 2014-08-12 21:09:30 +02:00
Maximilian Mader
2ad26f0d04 Don't color usernames if the color has not been set explicitly 2014-08-12 20:43:35 +02:00
12b321d7e8 Fix race condition in combination with nodePush
If a nodePush notification comes in *after* PHP fetched the new messages
from database, but before the server reply is received it may delay the
arrival of the new message up to a minute (where the automated timer kicks
in)
2014-08-10 00:24:17 +02:00
c44dea73d3 Merge branch '3.0.x' 2014-08-08 02:00:06 +02:00
bc11d9a7ef Correctly filter out rooms w/o permission in room select 2014-08-08 01:59:24 +02:00
Maximilian Mader
c2fe53fdb0 Implement a “pseudo global” room
The „global“ room can be activated on a user group basis.
This allows for bots processing messages from all rooms and responding to them.
2014-08-03 01:06:44 +02:00
d22c209e8d Merge branch '3.0.x' 2014-08-02 21:40:52 +02:00
44a4353fcf Fix autocomplete cycling in Google Chrome 2014-08-02 21:40:38 +02:00
Tim Düsterhus
1d92b0f26b Provide roomID for users in NewMessagesPage 2014-08-02 18:11:54 +02:00
fe2f675e4d Merge branch '3.0.x' 2014-08-02 15:57:07 +02:00
c4952705c3 Unify language item 2014-08-02 15:53:32 +02:00