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

3449 Коммитов

Автор SHA1 Сообщение Дата
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
Lukas Reschke a2f9e8f885
Properly calculate the key 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-19 12:40:05 +02:00
Lukas Reschke 197d7e5e78
Don't show selection in selection bar 
Fixes https://github.com/nextcloud/spreed/issues/66
 2016-10-19 12:37:57 +02:00
Jan-Christoph Borchardt 1d8b0df894 Merge pull request #55 from nextcloud/make-user-autocomplete 
Add person selector
 2016-10-19 12:15:04 +02:00
Jan-Christoph Borchardt b4db524401
initial style fixes 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-19 12:13:30 +02:00
Lukas Reschke 519c862d28
Add person selector 
This adds a person selector as well as avatars so that initiating a call will be more intuitive.

Fixes https://github.com/nextcloud/spreed/issues/25
Fixes https://github.com/nextcloud/spreed/issues/11

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-19 12:13:30 +02:00
Jan-Christoph Borchardt b36776e78a Merge pull request #63 from nextcloud/fewer-global-vars 
use fewer global vars and move init code to a central place
 2016-10-19 11:48:12 +02:00
Christoph Wurst eadc2749e6 use fewer global vars and move init code to a central place 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-10-19 11:19:29 +02:00
Ivan Sein c583f41d6f Merge pull request #65 from nextcloud/show-active-room 
Remove class 'active' to not active rooms.
 2016-10-18 19:21:23 +02:00
Ivan Sein 17c6cd68d1 Remove class 'active' to not active rooms. 2016-10-18 19:18:47 +02:00
Jan-Christoph Borchardt fef16f0016 Merge pull request #64 from nextcloud/show-active-room 
visually show which room is selected/active
 2016-10-18 18:58:51 +02:00
Lukas Reschke 4a6fa0d9d9 Update app.js 2016-10-18 18:45:03 +02:00
Ivan Sein ee125b260e Merge pull request #61 from nextcloud/more-options-button 
[WIP] More-actions button.
 2016-10-18 18:21:54 +02:00
Ivan Sein 50fabb772c Added more actions button and menu to roomlistview template 2016-10-18 18:06:26 +02:00
Ivan Sein 6af2dbc9e9 Added more-actions menu. 2016-10-18 18:01:45 +02:00
Ivan Sein a94b645ab5 Added more options button to each room list item. 2016-10-18 18:00:30 +02:00
Christoph Wurst c42ff6f9bc
visually show which room is selected/active 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-10-18 17:08:49 +02:00
Lukas Reschke e76242bee9 Merge pull request #60 from nextcloud/marionette-room-list 
use backbone + marionette to render the list of rooms
 2016-10-18 16:19:33 +02:00
Christoph Wurst f1ec1f7e25
downgrade marionette, create room via backbone sync 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-10-18 16:10:16 +02:00
Christoph Wurst 2b596e396d
use backbone + marionette to render the list of rooms 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-10-18 16:09:52 +02:00
Lukas Reschke ebbc33cbfe Merge pull request #54 from nextcloud/js-testing 
add karma/jasmine config for js unit testing
 2016-10-18 15:59:53 +02:00
Christoph Wurst 108ca00c16
add karma/jasmine config for js unit testing 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-10-18 15:22:47 +02:00
Lukas Reschke e20c9b0817 Merge pull request #59 from nextcloud/camera-error 
improve style of camera & microphone errors
 2016-10-18 14:27:19 +02:00
Jan-Christoph Borchardt f82f4ab6da improve style of camera & microphone errors 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-18 12:47:35 +02:00
Lukas Reschke d88b2e769c Merge pull request #51 from nextcloud/add-unit-tests 
Add first unit tests
 2016-10-17 22:41:54 +02:00
Lukas Reschke 10e175cc5e
Add first unit tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-17 22:40:50 +02:00
Lukas Reschke 2ab7a9b96a Merge pull request #53 from nextcloud/marionette 
Use Marionette for better application structure
 2016-10-17 22:39:36 +02:00