Maximilian Mader
|
c690927d48
|
Add graphical interface for private channels.
|
2013-07-12 16:49:40 +02:00 |
|
Tim Düsterhus
|
476954fe8d
|
Allow the user to open a privat channel
|
2013-07-09 22:02:47 +02:00 |
|
Tim Düsterhus
|
8279759294
|
Merge branch 'master' into privateChannels
Conflicts:
file/js/be.bastelstu.Chat.litcoffee
|
2013-07-09 21:50:19 +02:00 |
|
Tim Düsterhus
|
abcae3e129
|
Clean up coffeescript a bit
|
2013-07-09 21:48:40 +02:00 |
|
Tim Düsterhus
|
9c27cd5429
|
Add function to show an inputError
|
2013-07-09 21:42:01 +02:00 |
|
Tim Düsterhus
|
6c5911d42b
|
Convert messages to whisper when in private channel
|
2013-07-09 21:39:31 +02:00 |
|
Maximilian Mader
|
9bb171b4d9
|
Rename variable and fix closing of private channels
|
2013-07-09 20:45:35 +02:00 |
|
Maximilian Mader
|
fa03296908
|
Improve private channels
Follow up messages will be shown in opened private channels
|
2013-07-09 20:30:46 +02:00 |
|
Maximilian Mader
|
7cb15e5e9c
|
First working draft of private channels
|
2013-07-09 19:41:14 +02:00 |
|
Maximilian Mader
|
9530dad294
|
Remove <script> type-attribute
|
2013-07-08 22:39:02 +02:00 |
|
Tim Düsterhus
|
0407099817
|
Fix typo in RoomAddForm
|
2013-07-08 21:36:51 +02:00 |
|
Maximilian Mader
|
f02631a7c7
|
Add possibility to hide topic.
|
2013-07-08 21:25:48 +02:00 |
|
Tim Düsterhus
|
161d0504f0
|
Fix joining when no message exists
|
2013-07-07 22:32:04 +02:00 |
|
Maximilian Mader
|
61c835cd38
|
Make config editable via template event
|
2013-06-24 18:25:30 +02:00 |
|
Maximilian Mader
|
14fcafc483
|
Add missing quotes
|
2013-06-24 18:17:35 +02:00 |
|
Maximilian Mader
|
d5a2bcf7d9
|
Fix formatting
|
2013-06-24 18:11:55 +02:00 |
|
Maximilian Mader
|
1b077719b8
|
Fix PHP 5.3 compatability
|
2013-06-24 18:09:31 +02:00 |
|
Maximilian Mader
|
a8fb9c35f5
|
Remove some leftovers
|
2013-06-24 18:07:47 +02:00 |
|
Maximilian Mader
|
5fd1e6e7be
|
Further message template improvements
- Publish message types to JavaScript
- add message type icons
- style info message properly
|
2013-06-24 17:49:24 +02:00 |
|
Maximilian Mader
|
c3dd2c899b
|
Add styles for aligning message bubbles on the right
|
2013-06-24 17:41:52 +02:00 |
|
Maximilian Mader
|
871440d783
|
Fix message marking
|
2013-06-23 23:40:12 +02:00 |
|
Maximilian Mader
|
d7294296a5
|
Fix message background
|
2013-06-23 23:21:41 +02:00 |
|
Tim Düsterhus
|
b3bf01e017
|
Merge remote-tracking branch 'origin/frontendImprovements'
|
2013-06-23 20:44:37 +02:00 |
|
Maximilian Mader
|
0602179125
|
Add clearfix
|
2013-06-23 20:40:00 +02:00 |
|
Maximilian Mader
|
9b6ee4afb4
|
Further improvements
|
2013-06-23 20:12:32 +02:00 |
|
Tim Düsterhus
|
9f8f7b31e0
|
Set isFollowUp to allow checking whether a completely new message is wanted
|
2013-06-23 19:54:39 +02:00 |
|
Tim Düsterhus
|
42ef646685
|
Merge similar messages together
|
2013-06-23 19:46:50 +02:00 |
|
Maximilian Mader
|
f313dde2c3
|
Prepare for message merging
|
2013-06-23 19:45:20 +02:00 |
|
Maximilian Mader
|
a71e1ec00e
|
Improve frontend
according to http://ux.stackexchange.com/a/41142/32862
|
2013-06-23 18:48:48 +02:00 |
|
Tim Düsterhus
|
820711cc9f
|
Remove required attribute from input
Looks crappy in Firefox
|
2013-06-23 18:09:17 +02:00 |
|
Tim Düsterhus
|
7ca00744da
|
Fix chatLastSeen on join
|
2013-06-23 17:59:14 +02:00 |
|
Tim Düsterhus
|
8ac930b952
|
Fix newest messages when DISPLAY_JOIN_LEAVE is false
|
2013-06-23 17:55:29 +02:00 |
|
Tim Düsterhus
|
101e90d906
|
Fix newest messages
|
2013-06-23 17:54:32 +02:00 |
|
Tim Düsterhus
|
e0859c5952
|
Fix CHAT_LASTMESSAGES === 0
|
2013-06-23 18:46:52 +03:00 |
|
Tim Düsterhus
|
b9187bfb6d
|
Add PHP 5.5 to .travis.yml
|
2013-06-23 02:05:49 +03:00 |
|
Tim Düsterhus
|
096a18c096
|
Merge branch 'suspensionList'
Closes #34
|
2013-06-22 18:44:37 +02:00 |
|
Tim Düsterhus
|
8edb5e3f47
|
Allow revoking of suspensions in ACP
|
2013-06-22 18:43:38 +02:00 |
|
Tim Düsterhus
|
9848b5820b
|
Fix typos
|
2013-06-22 18:28:50 +02:00 |
|
Tim Düsterhus
|
e6e4cb5225
|
Fix permission name
|
2013-06-22 18:12:05 +02:00 |
|
Tim Düsterhus
|
ccedc9af87
|
Add missing language items
|
2013-06-22 18:10:30 +02:00 |
|
Tim Düsterhus
|
7bf99453f2
|
Fix permissions for suspensions
|
2013-06-22 17:57:33 +02:00 |
|
Tim Düsterhus
|
c82eea234f
|
Allow creating a local suspension when only the global permission is set
|
2013-06-22 17:42:41 +02:00 |
|
Tim Düsterhus
|
0025fc63ee
|
Add permissions for suspension viewing
|
2013-06-22 17:40:24 +02:00 |
|
Tim Düsterhus
|
6d539e7f0a
|
Made suspension commands more abstract
|
2013-06-22 17:11:22 +02:00 |
|
Tim Düsterhus
|
f9fa3a7841
|
Fix typo in SuspensionAction
|
2013-06-22 16:35:48 +02:00 |
|
Tim Düsterhus
|
878831a659
|
Merge remote-tracking branch 'origin/suspensionList' into suspensionList
|
2013-06-22 16:34:17 +02:00 |
|
Maximilian Mader
|
55c4029057
|
Merge branch 'suspensionList' of github.com:wbbaddons/Tims-Chat into suspensionList
|
2013-06-22 16:31:48 +02:00 |
|
Maximilian Mader
|
bc56eac2e2
|
Improve suspension list
|
2013-06-22 16:31:08 +02:00 |
|
Tim Düsterhus
|
a51b6ffacd
|
Revoking is now setting expires to TIME_NOW
|
2013-06-22 16:17:53 +02:00 |
|
Tim Düsterhus
|
4abb837878
|
Merge branch 'master' into suspensionList
Conflicts:
package.xml
|
2013-06-22 14:41:40 +02:00 |
|