nextcloud
/
spreed
зеркало из https://github.com/nextcloud/spreed.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
4 225 коммитов 117 Ветки 305 Теги 464 MiB
Граф коммитов

4225 Коммитов

Автор SHA1 Сообщение Дата
Joas Schilling 61d9335c73
Prepare notifications for group calls 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-14 16:30:50 +01:00
Jan-Christoph Borchardt 87499758d2 don't show X for groups 2016-11-14 15:16:42 +01:00
Jan-Christoph Borchardt 0736053647 fix group icon details 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-14 15:07:02 +01:00
Jan-Christoph Borchardt 7db6765445 Merge pull request #83 from nextcloud/more-actions 
More actions
 2016-11-14 14:53:04 +01:00
Jan-Christoph Borchardt 6bbf7e2621 add specific icon for groups 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-14 14:51:30 +01:00
Jan-Christoph Borchardt d1cd236e86 remove counter & ellipsize participants list 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-14 14:30:08 +01:00
Jan-Christoph Borchardt 9e7fd3e797 fix avatars being replaced by X 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-14 14:15:24 +01:00
Ivan Sein 1648ca13f9 Use classes instead of ids to identify more-actions menu buttons. 
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
 2016-11-14 11:41:16 +01:00
Ivan Sein dffb2e2b7f Add event handlers for more-actions menu items. 
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
 2016-11-14 11:41:16 +01:00
Ivan Sein 68992a9d72 Keep more-actions menu opened after the view is re-rendered. 
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
 2016-11-14 11:41:16 +01:00
Ivan Sein de02a044d3 Make more-actions button always visible. 
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
 2016-11-14 11:41:16 +01:00
Joas Schilling e430629752 Merge pull request #82 from nextcloud/fix-js-lint-errors 
Fix JS linting errors
 2016-11-14 11:28:46 +01:00
Joas Schilling ae4f6b146c
Define _ and Backbone as globals 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-14 10:35:46 +01:00
Joas Schilling a1bde55bf5
Ignore the tests directory as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-14 10:35:28 +01:00
Joas Schilling 1d0edd322f
Fix JS linting errors 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-14 10:21:58 +01:00
Lukas Reschke c30d18fef0 Merge pull request #80 from nextcloud/dropdown 
Group calls
 2016-11-13 15:58:52 +01:00
Ivan Sein 330c5ae3b7 Show 'You' when current user is the only participant in a group call room. 2016-11-11 15:31:34 +01:00
Ivan Sein aaae534de8 Leave room before joining to another one. 2016-11-11 14:47:54 +01:00
Ivan Sein b8cd4148e8 Show groups and allow group calls creation. 2016-11-11 14:25:30 +01:00
Ivan Sein 773d25c232 Check for exact match and omit current user. 2016-11-10 11:50:42 +01:00
Ivan Sein c827090dde Merge pull request #78 from nextcloud/group-calls 
Group calls
 2016-11-09 16:49:03 +01:00
Ivan Sein c2f7defd36 Check room type on get PrivateChatRoomForUsers function. 2016-11-09 16:36:27 +01:00
Ivan Sein 6cbe4c377c Added group calls type. 2016-11-09 16:11:35 +01:00
Ivan Sein 220df3784b Merge pull request #77 from nextcloud/join-rooms 
Join rooms and set them active.
 2016-11-09 15:56:35 +01:00
Ivan Sein 609ba046b5 Added missing function name change. 2016-11-09 15:53:25 +01:00
Ivan Sein f861d5dcdd Return STATUS_OK when OneToOne room already exists. Then user will be joined to that room even if he selects it from drop-down list and it already exists. 2016-11-09 15:53:25 +01:00
Ivan Sein 78fba33f3f Set it active and go into it when creating a new OneToOne room. 2016-11-09 15:53:25 +01:00
Joas Schilling 32350c1630 Merge pull request #76 from nextcloud/notifications 
Notifications
 2016-11-09 15:34:52 +01:00
Joas Schilling 0305bf5ad4
Add unit test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-09 15:19:31 +01:00
Joas Schilling 518f296077
Ignore the coverage 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-09 15:19:31 +01:00
Joas Schilling 24b2f86980
Kill notifications when the user enters a room 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-09 15:19:30 +01:00
Joas Schilling d985c7f58c
Start notifications 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-09 15:18:58 +01:00
Joas Schilling 433272de4c Merge pull request #79 from nextcloud/dont-unnecessary-loading-the-routing 
Only load the routing when the navigation is displayed
 2016-11-09 15:17:31 +01:00
Joas Schilling f07e8b5169
Only load the routing when the navigation is displayed 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-09 14:26:37 +01:00
Lukas Reschke 0afb81b6d2 Merge pull request #73 from nextcloud/more-actions-menu 
Adjusted more-actions menu and button to use guidelines.
 2016-10-25 19:45:13 +02:00
Ivan Sein 28ce1daedd Changed 'spreedme' to lowercase in localized strings. 2016-10-25 18:59:22 +02:00
Lukas Reschke 3bb0e5b302 Merge pull request #72 from nextcloud/oneToOne-rooms-creation 
Fixed getPrivateChatRoomForUsers SQL query.
 2016-10-25 18:50:01 +02:00
Lukas Reschke afacda054f Merge pull request #74 from nextcloud/int-room-id 
Make it work with postgresql
 2016-10-25 18:49:35 +02:00
Robin Appelman 8a257c130f properly build queries 2016-10-25 16:29:12 +02:00
Robin Appelman 05fb17ea6a use int as roomid everywhere 2016-10-25 16:20:42 +02:00
Ivan Sein 69c32271a9 Adjusted more-actions menu and button to use guidelines. 2016-10-24 19:10:22 +02:00
Ivan Sein 841bbad6b3 Fixed getPrivateChatRoomForUsers SQL query. 2016-10-21 19:04:55 +02:00
Jan-Christoph Borchardt 97e8907b0f use fullscreen icon 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-20 14:31:12 +02:00
Lukas Reschke 7cdaad0aa8 Merge pull request #69 from nextcloud/sorted-room-list 
Sort rooms by last room usage.
 2016-10-20 12:03:44 +02:00
Ivan Sein 1f8310b5aa Sort rooms by last room usage. 2016-10-19 17:57:46 +02:00
Lukas Reschke e872feefeb
Show displaynames also in search 2016-10-19 15:21:51 +02:00
Jan-Christoph Borchardt ce1aa4fe9e fix placement of 3-dot-menu 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-19 15:03:55 +02:00
Lukas Reschke 45179de86d
Only show displayname 2016-10-19 14:06:04 +02:00
Lukas Reschke 5f88596868
Add displaynames to sidebar 2016-10-19 14:03:53 +02:00
Lukas Reschke 6d1d5cf69f
Don't show count if a one-to-one call 2016-10-19 12:47:53 +02:00