Commit Graph

1363 Commits

Author SHA1 Message Date
Tim Düsterhus b7ceab9537 Merge branch '3.0.x' 2016-08-17 20:53:59 +02:00
Tim Düsterhus f4eb305cf1 Fix stripping of ip addresses 2016-08-17 20:51:23 +02:00
Tim Düsterhus c2eb529bb8 Merge branch '3.0.x' 2016-08-17 20:42:43 +02:00
Tim Düsterhus 85f36a4781 Exclude WCF > 2.1 2016-08-17 20:42:22 +02:00
Tim Düsterhus 1783b7e9d2 Merge branch '3.0.x' 2016-08-17 20:40:51 +02:00
Tim Düsterhus 48eeb23555 Bump version number 2016-08-17 20:39:27 +02:00
Tim Düsterhus 73680786d3 Merge branch '3.0.x' 2016-08-17 20:36:39 +02:00
Tim Düsterhus 2e706d22b9 Strip ipAddress from JSON output 2016-08-17 20:36:19 +02:00
Tim Düsterhus c4fb4c198b Fix race condition leading to multiple leaves 2016-05-31 23:29:17 +02:00
Tim Düsterhus 70dfcc663d Bump version number 2016-05-31 23:22:34 +02:00
Tim Düsterhus 238997ab0d Add CHAT_SKIP_ROOM_SELECT option 2016-05-31 23:17:57 +02:00
Maximilian Mader fe0583566c Merge branch '3.0.x' 2015-09-26 23:32:55 +02:00
Maximilian Mader a9c2e4fe30 Fix uncaught TypeError in Safari 8
jQuery's “.focus()” returns undefined in Safari 8, thus the following error will be thrown and sending of messages is impossible: “Uncaught TypeError: Cannot read property 'change' of undefined”
2015-09-26 23:27:41 +02:00
Tim Düsterhus a2feeb148a Add missing language items 2015-05-29 18:13:03 +02:00
Tim Düsterhus 3b24bfb752 Fix defaultvalue of user.chat.canUploadAttachment 2015-05-29 18:07:22 +02:00
Tim Düsterhus d08d400595 Bump version number 2015-05-23 20:49:01 +02:00
Tim Düsterhus 8bf24ccfef Merge branch '3.0.x' 2015-05-23 20:48:05 +02:00
Tim Düsterhus dc56c5a152 Bump version number 2015-05-23 20:47:11 +02:00
Tim Düsterhus 06176debb8 Merge branch '3.0.x' 2015-05-23 20:43:46 +02:00
Tim Düsterhus a604f7d1fe Fix WCF 2.1.4 compatibility 2015-05-23 20:43:04 +02:00
Tim Düsterhus f3f63eb909 Merge branch '3.0.x' 2015-05-04 20:03:50 +02:00
Tim Düsterhus 74676f2203 Fix typo in AbstractSuspensionCommand.class.php 2015-05-04 20:03:16 +02:00
Tim Düsterhus 50dae130ee Merge branch '3.0.x' 2015-04-02 01:35:15 +02:00
Tim Düsterhus 760973ae90 Fix typo in package.xml 2015-04-02 01:35:00 +02:00
Maximilian Mader 56aa488001 Bump version number 2015-04-02 01:28:40 +02:00
Maximilian Mader 98d82d9e22 Merge branch '3.0.x' 2015-04-02 01:23:06 +02:00
Maximilian Mader f776f38434 Bump version number 2015-04-02 01:22:26 +02:00
Tim Düsterhus 46315240ac Merge branch '3.0.x' 2015-04-01 23:11:34 +02:00
Tim Düsterhus 689177a8bb Fix WCF 2.1 compatibility of RoomEditor::deleteAll() 2015-04-01 23:10:40 +02:00
Tim Düsterhus c0f58a9ddb Override max user restriction for mods 2015-03-22 00:10:49 +01:00
Tim Düsterhus 4790a3ddb8 Add missing language items 2015-03-22 00:01:54 +01:00
Tim Düsterhus f546f5bd7a Fix typo in roomAdd.tpl 2015-03-21 23:38:53 +01:00
Tim Düsterhus 5a1eabcad7 Resolve some TODOs 2015-03-21 22:10:45 +01:00
Tim Düsterhus 763d04fb51 Improve userInviteDialog.tpl 2015-03-21 21:46:29 +01:00
Tim Düsterhus d65595649d Order followed users alphabetically in invitation form 2015-03-21 20:37:42 +01:00
Tim Düsterhus 87919dd881 Add missing language items 2015-03-21 20:36:15 +01:00
Tim Düsterhus a556f83393 Add update instructions 2015-03-21 01:07:14 +01:00
Tim Düsterhus ab32c52bad Merge branch 'invite' 2015-03-21 01:03:15 +01:00
Maximilian Mader 14c594b082 Prevent inviting users who have blocked the sender 2015-03-21 00:57:56 +01:00
Tim Düsterhus eec725e687 Bump version number 2015-02-25 22:35:22 +01:00
Maximilian Mader 12dd915ea2 Backport: Make smiley selection compatible with WCF 2.0 and 2.1
This backports 0e7d4d9c07

Conflicts:
	file/js/be.bastelstu.Chat.litcoffee
2015-02-25 22:34:58 +01:00
Tim Düsterhus cced2ee43b Fix push update of online lists 2015-01-23 20:53:28 +01:00
Tim Düsterhus 9ca329571f Add maxUsers column during update 2015-01-10 15:48:20 +01:00
Tim Düsterhus db4bfcf48a Merge branch '3.0.x'
Conflicts:
	.travis.yml
2015-01-10 15:46:14 +01:00
Tim Düsterhus b8fb128dc5 Remove phpcpd from .travis.yml 2015-01-10 15:45:45 +01:00
Tim Düsterhus 5354913ce5 Fix typo in RoomAddForm.class.php 2015-01-10 15:44:09 +01:00
Maximilian Mader cf4f55d922 Merge branch '3.0.x' 2015-01-10 01:58:21 +01:00
Maximilian Mader 5941420ce9 Fix attachment upload button in mobile view 2015-01-10 01:55:38 +01:00
Maximilian Mader e2372ca799 Merge branch 'RoomUserLimit' 2015-01-10 01:42:33 +01:00
Maximilian Mader 3c668cf630 Add language variables 2015-01-10 01:03:24 +01:00