f1eb899cad
Re-run i18n script & prune
2018-02-06 10:26:37 +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
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
9dd9a5be4b
Wording tweak
2018-01-09 17:59:49 +00:00
4c101628b5
Add 'send without verifying' to status bar
...
Fixes other part of https://github.com/vector-im/riot-web/issues/5936
2018-01-09 13:52:37 +00:00
d0897dc8f3
update wording to not imply exhaustiveness
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-08 13:29:27 +00:00
845dda8f48
Merge pull request #1692 from matrix-org/t3chguy/pr-revival/turt2live/single_unsent
...
[revived] Singularise unsent message prompt, if applicable
2018-01-05 12:24:06 +00:00
be48460595
Singularise unsent message prompt, if applicable
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-04 15:05:08 +00:00
f67d405732
small refactor && warn on self-demotion
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-02 23:15:36 +00:00
05434e782a
change Composer placeholder text based on replying/rich quoting state
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-18 19:49:38 +00:00
9603b21199
s/Quote/Reply/ and ES6 tweaks
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-17 20:20:45 +00:00
0ad0c0e9f7
finish i18n, and add a Date Sep to quote if it needs it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-15 18:39:01 +00:00
4043ea7d57
change CSS classes and i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-15 17:57:24 +00:00
bb9376098a
Merge pull request #1654 from matrix-org/dbkr/crypto_store_migrate_warning
...
Warn when migrating e2e data to indexeddb
2017-12-08 16:52:05 +00:00
ab2fcfb388
re-run the fun^w^wnpm run i18n
2017-12-08 16:36:30 +00:00
0d38e7510d
Merge pull request #1600 from matrix-org/dbkr/udd_no_auto_show
...
Don't Auto-show UnknownDeviceDialog
2017-12-08 16:33:25 +00:00
65c210cdde
Warn when migrating e2e data to indexeddb
2017-12-06 15:28:20 +00:00
802abe7091
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
2017-12-06 11:07:01 +01:00
7118f7a38f
gen-18n
2017-11-29 18:41:08 +00:00
1c71983610
Implement UI for using bulk device deletion API
2017-11-28 15:32:40 +00:00
bbaa46f773
Merge pull request #1634 from matrix-org/luke/move-group-flair-toggle-to-user-settings
...
Move group publication toggles to UserSettings
2017-11-28 11:02:45 +00:00
d4f5e7e6d7
Deal with errors, lack of groups, loading
2017-11-28 10:46:20 +00:00
8be3862e68
Merge branch 'master' into develop
2017-11-28 10:29:40 +00:00
9ed9422af8
Move group publication toggles to UserSettings
2017-11-27 17:24:42 +00:00
80b8cbb473
Ignore unrecognised login flows
...
Update the Login component so that if it sees an unrecognised login flow, it
just ignores it and uses another one, so that riot can still be used with
homeservers supporting custom login types.
2017-11-27 16:47:49 +00:00
e07c7e404e
Merge pull request #1632 from matrix-org/luke/rename-related-communities
...
Rename Related Groups to improve readability
2017-11-27 14:34:02 +00:00
3635997090
Rename Related Groups to improve readability
2017-11-27 14:13:44 +00:00
f61f858cf7
Add Analytics Info and add Piwik to SdkConfig.DEFAULTS
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-19 15:33:07 +00:00
093f110199
Make the toggle button on the memberEventListSummary translatable
2017-11-18 17:48:57 +01:00
184b29daf8
Revert "Make the disabled PowerSelector element showing custom value translatable. Fixes #5547"
...
This reverts commit 681f43913a
2017-11-18 16:58:36 +01:00
65e1d49f37
More sensible buttons in UnknownDeviceDialog
...
Just say 'Send' (or equiv) if you actually verify all the devices,
rather than 'Send Anyway'.
2017-11-16 17:59:42 +00:00
df921438f3
Make PresenceLabel more easily translatable
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-16 18:36:54 +01:00
196eafdc7f
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-16 15:59:16 +00:00
f62b04c3be
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:12:03 +00:00
d0a0a9ce7f
Fix URL preview string not being translated
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:33:23 -07:00
2c1618bc10
Fix conflict and update strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:40:51 +01:00
b0027525f3
Wire up Unknown Devices popup for outbound calls
2017-11-15 17:21:04 +00:00
f8fc6dc83e
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-15 12:11:33 +00:00
63919befd0
Catch call failures due to unknown devices
...
And show a specific dialog that you can then launch the UDD from
(although currently with a 'Send Anyway' button which makes little
sense for VoIP)
2017-11-15 10:49:29 +00:00
David Baker