168edbca16
Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist
2018-07-04 11:21:16 +01:00
7225f7372c
Revert " make click to insert nick work on join/parts, /me's etc"
2018-07-03 10:30:08 +01:00
34f6134595
Merge pull request #1974 from matrix-org/t3chguy/warn_self_mute
...
warn on self-mute
2018-07-02 10:13:49 +01:00
1b003ca39f
gen-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-30 17:07:35 +01:00
ea6e1b6f72
Merge branch 'develop' into t3chguy/warn_self_mute
2018-06-29 19:17:43 +01:00
85a0736c78
update wording as per D4ve's feedback
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-29 19:16:56 +01:00
36ace9dcb9
using map-i18n remap all changed `%(...)s` => `<...>` to keep i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-29 15:21:44 +01:00
8be173cae3
Show nicer error when receiving a consent error after sending a message
2018-06-27 15:17:57 +01:00
67dc8f2a8e
Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist
...
fix historical section
2018-06-26 18:26:29 +01:00
f5519c21b9
Merge branches 'develop' and 't3chguy/hide_empty_sublist' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_empty_sublist
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/i18n/strings/en_EN.json
2018-06-26 07:51:16 +01:00
cdf7101222
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 07:46:48 +01:00
5c8eeff08a
Refactor widgets code
...
Split logic out of setWidget & re-use it when we add jitsi widgets.
Also fix the detection of existing jitsi widgets and make that use
getRoomWidgets() too.
Add error message when a jitsi call is already in process.
2018-06-25 15:30:04 +01:00
de316134a9
Merge branch 'develop' into t3chguy/login_local_error
2018-06-25 13:35:14 +01:00
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
8251de4e35
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-23 17:26:44 +01:00
d4f9fec707
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 18:48:48 +01:00
6252f5b818
Merge remote-tracking branch 'origin/develop' into dbkr/jitsi_makewidget
2018-06-22 11:31:54 +01:00
e5a509bb91
i18n & prunei18n
2018-06-20 10:04:03 +01:00
0e8b4ac2ad
i18n & prunei18n
2018-06-20 10:01:09 +01:00
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
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group
...
Share Dialog
2018-06-15 10:52:27 +01:00
bef435e15a
allow ShareEvent to devolve into ShareRoom using checkbox + i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:41:12 +01:00
e1d3c2e4c7
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:36:39 +01:00
2454540bc0
Merge branch 'develop' into t3chguy/audio_output
2018-06-14 11:03:59 +01:00
ac77b2d9ec
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 16:00:57 +01:00
13d52065f5
Merge branch 'release-v0.12.7'
2018-06-12 14:23:48 +01:00
f9b3f0f9d1
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:02 +01:00
ec53b5f5ab
Expose at-room power level setting
...
Fixes https://github.com/vector-im/riot-web/issues/5835
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 21:22:42 -06:00
e690bcb6ef
Replace "Login as guest" with "Try the app first" on login page
...
Fixes vector-im/riot-web#5875
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 20:54:19 -06:00
689b00c618
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-26 17:24:07 +01:00
b2c26e6984
Merge pull request #1920 from matrix-org/rxl881/refreshWidget
...
Add a "reload widget" button.
2018-05-24 18:11:22 +01:00
033b110f5f
Merge pull request #1929 from matrix-org/luke/cookie-bar-update
...
Cookie bar update
2018-05-24 17:19:05 +01:00
168b956b3c
homeserver
2018-05-24 17:01:00 +01:00
fd8d501732
Update cookie bar wording
2018-05-24 16:58:14 +01:00
9d2f223773
Message for leaving server notices room
2018-05-24 16:54:48 +01:00
aae89efa01
Add usage data link to cookie bar
...
this opens the analytics modal
2018-05-24 12:47:27 +01:00
6f77b8ae26
Modify showDetailsModal to give examples if analytics is not enabled
2018-05-24 12:46:06 +01:00
8dcf43a88d
gen-i18n
2018-05-24 12:08:05 +01:00
dca1217a45
Change wording and appearance of Deactivate Account dialog
2018-05-24 11:50:45 +01:00
b124989968
Implement erasure option upon deactivation
2018-05-23 16:33:32 +01:00
ef686a966d
Add cookie warning to widget warning (AppPermission)
2018-05-23 10:46:32 +01:00
c1a42637e7
Merge pull request #1919 from matrix-org/luke/consent-dialog
...
Terms and Conditions dialog
2018-05-23 10:17:14 +01:00
975332633b
Translation.
2018-05-23 00:26:55 +01:00
658e88c30f
Implement consent/terms and conditions dialog for /_matrix/consent flow
2018-05-22 18:03:56 +01:00
c47c7b8d98
Merge pull request #1902 from matrix-org/t3chguy/room_settings_muted_users
...
improve privileged section users in room settings
2018-05-22 16:07:01 +01:00
d15051a635
Add policyLink configuration to piwik
...
Also:
- Make CookieBar ES6 class
- Alter phrasing on CookieBar
- Conditionaly display longer "...(See our ++cookie and privacy
policies++)." if policy link is configured.
2018-05-16 15:49:23 +01:00
aa4bbbc3db
Remove cookie bar setting from UserSettings
2018-05-16 15:20:38 +01:00
ac1cd384e7
Implement opt-in analytics with cookie bar
2018-05-16 15:20:38 +01:00
9d5ba25131
oh, sendError does support sending the error
2018-05-15 15:19:28 +01:00
7bfe84f8be
Catch errors adding widget
2018-05-15 14:53:49 +01:00
Michael Telatynski