6154c13c95
Re-run npm run i18n
2018-04-20 15:35:31 +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
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
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
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
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
aed7c2039d
Update debug logs submission explanation
2018-03-19 14:54:50 +00:00
00f6deeb46
gen/prune i18n
2018-03-15 12:03:00 +00:00
bc5699b3d7
Add change delay warning in GroupView settings
2018-03-14 18:17:15 +00:00
a1d0cf65d6
Fix missing space between "...is a" and user ID
2018-03-08 16:34:19 +00:00
3a3cced905
E2E "fudge-button"
...
Implement a UI to expose a JS-SDK API for cancelling and resending
a room key request for an event.
This is useful in scenarios where the user has dismissed the request
on their other devices and would like to send the restart the
verification dance manually.
Depends on JS-SDK PR https://github.com/matrix-org/matrix-js-sdk/pull/624
2018-03-08 14:13:33 +00:00
e2cedbe9d7
Pull in changes from develop
2018-03-05 16:43:59 +00:00
f29918b766
gen-i18n
2018-02-28 18:18:59 +00:00
03676a68ac
Add /devtools to Autocomplete and run gen-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-28 00:57:14 +00:00
2b49947e1e
Add "Did you know:..." microcopy to groups view
...
To explain how to drag group avatars into the TagPanel
2018-02-27 09:20:06 +00:00
b2bf4d4709
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot
2018-02-23 15:37:33 +00:00
ff868691c9
Only show "X" when filtering, add alt/title
2018-02-21 17:15:43 +00:00
e3f68f12c8
Add context menu to TagTile
...
With two options: View Community and Remove, which
removes the tag from the panel.
2018-02-12 18:01:08 +00:00
97ce84c8e3
Add display name to the read receipt view
...
Show the user's display name (aka nick) in the ReadReceiptMarker
title (mouseover text), and then the user ID in parentheses.
2018-02-11 16:14:17 +13:00
0154772789
Change wording of debug log submission
...
Fixes https://github.com/vector-im/riot-web/issues/5985
2018-02-08 18:18:57 +00:00
14991afbe5
Merge branch 'develop' into dialog-a11y
2018-02-06 23:04:15 +01:00
f1eb899cad
Re-run i18n script & prune
2018-02-06 10:26:37 +00:00
29962ed89d
Add stickerpack strings.
2018-02-05 11:48:48 +00:00
ebfdd7c718
Merge pull request #1715 from matrix-org/t3chguy/rich_quoting_linear
...
Linear Rich Quoting
2018-01-24 18:53:29 +01:00
f013ffd068
Merge pull request #1714 from matrix-org/t3chguy/group_create_dialog_fixes
...
Fix CreateGroupDialog issues
2018-01-22 17:57:40 +00:00
4490715b60
Merge branch 'develop' into t3chguy/rich_quoting_linear
2018-01-22 16:46:20 +00:00
3b1d69edbb
Change Quotes to be linearly rendered rather than recursively nested
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 16:34:47 +00:00
0441487e97
Manage sticker packs link and add comments
2018-01-22 17:00:50 +01:00
02824cfacf
fix i18n for show devices prompt
2018-01-22 12:16:11 +01:00
61b3d050ab
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/group_create_dialog_fixes
2018-01-20 13:39:57 +00:00
2705397bf6
Add local GID==='' check, because Synapse says Group rather than Community
...
Reset createError when doing check because it is now stale
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-20 13:16:33 +00:00
5206c9d18b
Show a warning if the user attempts to leave a room that is invite only
2018-01-19 22:52:43 +00:00
b526fc057c
Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep
2018-01-14 18:32:17 +00:00
b152bd4ab9
Merge pull request #1625 from matrix-org/t3chguy/analytics_info
...
Add Analytics Info and add Piwik to SdkConfig.DEFAULTS
2018-01-11 11:02:34 +00:00
efb96cdd2a
Merge pull request #1695 from matrix-org/dbkr/send_without_verifying
...
Add 'send without verifying' to status bar
2018-01-11 10:34:56 +00:00
94167e2b8b
Run gen-i18n.js and embed the ellipsis into the base string
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 12:52:20 +00:00
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
David Baker