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

871 Commits

Author SHA1 Message Date
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
83f41f2113 Merge remote-tracking branch 'origin/3.0.x' into 3.0.x 2014-08-14 19:27:10 +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
dae0488b57 Truncate message in desktop notification 2014-07-30 21:43:00 +02:00
64d2242cde Add $user parameter to canMute() and canBan() 2014-07-29 03:12:51 +02:00
850bfacfbb Add class 'mod' to user if he's got moderative permissions in the room 2014-07-27 22:28:13 +02:00
Maximilian Mader
c6e776b668 Hide upload button while private channel is being active 2014-06-21 21:24:57 +02:00
Maximilian Mader
6f9418e167 Fix marking of messages in speech bubbles
It failed on appending a new message to the same speech bubble
2014-06-21 18:54:35 +02:00
4091a6e7e6 Fix address bar update when changing room 2014-06-20 17:26:51 +02:00
a4c3da02ba Properly support message type CLEAR 2014-06-19 20:53:29 +02:00
Joshua Rüsweg
5874065c3c fix php notice "array to string conversion" 2014-05-20 21:00:51 +02:00
Joshua Rüsweg
196f4916bb fix php notice "array to string conversion" 2014-05-20 19:48:26 +02:00
Maximilian Mader
b8bc642714 Don't insert text if the allowed length would be exceeded 2014-04-29 22:04:52 +02:00
Maximilian Mader
b633f05452 Change fired event in insertText from 'keyup' to 'change'
jCounter listens to this event and updates the counter if this event is fired
2014-04-28 13:59:08 +02:00
Tim Düsterhus
6d0a19a53e Add missing getReceiver() in InviteCommand
see https://tims.bastelstu.be/forum/index.php/Thread/155-Temproom-Einladung-Falsche-Bezeichnung/
2014-04-13 17:58:27 +02:00
a32008bd2d Fix active acpMenuItem in RoomEditForm 2014-03-21 00:33:27 +01:00
Maximilian Mader
ec2a5b07ff Fix topic hiding mechanism 2014-03-17 22:04:46 +01:00
dcdaa54ab7 Fix autoscroll when switching channels 2014-03-17 18:47:00 +01:00
Maximilian Mader
ec937c15b5 Improve join function
- Prevent multiple join requests
- Disable input during joining a room
- Prevent joining the same room again (TODO: also prevent this on the server side)
2014-03-13 21:18:03 +01:00
Maximilian Mader
8e0a07ab30 Don't show topic of a room again if it has been hidden during the current session 2014-03-13 20:56:46 +01:00
Tim Düsterhus
76e2893be6 Merge branch 'master' of github.com:wbbaddons/Tims-Chat 2014-03-12 23:47:24 +01:00
Tim Düsterhus
6fe073fd0c Remove logging to console from debug code 2014-03-12 23:31:21 +01:00
Tim Düsterhus
b459d35c25 Fix message sending when no smilies exist
see https://tims.bastelstu.be/forum/index.php/Thread/126-Empty-Meldung-bei-Eingabe/
2014-03-11 20:40:45 +01:00
3997f674a4 Fix empty command alias list
See https://tims.bastelstu.be/forum/index.php/Thread/133-Fehlermeldung-wenn-keine-Befehls-Aliase-definiert-wurden/
2014-03-10 18:32:56 +01:00
9d8359a52c Fix mute command in user menu
see https://tims.bastelstu.be/forum/index.php/Thread/129-Knebeln-per-Dropdown-nicht-m%C3%B6glich/
2014-03-10 18:25:18 +01:00
Tim Düsterhus
d1a44417e6 Properly set $userID as key in Room::getUsers()
NewMessagesPage relies on the keys being userIDs for user storage loading.
2014-03-03 03:25:37 +01:00
Maximilian Mader
dde862d5a6 Fix overflow on reload button 2014-03-02 22:41:20 +01:00
Maximilian Mader
515a670a6c Fix fullscreen mode on mobile devices and single line information messages 2014-03-02 20:03:21 +01:00
Maximilian Mader
7132a4692f Return roomID on join 2014-03-02 18:11:54 +01:00
Maximilian Mader
16afdf6ce4 Add permission check to user menu
Also export getUserList and getRoomList
2014-03-02 17:57:41 +01:00
Tim Düsterhus
be0dc70a5b Fix comment in RoomAction 2014-03-02 17:11:53 +01:00
Tim Düsterhus
81cabf3dd8 Use PeriodicalExecutor's resume 2014-03-02 16:04:45 +01:00
Tim Düsterhus
c82ff3715a Fix filtering for suspension type in ChatSuspensionList 2014-03-02 03:44:46 +01:00
Maximilian Mader
2ab194541f Fix wrong lang var name 2014-03-02 00:44:34 +01:00
Maximilian Mader
20bce575bb Improve selection of chat messages 2014-03-02 00:33:45 +01:00
Tim Düsterhus
11a4602430 Fix nodePush on room changes
Without this change temprooms could show up in the roomlist before the proper permissions were set.
2014-03-01 21:37:03 +01:00
Tim Düsterhus
2960959716 Fix ChatLocation 2014-02-28 23:07:51 +01:00