Commit Graph

84 Commits

Author SHA1 Message Date
Travis Ralston
81ec75f81d Change warning message 2019-05-31 10:44:20 -06:00
Travis Ralston
48a634bff4 Use the user's pre-existing HS when config validation fails
Only applies if the user appears to be logged in. If the user is not logged in, we scream loudly.

This is a temporary measure for https://github.com/vector-im/riot-web/issues/9828

Fixes https://github.com/vector-im/riot-web/issues/9835
2019-05-29 12:07:31 -06:00
Travis Ralston
a5092dc763 Fix tests to use new server config options 2019-05-03 11:06:32 -06:00
Travis Ralston
bf97fd67b4 Handle cases of no default server 2019-05-03 11:06:32 -06:00
Travis Ralston
c8caf6797d Move bulk of discovery processing to react-sdk 2019-05-03 11:06:32 -06:00
Travis Ralston
f08491cee8 Validate default homeserver config before loading the app
Implements the process described here: https://github.com/vector-im/riot-web/issues/9290#issuecomment-481966910

The expectation is that later layers (like the react-sdk) will make use of the `validated_discovery_config` option instead of interpreting the config themselves.

We intentionally block the UI from loading here to avoid races between discovery and the app loading.
2019-05-03 11:06:32 -06:00
Bruno Windels
f22c02ecc6 update i18n 2019-02-01 20:00:13 +01:00
J. Ryan Stinnett
b0e4a9b08b Clean up Custom Server Help dialog 2019-01-28 21:04:38 -06:00
David Baker
8d88e3be11 Run i18n and prune i18n
Any translations added to components now in react-sdk should be
merged over to react-sdk in 196b855cd5
2018-04-20 15:53:35 +01:00
Matthew Hodgson
b8d4866824 run gen-i18n to refresh translations now most are moved to react-sdk 2018-04-15 23:22:06 +01:00
Luke Barnard
324774ec2f Reword the BugReportDialog.js as per @lampholder
See https://github.com/matrix-org/matrix-react-sdk/pull/1740#issuecomment-369597662
2018-03-20 10:52:50 +00:00
Luke Barnard
d23c02b196 gen-i18n 2018-02-28 18:19:12 +00:00
Luke Barnard
d47c9d8b6e Add context menu to TagPanel
See https://github.com/matrix-org/matrix-react-sdk/pull/1743
2018-02-12 18:02:55 +00:00
Luke Barnard
9d387c32a5
Merge pull request #5929 from vector-im/t3chguy/num_members_tooltip
T3chguy/num members tooltip
2018-01-22 22:21:50 +00:00
Matthew Hodgson
8855cc294e converge on 'noisy' to mean noisy notifs 2018-01-19 16:52:54 +00:00
Michael Telatynski
290bf54d4f pluralise properly
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-05 23:55:32 +00:00
Michael Telatynski
3788fde711 Add a tooltip to members button and badge with actual count
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-05 23:16:21 +00:00
Michael Telatynski
304d281ed2
change reply to be its own thing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-16 19:01:56 +00:00
Luke Barnard
cb235a29fa
Merge pull request #5613 from pafcu/simplify-translation
Refactor translations
2017-11-16 11:54:52 +00:00
Stefan Parviainen
4949f2f763 Fix typo and update strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:43:45 +01:00
Matthew Hodgson
3e72d8d969
Merge pull request #5286 from turt2live/travis/presence
CSS/components for custom presence controls
2017-11-14 23:53:26 +00:00
Michael Telatynski
6da2f88dc5
Devtools styling tweaks
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-30 13:32:31 +00:00
Michael Telatynski
ea9b630082
Refactor and add Account Data stuffs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-30 12:44:50 +00:00
Travis Ralston
6c796cd311 Re-add i18n post-merge
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:28:57 -06:00
David Baker
667556f3ce Custom server text was i18ned by key
And therefore got replaced by the key by the i18n script
2017-10-20 13:48:00 +01:00
Luke Barnard
e5df06b2ab Groups->Communities 2017-10-19 15:07:22 +01:00
David Baker
4e31aea402 Switch to gen-i18n script 2017-10-19 10:53:02 +01:00
Luke Barnard
102651332a Merge pull request #5295 from vector-im/luke/groups-room-directory-esque
CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475
2017-10-16 13:52:38 +02:00
Luke Barnard
12ebe91f83 "Add room..." -> "Add rooms..." 2017-10-16 11:53:35 +01:00
Travis Ralston
3e066d3aef Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:11:17 -06:00
Matthew Hodgson
2667ed2561 Merge pull request #4988 from vector-im/t3chguy/hide_notification_body
allow hiding of notification body for privacy reasons
2017-10-14 23:07:31 +01:00
Luke Barnard
ec414147d1 Merge pull request #5110 from pafcu/mark-and-remove-translations
Mark and remove some translations
2017-10-04 10:24:36 +01:00
Travis Ralston
b0190f6a65 i18n for remaining strings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:22:06 -06:00
Travis Ralston
efdb4b02c6 i18n for 'Jump to message' button
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:55:52 -06:00
Travis Ralston
774c3dbd38 Pin/unpin message option in a message's context menu
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:42:58 -06:00
Luke Barnard
888e3abc75 Implement "Add room to group" feature
This step needs to be taken before adding a room to a group summary
2017-09-26 14:35:38 +01:00
Stefan Parviainen
b424eea573 Remove unnecessary strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-23 17:02:26 +02:00
Matthew Hodgson
fbe1c82dfa Merge pull request #5074 from vector-im/t3chguy/devtools-1
T3chguy/devtools 1
2017-09-19 22:14:52 +01:00
Luke Barnard
fbcccd8be0 Merge pull request #4830 from vector-im/dbkr/group_userlist
Group Membership UI
2017-09-19 13:26:02 +01:00
Michael Telatynski
00976d9338
i18n new DevTools strings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-18 12:04:11 +01:00
David Baker
06fe240be2 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-09-13 16:35:37 +01:00
Michael Telatynski
fca86be077
allow hiding of notification body for privacy reasons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-06 10:56:32 +01:00
Michael Telatynski
3aa12246ea Merge branch 'develop' into t3chguy/devtools 2017-08-31 17:11:53 +01:00
Michael Telatynski
a2b57f502c
lets let people know that the bug report actually sent properly :)
RFC on the wording of it.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-28 00:07:48 +01:00
Michael Telatynski
a437f23e9d
add i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-26 18:48:24 +01:00
David Baker
57eb2feeb6 Make right panel collpasing work in GroupView 2017-08-15 13:18:16 +01:00
Richard van der Hoff
898725082a Remove spurious comma
I am messing this up - fix to 0bbce1c
2017-07-11 17:35:25 +01:00
Richard van der Hoff
0bbce1c140 Add missing i18n string
This should have been part of
https://github.com/vector-im/riot-web/pull/4557/files
2017-07-11 17:00:04 +01:00
Michael Telatynski
e33e0effa3 use _t on string literals and i18n 'warning'
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-22 15:05:13 +01:00
Michael Telatynski
0788826a71 Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	electron_app/src/tray.js
2017-06-22 15:04:33 +01:00