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
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
06e1acdf04
run i18n-gen and i18n-prune
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-14 16:11:42 +01:00
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
f2102e283c
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
2018-05-02 13:08:38 +01:00
22047d7e72
Merge pull request #1845 from kethinov/hide_encryption_icons
...
Hide inline encryption icons except when hovering over a message
2018-04-30 17:57:22 +01:00
efd29193b7
Fix UX issues with bug report dialog
...
* Make it use BaseDialog / DialogButtons (also gives it has a top-right 'x' &
escape to cancel works)
* Stop misusing the 'danger' CSS class on the buttons. There is nothing dangerous
about submitting logs.
* Continued campaign against 'Click here' links.
Fixes https://github.com/vector-im/riot-web/issues/6622
2018-04-27 15:23:35 +01:00
6d9e07580b
UI fixes in SessionRestoreErrorDialog
...
* Make the 'delete my data' button not the default
* Make it red
* Give it a confirmation dialog
* Remove the 'cancel' button: what does it mean to cancel an error?
In this case, it tried again and almost certainly got the same error.
* Remove the top-right 'x' and don't cancel on esc for the same reason.
* Move 'send bug report' to a button rather than a 'click here' link
* Add a 'refresh' button which, even if it's no more likely to work,
will at least look like it's doing something (it's mostly so if you
don't have a bug report endpoint, there's still a button other
than the one that deletes all your data).
2018-04-27 12:38:49 +01:00
ff4909e6ab
Merge branch 'develop' into luke/fix-piwik-page-url-reporting
2018-04-26 11:03:55 +01:00
0614ef6abe
i18n
...
for new anayltics modal redesign
2018-04-26 11:00:50 +01:00
0f0e89d394
Add a button to 'pop out' widgets in to their own tab.
2018-04-25 12:49:30 +01:00
80837a9199
s/contian/contain/g
...
Fixes https://github.com/vector-im/riot-web/issues/6565
2018-04-24 17:53:23 +01:00
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
6154c13c95
Re-run npm run i18n
2018-04-20 15:35:31 +01:00
7e8288f7ae
i18n-gen, i18n-prune
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-20 09:39:14 +01:00
58cd585e86
start of BigMerge fixup
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-20 09:12:02 +01:00
4da804fd64
Merge branch 'develop' into matthew/fix_layering
2018-04-15 23:59:09 +01:00
faa1924902
run gen-i18n to normalise en_EN and remove stuff still in vector-web
2018-04-15 23:18:18 +01:00
a30fdaf293
copy all the i18n over from vector-web via copy-i18n.py
2018-04-15 23:00:38 +01:00
8b1e411d6b
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
2018-04-13 10:54:09 +01:00
c77807bd22
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/i18n/strings/en_EN.json
# src/i18n/strings/eu.json
# src/i18n/strings/fr.json
# src/i18n/strings/lv.json
# src/i18n/strings/ru.json
# src/i18n/strings/zh_Hant.json
2018-04-12 09:48:06 +01:00
fe2cbc584d
Merge branch 'develop' into travis/remove-presence
2018-04-11 15:17:28 -06:00
59abfa6337
Merge pull request #1817 from matrix-org/luke/feature-group-set-joinable
...
Add radio button for setting group m.join_policy
2018-04-05 17:03:04 +01:00
4081321733
run i18n prune and gen
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-04 11:19:28 +01:00
1d90835de0
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/components/structures/RoomView.js
2018-04-04 11:08:34 +01:00
f8f8bc469e
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot
2018-04-03 11:34:14 +01:00
b109c9304c
Put stickers behind labs flag.
2018-04-02 22:24:46 +01:00
80fbc757f5
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
2018-03-31 17:46:31 +01:00
6181ca642f
"Stickerpack" translation.
2018-03-29 17:47:53 +01:00
e9193ff0b6
Merge branch 'develop' into luke/feature-group-set-joinable
2018-03-29 17:01:19 +01:00
f42cdf6a4c
Add radio button for setting group is_joinable
...
which dictates whether the group can be joined without invitation.
2018-03-29 16:57:07 +01:00
1226ad3330
Merge pull request #1815 from matrix-org/luke/feature-group-join
...
Join this community button
2018-03-29 15:44:46 +01:00
c4322892de
Reword group setting delay
2018-03-29 14:33:54 +01:00
2dea5cd233
run gen-i18n
2018-03-29 12:39:21 +01:00
fac89d9c58
Merge branch 'develop' into t3chguy/m.relates_to
2018-03-28 08:38:33 +00:00
b5ed08eba2
Merge
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-24 17:52:49 +00:00
3d4feac75b
Don't try to show unset display name
...
In the ReadReceiptMarker title, show the display name only when it is not the
same as the user ID.
2018-03-23 17:18:44 +13:00
7e1913ef3c
Merge branch 'develop' into show-display-name-in-receipts
2018-03-23 15:51:10 +13:00
8342f441df
Merge pull request #1778 from matrix-org/t3chguy/devtools_autocomplete
...
Add /devtools to Autocomplete and run gen-i18n
2018-03-22 09:54:26 +00:00
580b68a1b6
Merge pull request #1652 from pvagner/dialog-a11y
...
Dialog a11y
2018-03-20 11:35:57 +00:00
0c125b3dff
Merge branch 'develop' into luke/submit-debug-logs
2018-03-19 14:55:28 +00:00
Luke Barnard