OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
11,983 Commits
214 Branches
561 Tags
463 MiB
Commit Graph

92 Commits (88bfe6fc399ed6ea7cf9aeba198fa19ad2a8faae)

Author SHA1 Message Date
Travis Ralston 57b99893e5
Merge pull request #1936 from turt2live/travis/pinned-room-list 
Add options to pin unread/mentioned rooms to the top of the room list
 2018-11-01 08:04:12 -06:00
Aaron Raimist 49ce4ef117
eslint --fix src/ 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 22:50:38 -05:00
Travis Ralston 9cdb527163
Merge branch 'develop' into travis/pinned-room-list 2018-10-25 10:57:08 -06:00
Will Hunt a5ae599dcb Add show developer tools option 2018-10-24 18:15:25 +01:00
Travis Ralston 103ed71eb5 Merge branch 'develop' into travis/pinned-room-list 2018-10-12 14:09:52 -06:00
Bruno Windels 6ed0777c96 turn it on! 2018-10-11 15:55:21 +02:00
Bruno Windels 7dc92fe917 Avoid clearing e2e encryption keys, also avoid warning 2018-08-13 17:24:27 +02:00
Bruno Windels 08f322753d explain exception 2018-08-13 16:53:16 +02:00
Bruno Windels 3e9d1342e8 fix lint 2018-08-13 16:51:37 +02:00
Bruno Windels 94c424d3bb translations 2018-08-13 11:24:32 +02:00
Bruno Windels 2f9aaeca46 undo whitespace change 2018-08-13 11:17:04 +02:00
Bruno Windels 09ad138306 remove unused imports 2018-08-13 11:16:29 +02:00
Bruno Windels 28292c3388 implement PR feedback, move LL dialog to UserSettings 2018-08-13 11:14:30 +02:00
Bruno Windels 3731431e59 use LL controller in setting 2018-08-09 18:41:41 +02:00
Bruno Windels 028f09e5d1 lazy loading settings controller to show dialog and export e2e keys 2018-08-09 18:39:55 +02:00
Bruno Windels 308a6b419e allow a setting controller to validate and revert a change (asynchronously) 2018-08-09 16:56:02 +02:00
Bruno Windels af07d73432 hide lazy loading behind feature flag 2018-07-25 16:10:49 +02:00
David Baker cfa7d0f11d Take jitsi conf calling out of labs 2018-07-24 19:06:19 +01:00
Michael Telatynski 37a8e7f2e2
add setting to throw new RoomSubList hide behaviour behind an opt-in 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-30 17:07:28 +01:00
David Baker 553111b6e2
Merge pull request #2001 from matrix-org/t3chguy/default_url_previews_off_e2ee 
default to not showing url previews in e2ee rooms.
 2018-06-25 11:50:14 +01:00
Michael Telatynski d1600bdacf
fix event type which room-account settings were read from 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 19:17:31 +01:00
Michael Telatynski acbc84a69c
switch to another settings key for e2e url previews to protect on change 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 18:44:54 +01:00
David Baker 6252f5b818 Merge remote-tracking branch 'origin/develop' into dbkr/jitsi_makewidget 2018-06-22 11:31:54 +01:00
David Baker e67dae704a Take replies out of labs! 2018-06-20 09:57:11 +01:00
David Baker 8cf17a66e5 Very basic Jitsi integration 
Replaces the conference calling by adding a Jitsi widget. No support
for continuing the call on room change currently, so hidden behind
a feature flag. Existing behaviour is preserved by default.
 2018-06-15 15:12:32 +01:00
David Baker 9567ffcb9f Remove tag panel feature flag 
We forgot to remove this when taking tagpanel out of labs, so now
this flag just does nothing.
 2018-06-15 11:56:44 +01:00
Michael Telatynski 2454540bc0
Merge branch 'develop' into t3chguy/audio_output 2018-06-14 11:03:59 +01:00
Travis Ralston 52cdf60954 Add options to pin unread/mentioned rooms to the top of the room list 
Fixes https://github.com/vector-im/riot-web/issues/6604
Fixes https://github.com/vector-im/riot-web/issues/732
Fixes https://github.com/vector-im/riot-web/issues/1104

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 20:29:35 -06:00
Travis Ralston 752605429c Persist pinned message open-ness between room switches 
Addresses part of https://github.com/vector-im/riot-web/issues/5405

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 19:58:12 -06:00
Michael Telatynski 6636fa32f6
Allow selecting audio output for WebRTC Audio/Video calls 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-26 17:22:23 +01:00
Luke Barnard aa4bbbc3db Remove cookie bar setting from UserSettings 2018-05-16 15:20:38 +01:00
Luke Barnard ac1cd384e7 Implement opt-in analytics with cookie bar 2018-05-16 15:20:38 +01:00
Travis Ralston 9e11720191 Add setting to enable widget screenshots (if widgets declare support) 
Fixes the remainder of https://github.com/vector-im/riot-web/issues/6708

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-12 14:30:59 -06:00
Luke Barnard e10e659457 Take feature_sticker_messagse out of labs 2018-05-09 14:59:35 +01:00
Eric Newport d42fa9d17a Hide inline encryption icons except when hovering over a message 
Closes https://github.com/vector-im/riot-web/issues/2882

This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988)

I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.
 2018-04-22 22:30:37 -04:00
Travis Ralston fe2cbc584d Merge branch 'develop' into travis/remove-presence 2018-04-11 15:17:28 -06:00
Luke Barnard 0306c365cc Fix to prevent guests from seeing features 2018-04-06 11:03:17 +01:00
Richard Lewis b109c9304c Put stickers behind labs flag. 2018-04-02 22:24:46 +01:00
Luke Barnard 27c71f15b9 Add setting to disable TagPanel 2018-02-28 18:16:01 +00:00
Michael Telatynski b7204e79a7 fallback after receiving settings rather than {} because its truthy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-17 18:17:26 +00:00
Michael Telatynski 43bb8c561d add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-17 18:10:19 +00:00
Michael Telatynski b90a98b5c1 don't pass back {} when we have no `org.matrix.room.color_scheme` 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-17 18:06:19 +00:00
Michael Telatynski 1bc9d344ae
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/views/messages/TextualBody.js
 2018-01-10 11:54:58 +00:00
Travis Ralston 99d3045b4f Also remove the setting 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-12-25 14:33:46 -07:00
Travis Ralston 2815c576c1 Ignore the default value when calculating if notifications are enabled 
This is to make the "Enable desktop notifications" checkbox accurately reflect the user's preference. The device-level setting is still respected. 

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-12-25 13:29:30 -07:00
Michael Telatynski 9603b21199
s/Quote/Reply/ and ES6 tweaks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-17 20:20:45 +00:00
Michael Telatynski 4666ac7c83
hide rich quoting behind flags, retaining original quoting for now 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-12 23:29:43 +00:00
Luke Barnard f708250d44 Add feature flag for Tag Panel 2017-11-29 18:00:42 +00:00
Matthew Hodgson 3e13a919ed
remove rogue debug 2017-11-16 13:09:53 +00:00
Travis Ralston fb1f20b7d4 Treat the master push rule as authoritative 
Previously the push rule was ignored, leading to all kinds of interesting issues regarding notifications. This fixes those issues by giving the master push rule the authority it deserves for reasonable defaults.

Part 2 of the fix for:
* https://github.com/vector-im/riot-web/issues/5603
* https://github.com/vector-im/riot-web/issues/5606

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 22:33:23 -07:00