David Baker
8ccaf53d20
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-11-20 18:08:39 +00:00
David Baker
132408cf02
Add e2e backup recovery with passphrase
2018-11-20 16:16:24 +00:00
David Baker
fbab8ceeef
Passphrase based key backups
...
Add passphrase support to backup creation stage
2018-11-20 13:11:58 +00:00
Richard van der Hoff
c61031d3e1
Merge pull request #2279 from matrix-org/rav/sso_login_type
...
Support for m.login.sso
2018-11-19 14:14:21 +01:00
Travis Ralston
2408eeeb3d
Merge pull request #2277 from matrix-org/travis/terms-auth-improvements
...
Improve terms auth flow
2018-11-16 12:36:17 -07:00
David Baker
e112641524
Handle crypto db version upgrade
...
Display a dialog telling the user what the situation is with
options to sign out or continue withwout e2e.
Requires https://github.com/matrix-org/matrix-js-sdk/pull/785
2018-11-16 11:31:46 +00:00
Richard van der Hoff
90f22c7b43
Support for m.login.sso
...
Adds support for the m.login.sso login type, which is handled the same way as
CAS, and also makes it look a bit nicer.
2018-11-15 19:05:39 +00:00
Travis Ralston
2ffc024fab
Add a dedicated "Continue" button to the terms auth stage
...
The button itself is conditionally enabled because the ILAG dialog already has a continue button. It'd be confusing to users to have 2 continue buttons on the same dialog, so this commit adds the structure required to pass along clicks from the dialog's button down to the UI auth component.
The other place the continue button would appear is on the register page (not ILAG). The button's style is different here, however that will be improved in a later commit.
Part of https://github.com/vector-im/riot-web/issues/7700
2018-11-14 18:26:35 -07:00
Bruno Windels
3d42ea1c0a
use propper ellipsis character
2018-11-14 10:06:08 +01:00
Bruno Windels
e2c57ba2ef
add ... to translated string
2018-11-12 18:19:43 +01:00
J. Ryan Stinnett
975392cbbb
Add visible guest warning to encourage login
...
If you happen to get logged out, it might not be very clear what has happened
visually. This adds a visible warning to the top of the home page to suggest
logging in.
Fixes vector-im/riot-web#7629 .
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-11-06 21:08:57 +01:00
Bruno Windels
c19b593f5c
Merge branch 'develop' into experimental
2018-11-06 15:28:20 +01:00
Bruno Windels
2c039483c6
Merge branch 'develop' into experimental
2018-10-26 15:33:39 +02:00
Travis Ralston
9cdb527163
Merge branch 'develop' into travis/pinned-room-list
2018-10-25 10:57:08 -06:00
David Baker
b59b8b7fca
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-25 17:42:46 +01:00
Will Hunt
27a0f0ca62
Add i18n string
2018-10-24 18:16:55 +01:00
Will Hunt
44a41b589d
Comma on strings and styling button
2018-10-24 17:50:27 +01:00
Will Hunt
06c34cff9c
Add devtools string
2018-10-24 17:37:13 +01:00
Aaron Raimist
92bfb42784
Use one string instead of two
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-23 13:11:36 -05:00
Aaron Raimist
a6c78ace4f
Add warning when administrator leaves community
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-23 12:25:12 -05:00
Travis Ralston
0030ba7015
Support .well-known discovery
...
Fixes https://github.com/vector-im/riot-web/issues/7253
2018-10-18 16:42:54 -06:00
Travis Ralston
af8dfda9a7
Add a bit of text to explain the purpose of the RoomPreviewSpinner
...
Fixes https://github.com/vector-im/riot-web/issues/5869
2018-10-17 13:53:12 -06:00
Bruno Windels
b7c05d8dec
Merge pull request #2216 from matrix-org/bwindels/stickersi18nfix
...
add missing sticker translation
2018-10-17 14:15:18 +00:00
Will Hunt
67d39a40d3
Sneaky ,
2018-10-16 11:26:04 +01:00
Bruno Windels
6878ce3c6a
Merge branch 'develop' into bwindels/redesign
2018-10-16 11:57:44 +02:00
Travis Ralston
d87ab8aac0
Support m.login.terms during registration
...
Fixes https://github.com/vector-im/riot-web/issues/7168
Requires https://github.com/matrix-org/synapse/pull/4004
2018-10-15 16:39:59 -06:00
Will Hunt
5a72a5863f
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
2018-10-15 19:20:55 +01:00
Bruno Windels
127fcf58a9
add missing sticker translation
2018-10-15 13:57:06 +02:00
Travis Ralston
103ed71eb5
Merge branch 'develop' into travis/pinned-room-list
2018-10-12 14:09:52 -06:00
Bruno Windels
48299bb154
show warning when LL is disabled but was enabled before
2018-10-08 15:28:00 +02:00
David Baker
fa30707eae
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-02 16:59:15 +01:00
Matthew Hodgson
bccfb5dafc
better englishing
2018-10-01 13:27:32 +01:00
David Baker
3751074244
Merge pull request #2180 from matrix-org/travis/3pid-required
...
Communicate early that a 3pid is required during registration if needed
2018-10-01 11:55:53 +01:00
Matthew Hodgson
6652d2b0e6
try to encourage people to attach logs to bugs
2018-09-28 21:05:05 +01:00
Travis Ralston
de132a8f8e
Communicate early that a 3pid is required during registration if needed
...
Fixes https://github.com/vector-im/riot-web/issues/7297
2018-09-27 11:53:45 -06:00
Bruno Windels
e0c5b0d5ed
translations
2018-09-26 17:23:51 +01:00
Bruno Windels
91ec96c8d3
Merge branch 'develop' into bwindels/redesign
2018-09-21 12:44:44 +02:00
Matthew Hodgson
1157320cba
s/canonical address/main address/g for consistency
2018-09-20 11:41:59 +01:00
Matthew Hodgson
c6fa8ea24c
show canonical aliases in timeline, and set/remove implicit ones
2018-09-20 01:07:01 +01:00
Matthew Hodgson
fc81dbbfad
remove i18n used by RoomAliasesEvent
2018-09-17 22:40:00 +01:00
Matthew Hodgson
dc7212ec2b
switch back to simple TextForEvent
...
I haven't found anyone who can justify to me why we need
more complicated plurals for i18n (even in Polish) for
%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.
2018-09-17 18:20:12 +01:00
David Baker
12d10cccef
Show if sig is from this device
2018-09-17 17:14:03 +01:00
David Baker
f507aac3d5
Show if recovery key is valid
2018-09-17 17:05:29 +01:00
David Baker
9a65e6817a
Support restoring key backup
2018-09-17 16:00:23 +01:00
Matthew Hodgson
003083d9fc
fix plurals
2018-09-16 20:19:02 +01:00
Matthew Hodgson
a4b7348703
fix merge on i18n again
2018-09-16 19:11:11 +01:00
Matthew Hodgson
599697ca2f
fix merge on i18n
2018-09-16 19:08:31 +01:00
Matthew Hodgson
3b868064c7
merge in develop
2018-09-16 19:06:52 +01:00
David Baker
d94553bafc
UI for whether the key backup is enabled or not
2018-09-14 17:08:02 +01:00
David Baker
292b1f09af
WIP e2e key backups
...
Continues from Matthew's work: adds a feature flag & panel in
user settings to create a backup.
Can't restore a backup yet, nor even continue backing up to the same
backup after a refresh.
2018-09-13 17:11:46 +01:00
David Baker
fa669bf096
Error on splash screen if sync is failing
...
Display an error on the splash screen with the spinner if the sync
request is not working, rather than just sitting there with a spinner
as if nothing is wrong.
Fixes https://github.com/vector-im/riot-web/issues/7148
2018-09-07 12:18:25 +01:00
David Baker
a042f4d0af
Do full registration if HS doesn't support ILAG
...
ILAG only works on HSes that allow registering without an email
address, so whenever we redirect to the ILAG flow, check what
registration flows the server supports, and if it doesn't offer one
that's ILAG-compatible, prompt the user to go through the full
registration process instead.
This doesn't change all the entry points into ILAG, I'll do that
in a separate commit.
2018-09-05 17:07:39 +01:00
David Baker
d9fb88246a
Merge pull request #2140 from matrix-org/dbkr/discardsession
...
Slash command to discard megolm session
2018-08-30 18:25:56 +01:00
David Baker
2c1ba6f104
Merge pull request #2124 from matrix-org/dbkr/tombstone
...
Support m.room.tombstone events
2018-08-29 18:38:48 +01:00
David Baker
c40ac49b2a
Merge remote-tracking branch 'origin/develop' into dbkr/roomcreate
2018-08-29 18:18:08 +01:00
David Baker
63938a3f9f
Slash command to discard megolm session
...
For faster crypto debugging
Requires https://github.com/matrix-org/matrix-js-sdk/pull/704
2018-08-29 18:09:37 +01:00
David Baker
bd0a9cf3a0
Merge remote-tracking branch 'origin/develop' into dbkr/room_upgrade
2018-08-29 15:51:07 +01:00
David Baker
c03abddd1c
s/terms and conditions/legal/
2018-08-24 11:38:38 +01:00
David Baker
941a3cfa53
Support M_INCOMPATIBLE_ROOM_VERSION
...
For https://github.com/vector-im/riot-web/issues/7164
2018-08-21 18:33:25 +01:00
David Baker
7f8cd203a8
Support m.room.tombstone events
...
For https://github.com/vector-im/riot-web/issues/7164
2018-08-21 15:56:56 +01:00
David Baker
ab10b5493b
Support room creation events
...
For https://github.com/vector-im/riot-web/issues/7164
2018-08-20 16:20:59 +01:00
David Baker
9f19896df0
Support for room upgrades
...
* Show when a room upgrade is needed
* Dialog box to perform the upgrade
2018-08-17 14:54:43 +01:00
Bruno Windels
cead4096d8
Merge pull request #2118 from matrix-org/bwindels/feature_lazyloading
...
Lazy loading of room members
2018-08-16 18:14:55 +02:00
David Baker
8567ce585b
Factor out duplication of resource limit i18n
2018-08-16 13:31:17 +01:00
David Baker
9bde468e30
Shift to M_RESOURCE_LIMIT_EXCEEDED errors
...
With support for admin_contact and limit_type fields
For https://github.com/vector-im/riot-web/issues/7091
2018-08-15 17:03:54 +01:00
David Baker
f20920718a
Show room version number in room settings
...
Also change wording of the Room ID bit to match
Requires https://github.com/matrix-org/matrix-js-sdk/pull/689
For https://github.com/vector-im/riot-web/issues/7164
2018-08-14 14:28:30 +01:00
Bruno Windels
7dc92fe917
Avoid clearing e2e encryption keys, also avoid warning
2018-08-13 17:24:27 +02:00
Bruno Windels
84b74247e6
check if server supports lazy loading before enabling
2018-08-13 16:19:44 +02:00
Bruno Windels
94c424d3bb
translations
2018-08-13 11:24:32 +02:00
David Baker
6593ee09d1
Warning bar for MAU limit hit
...
Somewhat untested, sorry
2018-08-07 17:04:37 +01:00
David Baker
b5ce1ac5e1
Recognise server notices room(s)
...
and put them in their own section at the bottom
2018-08-06 18:00:40 +01:00
Matthew Hodgson
4fbf34e05b
Merge branch 'develop' into matthew/dharma
2018-08-03 17:15:00 -07:00
David Baker
b5d2fa769c
Support MAU error on sync
...
For https://github.com/vector-im/riot-web/issues/7091
2018-08-03 14:54:52 +01:00
David Baker
bc1d359398
Merge pull request #2106 from matrix-org/dbkr/chairman_mau_pt_2_message_send
...
Support active user limit on message send
2018-08-03 13:14:18 +01:00
David Baker
02019a58b3
Support active user limit on message send
...
For https://github.com/vector-im/riot-web/issues/7091
2018-08-02 17:09:04 +01:00
David Baker
cc58b06226
Support montly active user limit error on /login
...
The 'contact your service administrator' should be a link but we
don't have this info from the HS yet.
2018-08-02 14:25:17 +01:00
Matthew Hodgson
9783b6100d
Merge branch 'develop' into matthew/dharma
2018-07-29 17:03:23 +01:00
David Baker
7aab6fa6f1
Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo
2018-07-18 09:35:57 +01:00
Bruno Windels
0a432dfb8f
Merge pull request #2063 from matrix-org/dbkr/jitsi_check_scalar_first
...
Jitsi: Check integrations server before call
2018-07-17 17:46:53 +01:00
David Baker
850a4d8ec5
Jitsi: Check integrations server before call
2018-07-16 16:54:25 +01:00
David Baker
19f0617052
Jitsi: Error message on no permission
...
Fixes https://github.com/vector-im/riot-web/issues/7007
2018-07-16 15:41:03 +01:00
David Baker
d16ac4d80c
Merge pull request #1890 from matrix-org/matthew/slate
...
Replace Draft with Slate
2018-07-16 14:16:25 +01:00
David Baker
4c6419a3c5
Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo
2018-07-16 13:24:13 +01:00
Michael Telatynski
95909de446
fix MessageComposer not marking translatable strings. run gen-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-11 11:39:55 +01:00
Bruno Windels
3e14cd2190
Merge pull request #2024 from matrix-org/t3chguy/improve_eventtile_error_handling
...
fix nullguard on EventTile, getComponent never returns falsey, it throws
2018-07-11 09:12:49 +01:00
Matthew Hodgson
02c6f3d168
fix typo
2018-07-10 15:18:07 +01:00
Michael Telatynski
168edbca16
Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist
2018-07-04 11:21:16 +01:00
David Baker
c665ab8a22
Add error dialog if widget remove fails
...
Also up the timeout because matrix.org is that slow
2018-07-03 11:55:41 +01:00
David Baker
9d41b87678
i18n
2018-07-03 11:27:15 +01:00
David Baker
8b64ddcbe8
Do some level of local echo for widgets
...
* Show a spinner while we wait for widgets to be deleted
* Hide widgets while they're pending deletion
* Don't put another jitsi widget into the room if there's already
one pending
2018-07-03 11:16:44 +01:00
Michael Telatynski
7225f7372c
Revert " make click to insert nick work on join/parts, /me's etc"
2018-07-03 10:30:08 +01:00
David Baker
34f6134595
Merge pull request #1974 from matrix-org/t3chguy/warn_self_mute
...
warn on self-mute
2018-07-02 10:13:49 +01:00
Michael Telatynski
1b003ca39f
gen-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-30 17:07:35 +01:00
Michael Telatynski
ea6e1b6f72
Merge branch 'develop' into t3chguy/warn_self_mute
2018-06-29 19:17:43 +01:00
Michael Telatynski
85a0736c78
update wording as per D4ve's feedback
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-29 19:16:56 +01:00
Michael Telatynski
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
Michael Telatynski
f9b3e40bfa
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-29 12:54:54 +01:00
Luke Barnard
8be173cae3
Show nicer error when receiving a consent error after sending a message
2018-06-27 15:17:57 +01:00
David Baker
67dc8f2a8e
Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist
...
fix historical section
2018-06-26 18:26:29 +01:00
Michael Telatynski
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
Michael Telatynski
cdf7101222
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 07:46:48 +01:00
David Baker
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
Michael Telatynski
de316134a9
Merge branch 'develop' into t3chguy/login_local_error
2018-06-25 13:35:14 +01:00
David Baker
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
Michael Telatynski
8251de4e35
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-23 17:26:44 +01:00
Will Hunt
c99f5c0df8
Check upload limits before trying to upload large files
2018-06-23 13:00:56 +01:00
Michael Telatynski
d4f9fec707
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 18:48:48 +01:00
David Baker
6252f5b818
Merge remote-tracking branch 'origin/develop' into dbkr/jitsi_makewidget
2018-06-22 11:31:54 +01:00
David Baker
e5a509bb91
i18n & prunei18n
2018-06-20 10:04:03 +01:00
David Baker
0e8b4ac2ad
i18n & prunei18n
2018-06-20 10:01:09 +01:00
David Baker
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
David Baker
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group
...
Share Dialog
2018-06-15 10:52:27 +01:00
Michael Telatynski
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
Michael Telatynski
e1d3c2e4c7
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:36:39 +01:00
Michael Telatynski
2454540bc0
Merge branch 'develop' into t3chguy/audio_output
2018-06-14 11:03:59 +01:00
Michael Telatynski
ac77b2d9ec
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 16:00:57 +01:00
David Baker
13d52065f5
Merge branch 'release-v0.12.7'
2018-06-12 14:23:48 +01:00
Michael Telatynski
f9b3f0f9d1
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:02 +01:00
Travis Ralston
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
Travis Ralston
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
Travis Ralston
52cdf60954
Add options to pin unread/mentioned rooms to the top of the room list
...
Fixes https://github.com/vector-im/riot-web/issues/6604
Fixes https://github.com/vector-im/riot-web/issues/732
Fixes https://github.com/vector-im/riot-web/issues/1104
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 20:29:35 -06:00
Michael Telatynski
689b00c618
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-26 17:24:07 +01:00
Matthew Hodgson
3bf28a08ec
experiments in dharma
2018-05-25 03:17:29 +01:00
Richard Lewis
b2c26e6984
Merge pull request #1920 from matrix-org/rxl881/refreshWidget
...
Add a "reload widget" button.
2018-05-24 18:11:22 +01:00
Luke Barnard
033b110f5f
Merge pull request #1929 from matrix-org/luke/cookie-bar-update
...
Cookie bar update
2018-05-24 17:19:05 +01:00
David Baker
168b956b3c
homeserver
2018-05-24 17:01:00 +01:00
Luke Barnard
fd8d501732
Update cookie bar wording
2018-05-24 16:58:14 +01:00
David Baker
9d2f223773
Message for leaving server notices room
2018-05-24 16:54:48 +01:00
Luke Barnard
aae89efa01
Add usage data link to cookie bar
...
this opens the analytics modal
2018-05-24 12:47:27 +01:00
Luke Barnard
6f77b8ae26
Modify showDetailsModal to give examples if analytics is not enabled
2018-05-24 12:46:06 +01:00
Luke Barnard
8dcf43a88d
gen-i18n
2018-05-24 12:08:05 +01:00
Luke Barnard
dca1217a45
Change wording and appearance of Deactivate Account dialog
2018-05-24 11:50:45 +01:00
Luke Barnard
b124989968
Implement erasure option upon deactivation
2018-05-23 16:33:32 +01:00
Luke Barnard
ef686a966d
Add cookie warning to widget warning (AppPermission)
2018-05-23 10:46:32 +01:00
Luke Barnard
c1a42637e7
Merge pull request #1919 from matrix-org/luke/consent-dialog
...
Terms and Conditions dialog
2018-05-23 10:17:14 +01:00
Richard Lewis
975332633b
Translation.
2018-05-23 00:26:55 +01:00
Luke Barnard
658e88c30f
Implement consent/terms and conditions dialog for /_matrix/consent flow
2018-05-22 18:03:56 +01:00
Luke Barnard
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
Luke Barnard
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
Luke Barnard
aa4bbbc3db
Remove cookie bar setting from UserSettings
2018-05-16 15:20:38 +01:00
Luke Barnard
ac1cd384e7
Implement opt-in analytics with cookie bar
2018-05-16 15:20:38 +01:00
David Baker
9d5ba25131
oh, sendError does support sending the error
2018-05-15 15:19:28 +01:00
David Baker
7bfe84f8be
Catch errors adding widget
2018-05-15 14:53:49 +01:00
Michael Telatynski
06e1acdf04
run i18n-gen and i18n-prune
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-14 16:11:42 +01:00
Travis Ralston
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
Michael Telatynski
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
Luke Barnard
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
David Baker
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
David Baker
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
Luke Barnard
ff4909e6ab
Merge branch 'develop' into luke/fix-piwik-page-url-reporting
2018-04-26 11:03:55 +01:00
Luke Barnard
0614ef6abe
i18n
...
for new anayltics modal redesign
2018-04-26 11:00:50 +01:00
Richard Lewis
0f0e89d394
Add a button to 'pop out' widgets in to their own tab.
2018-04-25 12:49:30 +01:00
David Baker
80837a9199
s/contian/contain/g
...
Fixes https://github.com/vector-im/riot-web/issues/6565
2018-04-24 17:53:23 +01:00
Eric Newport
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
David Baker
6154c13c95
Re-run npm run i18n
2018-04-20 15:35:31 +01:00
Michael Telatynski
7e8288f7ae
i18n-gen, i18n-prune
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-20 09:39:14 +01:00
Michael Telatynski
58cd585e86
start of BigMerge fixup
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-20 09:12:02 +01:00
Matthew Hodgson
4da804fd64
Merge branch 'develop' into matthew/fix_layering
2018-04-15 23:59:09 +01:00
Matthew Hodgson
faa1924902
run gen-i18n to normalise en_EN and remove stuff still in vector-web
2018-04-15 23:18:18 +01:00
Matthew Hodgson
a30fdaf293
copy all the i18n over from vector-web via copy-i18n.py
2018-04-15 23:00:38 +01:00
Michael Telatynski
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
Michael Telatynski
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
Travis Ralston
fe2cbc584d
Merge branch 'develop' into travis/remove-presence
2018-04-11 15:17:28 -06:00
Luke Barnard
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
Michael Telatynski
4081321733
run i18n prune and gen
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-04 11:19:28 +01:00
Michael Telatynski
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
Richard Lewis
f8f8bc469e
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot
2018-04-03 11:34:14 +01:00
Richard Lewis
b109c9304c
Put stickers behind labs flag.
2018-04-02 22:24:46 +01:00
Michael Telatynski
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
Richard Lewis
6181ca642f
"Stickerpack" translation.
2018-03-29 17:47:53 +01:00
Luke Barnard
e9193ff0b6
Merge branch 'develop' into luke/feature-group-set-joinable
2018-03-29 17:01:19 +01:00
Luke Barnard
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
Luke Barnard
1226ad3330
Merge pull request #1815 from matrix-org/luke/feature-group-join
...
Join this community button
2018-03-29 15:44:46 +01:00
Luke Barnard
c4322892de
Reword group setting delay
2018-03-29 14:33:54 +01:00
Luke Barnard
2dea5cd233
run gen-i18n
2018-03-29 12:39:21 +01:00
Michael Telatynski
fac89d9c58
Merge branch 'develop' into t3chguy/m.relates_to
2018-03-28 08:38:33 +00:00
Michael Telatynski
b5ed08eba2
Merge
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-24 17:52:49 +00:00
Aidan Gauland
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
Aidan Gauland
7e1913ef3c
Merge branch 'develop' into show-display-name-in-receipts
2018-03-23 15:51:10 +13:00
David Baker
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
David Baker
580b68a1b6
Merge pull request #1652 from pvagner/dialog-a11y
...
Dialog a11y
2018-03-20 11:35:57 +00:00
Luke Barnard
0c125b3dff
Merge branch 'develop' into luke/submit-debug-logs
2018-03-19 14:55:28 +00:00
Luke Barnard
aed7c2039d
Update debug logs submission explanation
2018-03-19 14:54:50 +00:00
David Baker
00f6deeb46
gen/prune i18n
2018-03-15 12:03:00 +00:00
Luke Barnard
bc5699b3d7
Add change delay warning in GroupView settings
2018-03-14 18:17:15 +00:00
Luke Barnard
a1d0cf65d6
Fix missing space between "...is a" and user ID
2018-03-08 16:34:19 +00:00
Luke Barnard
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
Richard Lewis
e2cedbe9d7
Pull in changes from develop
2018-03-05 16:43:59 +00:00
Michael Telatynski
df56a67fda
Add reply fallback and run gen-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-04 12:39:34 +00:00
Luke Barnard
f29918b766
gen-i18n
2018-02-28 18:18:59 +00:00
Michael Telatynski
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
Luke Barnard
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
Richard Lewis
b2bf4d4709
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot
2018-02-23 15:37:33 +00:00
Luke Barnard
ff868691c9
Only show "X" when filtering, add alt/title
2018-02-21 17:15:43 +00:00
Luke Barnard
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
Aidan Gauland
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
Michael Telatynski
7425d01b21
tidy, improve error handling and improve Replies, run gen-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-10 15:45:42 +00:00
Luke Barnard
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
Peter Vágner
14991afbe5
Merge branch 'develop' into dialog-a11y
2018-02-06 23:04:15 +01:00
David Baker
f1eb899cad
Re-run i18n script & prune
2018-02-06 10:26:37 +00:00
Richard Lewis
29962ed89d
Add stickerpack strings.
2018-02-05 11:48:48 +00:00
David Baker
ebfdd7c718
Merge pull request #1715 from matrix-org/t3chguy/rich_quoting_linear
...
Linear Rich Quoting
2018-01-24 18:53:29 +01:00
Luke Barnard
f013ffd068
Merge pull request #1714 from matrix-org/t3chguy/group_create_dialog_fixes
...
Fix CreateGroupDialog issues
2018-01-22 17:57:40 +00:00
Michael Telatynski
4490715b60
Merge branch 'develop' into t3chguy/rich_quoting_linear
2018-01-22 16:46:20 +00:00
Michael Telatynski
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
Richard Lewis
0441487e97
Manage sticker packs link and add comments
2018-01-22 17:00:50 +01:00
Matthew Hodgson
02824cfacf
fix i18n for show devices prompt
2018-01-22 12:16:11 +01:00
Michael Telatynski
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
Michael Telatynski
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
Will Hunt
5206c9d18b
Show a warning if the user attempts to leave a room that is invite only
2018-01-19 22:52:43 +00:00
Michael Telatynski
b526fc057c
Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep
2018-01-14 18:32:17 +00:00
David Baker
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
David Baker
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
Michael Telatynski
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
Michael Telatynski
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
9dd9a5be4b
Wording tweak
2018-01-09 17:59:49 +00:00
Richard Lewis
6b0b25c2d2
Translations
2018-01-09 16:01:53 +00:00
David Baker
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
Michael Telatynski
d0897dc8f3
update wording to not imply exhaustiveness
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-08 13:29:27 +00:00
David Baker
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
Michael Telatynski
be48460595
Singularise unsent message prompt, if applicable
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-04 15:05:08 +00:00
Michael Telatynski
f67d405732
small refactor && warn on self-demotion
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-02 23:15:36 +00:00
Travis Ralston
cc5eb77658
Remove presence management
...
The feature is incredibly buggy and doesn't work as expected due to server behaviour and client interaction. One of the major problems is the constantly confused presence state - this is caused by the mobile apps conflicting on the state of the web app, causing it to consider the user offline or online (and rarely away) depending on how riot-android/ios is behaving at the time.
This reverts two PRs:
* https://github.com/matrix-org/matrix-react-sdk/pull/1620
* https://github.com/matrix-org/matrix-react-sdk/pull/1482
The changes to the context menu positioning were not reverted as they are useful outside of presence management.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-12-25 14:25:13 -07:00
Michael Telatynski
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
Michael Telatynski
9603b21199
s/Quote/Reply/ and ES6 tweaks
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-17 20:20:45 +00:00
Michael Telatynski
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
Michael Telatynski
4043ea7d57
change CSS classes and i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-15 17:57:24 +00:00
Peter Vágner
9f5857a7cc
Merge branch 'develop' into dialog-a11y
2017-12-14 11:04:59 +01:00
David Baker
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
David Baker
ab2fcfb388
re-run the fun^w^wnpm run i18n
2017-12-08 16:36:30 +00:00
David Baker
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
David Baker
65c210cdde
Warn when migrating e2e data to indexeddb
2017-12-06 15:28:20 +00:00
Peter Vágner
802abe7091
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
2017-12-06 11:07:01 +01:00
Peter Vágner
9146fde308
Add a missing language string
2017-12-05 23:48:42 +01:00
Luke Barnard
7118f7a38f
gen-18n
2017-11-29 18:41:08 +00:00
Luke Barnard
1c71983610
Implement UI for using bulk device deletion API
2017-11-28 15:32:40 +00:00
David Baker
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
Luke Barnard
d4f5e7e6d7
Deal with errors, lack of groups, loading
2017-11-28 10:46:20 +00:00
Richard van der Hoff
8be3862e68
Merge branch 'master' into develop
2017-11-28 10:29:40 +00:00
lukebarnard
9ed9422af8
Move group publication toggles to UserSettings
2017-11-27 17:24:42 +00:00
Richard van der Hoff
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
David Baker
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
lukebarnard
3635997090
Rename Related Groups to improve readability
2017-11-27 14:13:44 +00:00
Michael Telatynski
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
Peter Vágner
093f110199
Make the toggle button on the memberEventListSummary translatable
2017-11-18 17:48:57 +01:00
Peter Vágner
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
David Baker
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
Stefan Parviainen
df921438f3
Make PresenceLabel more easily translatable
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-16 18:36:54 +01:00
David Baker
196eafdc7f
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-16 15:59:16 +00:00
Matthew Hodgson
f62b04c3be
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:12:03 +00:00
Travis Ralston
d0a0a9ce7f
Fix URL preview string not being translated
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:33:23 -07:00
Stefan Parviainen
2c1618bc10
Fix conflict and update strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:40:51 +01:00
David Baker
b0027525f3
Wire up Unknown Devices popup for outbound calls
2017-11-15 17:21:04 +00:00
David Baker
f8fc6dc83e
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-15 12:11:33 +00:00
David Baker
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
Travis Ralston
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
Matthew Hodgson
f05958e334
Merge pull request #1482 from turt2live/travis/presence
...
Implement user-controlled presence
2017-11-14 23:53:16 +00:00
Luke Barnard
12d9f05883
Merge branch 'develop' into luke/fix-restrict-power-level-options
2017-11-14 13:08:31 +00:00
Luke Barnard
c3492634bd
Merge branch 'luke/fix-member-info-power-level-display' into luke/fix-restrict-power-level-options
2017-11-14 12:41:36 +00:00
Travis Ralston
63bebe9dfd
Split out avatar and display name hiding
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 12:58:10 -07:00
Travis Ralston
0648b3eae7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:29:36 -07:00
Luke Barnard
52af7a7659
Attempt to clarify the affect that the users_default has on power levels
...
This modifies displayed power levels such that:
- If users_default is !== 0:
- the power level 0 is displayed as "Restricted (0)"
- the power level users_default is displayed as "Default ({users_default})"
- Otherwise:
- the power level 0 is displayed as "Default (0)"
When changing users_default, to say, 10, when the textual powers are rendered
again, they will take users_default into account. So those previously at 10
and which would have previously have been rendered "Custom of 10" will now
read "Default (10)". Conversely, those that were "Default (0)" will now read
"Restricted (0)".
2017-11-13 17:03:48 +00:00
Matthew Hodgson
2827bc0718
replace some of the status.im theme with general config options
2017-11-11 23:46:43 +00:00
Peter Vágner
681f43913a
Make the disabled PowerSelector element showing custom value translatable. Fixes #5547
2017-11-10 11:26:53 +01:00
David Baker
820d9c1c25
Show staus bar on Unknown Device Error
...
Don't pop up the dialog as soon as we can't send a message.
Also removes dispatches used to keep the RoomStatusBar up to date.
We can get the same events straight from the js-sdk via the
pending events event.
2017-11-09 15:58:15 +00:00
Travis Ralston
030633fa90
Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings
2017-11-08 17:43:38 -07:00
Matthew Hodgson
e729bc431d
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-08 04:29:52 -08:00
Peter Vágner
1e7fc953b3
Ooops, also add the string to the default language file.
2017-11-08 11:56:30 +01:00
Luke Barnard
4c47f75918
Merge pull request #1587 from matrix-org/luke/groups-add-rooms-with-visibility
...
Add checkbox to GroupAddressPicker for determining visibility of group rooms
2017-11-08 10:04:41 +00:00
Travis Ralston
289b0c2b6a
Merge branch 'develop' into travis/granular-settings
2017-11-07 14:55:12 -07:00
Luke Barnard
8fbe50a1cf
Merge pull request #1580 from matrix-org/luke/groups-new-group-settings
...
Improve group creation UX
2017-11-07 18:55:34 +00:00
Luke Barnard
edc744067f
Add checkbox to GroupAddressPicker for determining visibility of group rooms
2017-11-07 18:51:41 +00:00
Luke Barnard
62305a1ccd
Implement tooltip for group rooms
2017-11-07 14:07:31 +00:00
Luke Barnard
9019fee49e
Adjust long desc placeholder text
2017-11-07 10:48:56 +00:00
Luke Barnard
477051cfa6
Add placeholder for when a long desc hasn't been set
...
this is only visible to group admins.
2017-11-06 18:35:52 +00:00
Luke Barnard
137f1311b3
Add useful placeholder for the long description textarea
2017-11-06 18:35:23 +00:00
Travis Ralston
893c39bfbe
Merge branch 'develop' into travis/granular-settings
2017-11-03 22:00:07 -06:00
Matthew Hodgson
6747390333
merge
2017-11-03 15:12:24 +00:00
David Baker
49ee78dab1
Merge remote-tracking branch 'origin/develop' into dbkr/composer_at_room_pills
2017-11-03 14:39:52 +00:00
Luke Barnard
151f9917b1
Fix group invites such that they look similar to room invites
...
- Change GroupInviteTile to use RoomTile CSS
- Give group invites their own sub list, with heading "Community Invites"
2017-11-03 12:19:37 +00:00
David Baker
112c74a255
Add NotifProvider to offer @room as a completion
2017-11-02 18:54:25 +00:00
Luke Barnard
982e87e01c
Communities are communities, wrap div for label alignment
2017-11-02 15:04:40 +00:00
Luke Barnard
bf77b51b5e
Merge branch 'develop' into luke/groups-room-publicity
2017-11-02 13:39:33 +00:00
Luke Barnard
790db94fd7
Add toggle to alter the visibility of a room-group association
2017-11-02 13:31:11 +00:00
Luke Barnard
e909d859ab
Merge branch 'develop' into luke/groups-room-info
2017-11-02 10:56:33 +00:00
Luke Barnard
80f79e6b84
Generate translations
2017-11-01 17:58:45 +00:00
Matthew Hodgson
64d8c81897
Merge branch 'develop' into matthew/status
2017-11-01 15:24:30 +00:00
Stefan Parviainen
d6f1e12bee
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 15:50:45 +01:00
Luke Barnard
f53a12d904
Generate en_EN translations
2017-10-31 10:25:48 +00:00
Travis Ralston
f44622b3d8
i18n for URL previews
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 21:50:22 -06:00
David Baker
858c3a2548
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-10-27 18:59:57 +01:00
Stefan Parviainen
95b2392104
Merge branch 'develop' into departify
2017-10-27 19:23:13 +02:00
Michael Telatynski
1d5b4a9d50
Merge branch 'develop' into t3chguy/mention_user
2017-10-26 18:10:10 +01:00
Luke Barnard
eec6ed36cd
Use correct icon for group room deletion and make themeable
...
Also fix cancel icons to have class mx_filterFlipColor
2017-10-26 14:05:58 +01:00
David Baker
5871a74228
Merge pull request #1534 from matrix-org/t3chguy/invite_in_memberinfo
...
Add invite button to MemberInfo if user has left or wasn't in room
2017-10-26 11:35:45 +01:00
Matthew Hodgson
5c32b5b11a
fix i18n
2017-10-26 02:10:03 +01:00
Matthew Hodgson
1237de3ef0
Merge branch 'develop' into matthew/status
2017-10-26 01:47:22 +01:00
Travis Ralston
24000ee456
Re-add i18n for labs
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:23:04 -06:00
Luke Barnard
3ae97348f8
Add option to mirror local video feed
2017-10-25 18:17:33 +01:00
Luke Barnard
cedc0b27a9
Handle redaction with no sender
2017-10-25 17:37:20 +01:00
Stefan Parviainen
53e983f9c7
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-25 18:19:27 +02:00
Michael Telatynski
fd7e057ec0
Merge branch 'develop' into t3chguy/invite_in_memberinfo
2017-10-25 16:33:50 +01:00
Richard Lewis
fd85c74bc5
Merge pull request #1520 from matrix-org/rxl881/deleteWidget
...
Add a delete confirmation dialog for widgets
2017-10-25 10:45:52 +01:00
Michael Telatynski
b3463146ba
Add invite button to MemberInfo if user has left or wasn't in room
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-25 01:00:13 +01:00
Michael Telatynski
5514d81683
Add Mention button to MemberInfo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 23:01:40 +01:00
Stefan Parviainen
bc034f3083
Update strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-24 19:34:32 +02:00
David Baker
8447d15013
Don't include the |other in the translation value
2017-10-24 14:26:30 +01:00
David Baker
f9c45d2c45
Re-run gen-i18n after fixing https://github.com/matrix-org/matrix-react-sdk/pull/1521
2017-10-24 13:40:44 +01:00
Richard Lewis
11d4a63a32
Update text and split across multiple lines.
2017-10-23 23:59:36 +01:00
Richard Lewis
ee60155846
Add delete widget confirmation dialog.
2017-10-23 17:05:44 +01:00
Luke Barnard
a133fd1cf4
Fix "failed to create community" message
2017-10-23 14:57:40 +01:00
Matthew Hodgson
f09fbccc19
WIP
2017-10-23 00:56:15 +01:00
Luke Barnard
1a7710c192
Adjust wording on placeholder
2017-10-20 18:10:14 +01:00
Luke Barnard
a0e218d107
Add placeholder to MyGroups page, adjust CSS classes
...
- This is part of a general improvement in the look of MyGroups
- Wording on "Create a community to..." modified to not have the word "community" twice
2017-10-20 17:38:02 +01:00
David Baker
f829012045
Fix creation of DM rooms
...
The check on whether a new chat was being started as a DM room got
broken, so we weren't using the trusted_private_chat preset or
setting the appropriate DM flags.
Fixes https://github.com/vector-im/riot-web/issues/5318 and
probably https://github.com/vector-im/riot-web/issues/3987
2017-10-20 10:16:51 +01:00
Luke Barnard
a85a011db9
Fix faulty translation in GroupView
2017-10-19 18:06:32 +01:00
Luke Barnard
d4aac4a69c
Merge pull request #1507 from matrix-org/dbkr/groupid_only_enter_localpart
...
Group create dialog: only enter localpart
2017-10-19 17:37:56 +01:00
Luke Barnard
877f213057
Merge pull request #1509 from matrix-org/luke/groups-my-groups
...
Improve MyGroups UI
2017-10-19 17:35:48 +01:00
Luke Barnard
b0f8619754
Improve MyGroups UI
...
as per design layed out by @tur2live!
2017-10-19 17:24:45 +01:00
David Baker
b9574ff382
Group create dialog: only enter localpart
...
Since we currently can only create groups on the local server anyway,
there's no point making the user jump through the hoop of forming the
whole group ID and telling them off if they got the server name wrong.
2017-10-19 16:47:43 +01:00
David Baker
4abaa93cf0
Add clientside error for non-alphanumeric group ID
2017-10-19 16:28:02 +01:00
David Baker
f98fe7fa87
Add warning when adding group rooms/users
2017-10-19 15:37:35 +01:00
Luke Barnard
2be0ebdd1d
More Groups->Communities
2017-10-19 15:01:16 +01:00
Luke Barnard
bafa2c6be0
Fix typo
2017-10-19 12:03:59 +01:00
Luke Barnard
2db0eab5c5
s/Groups/Communities
2017-10-19 11:29:03 +01:00
David Baker
12d6722265
Re-run the fun
2017-10-18 15:48:33 +01:00
Luke Barnard
49b7525a67
Actually move the buttons in GroupView
...
- The "Leave" button is now in the top-right
- The "Publish" button is not a checkbox
2017-10-17 16:10:34 +01:00
David Baker
e4a3309752
Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque
...
Modify GroupView UI
2017-10-16 10:17:44 +01:00
Matthew Hodgson
2b367edccf
Merge pull request #1439 from turt2live/travis/pinned_messages
...
Message/event pinning
2017-10-15 01:03:18 +01:00
Matthew Hodgson
e57d9e686b
Merge branch 'develop' into t3chguy/jump_to_rr
2017-10-14 23:45:17 +01:00
Matthew Hodgson
f32ba0b54c
Merge pull request #1462 from pafcu/translation-fixes
...
Use standard subsitution syntax in _tJsx
2017-10-14 23:43:12 +01:00
Travis Ralston
8a641c7173
Hide message pinning behind a labs setting
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:40:10 -06:00
Travis Ralston
c34b55c6c7
Merge branch 'develop' into travis/pinned_messages
2017-10-14 16:10:32 -06:00
Matthew Hodgson
9f64261707
Merge branch 'develop' into travis/alone_warning
2017-10-14 22:43:36 +01:00
Matthew Hodgson
3efa0d2a76
Merge pull request #1478 from turt2live/travis/unset-avatar
...
Buttons to remove room/self avatar
2017-10-14 22:13:32 +01:00
Michael Telatynski
c1edc0c32e
add option to disable BigEmoji
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 19:40:45 +01:00
Travis Ralston
97ebd27175
Add missing translation
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 23:08:41 -06:00
Luke Barnard
83e7fc242a
Merge branch 'develop' into luke/groups-room-directory-esque
2017-10-13 17:48:35 +02:00
Luke Barnard
77418f535e
Modify GroupView UI
...
- Remove featured users/rooms
- Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode.
- Make the group view body scrollable
2017-10-13 16:46:33 +01:00
Luke Barnard
065ae9580d
Merge pull request #1459 from matrix-org/luke/groups-invite-warm-fuzzy
...
Add warm fuzzy dialog for inviting users to a group
2017-10-13 11:31:48 +02:00
Travis Ralston
f3b1baa3c0
Suggest to invite people when speaking in an empty room
...
Adds vector-im/riot-web#1053
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 21:15:00 -06:00
Stefan Parviainen
f694fb24ff
Fix merge-conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 20:02:14 +02:00
Luke Barnard
8958be9321
Merge pull request #1441 from turt2live/travis/who_banned
...
Show who banned the user on hover
2017-10-11 17:33:53 +02:00
Travis Ralston
8a2813ac08
Fallback to MXID instead of relying on the user being in the room
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 09:08:40 -06:00
Travis Ralston
d1fdd20809
Show who banned the user on hover
...
Fixes https://github.com/vector-im/riot-web/issues/5039
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 09:08:29 -06:00
Travis Ralston
f874fc1203
Merge branch 'develop' into travis/pl_enhancements
2017-10-11 08:42:45 -06:00
Luke Barnard
ffb9dd844a
Merge pull request #868 from psaavedra/set_default_federate_by_settings
...
Added TextInputWithCheckbox dialog
2017-10-11 16:28:03 +02:00
Luke Barnard
c128655321
Merge branch 'develop' into luke/groups-invite-warm-fuzzy
2017-10-11 16:05:51 +02:00
Luke Barnard
36666b3fc3
Add warm fuzzy dialog for inviting users to a group
2017-10-11 15:04:52 +01:00
Stefan Parviainen
581abcb4b7
Consistent subsitution variable in translations
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 09:15:24 +02:00
David Baker
80ad7d4ad6
Update translations
2017-10-10 19:27:51 +01:00
David Baker
92be3af990
Make it clearer which HS you're logging into
...
Otherwise there's no indication without clicking 'custom server'
2017-10-10 19:16:42 +01:00
Michael Telatynski
dbb6f5a44d
i18n the Jump to Read Receipt in MemberInfo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-07 19:27:49 +01:00
Michael Telatynski
7492f2dffa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings
2017-10-04 22:35:29 +01:00
Luke Barnard
7be5e685f7
Implement UI for editing related groups of a room
...
(using the new EditableItemList)
2017-10-04 13:19:57 +01:00
Luke Barnard
011aadcb94
Merge pull request #1421 from pafcu/develop
...
Add dummy translation function to mark translatable strings
2017-10-04 10:09:09 +01:00
Luke Barnard
6b834bc72e
Add confirmation dialog for removing room from group
2017-10-03 11:16:22 +01:00
Luke Barnard
3e34a460a4
Add error dialog for when removing room fails
2017-10-03 10:12:11 +01:00
Stefan Parviainen
a96169e80e
Fix merge conflict
2017-10-02 17:57:22 +02:00
Travis Ralston
20798dd2fa
Expose power level setting for widgets
...
Fixes https://github.com/vector-im/riot-web/issues/4866
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 15:37:32 -06:00
Travis Ralston
8ee9d39ffa
Expose option for m.room.topic power level
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 15:12:05 -06:00
Travis Ralston
614cf950b6
Supply user-friendly labels for common events
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 14:45:00 -06:00
Travis Ralston
2e1b2178a1
Remove assumptions on how languages work in the power levels section
...
This does mean that the strings will need to be re-translated, but now they may be more accurate because the comma is not assumed in the code.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 14:35:49 -06:00
Travis Ralston
874d383a8f
Add dock for pinned messages at the top of the room
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 08:56:21 -06:00
Travis Ralston
3a58e1c066
Show pinned message changes in the timeline
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 08:56:21 -06:00
Luke Barnard
1f66baca4b
Remove "You have entered an invalid contact..." from translations
2017-09-27 17:55:09 +01:00
Luke Barnard
3a8bfbf7e0
Construct address picker message using provided validAddressTypes
2017-09-27 17:11:30 +01:00
Stefan Parviainen
35cb52febc
Fix merge conflict
2017-09-27 08:41:37 +02:00
Luke Barnard
1b12602ea5
Merge branch 'develop' into luke/groups-add-rooms
2017-09-26 17:12:52 +01:00
Luke Barnard
ddab8d7b5c
Implement "Add room to group" feature
2017-09-26 14:49:13 +01:00
David Baker
8d0983ab02
Fix group membership publicity
...
* Read the new flag in the summary API (the one we were reading
was actually whether the group server listed you as a member to
non-members).
* Remove call to now-dead _loadGroupFromServer andf use the store
instead
2017-09-26 14:46:57 +01:00
David Baker
af2df77b8e
Merge pull request #1418 from matrix-org/luke/groups-summary-store
...
Create GroupSummaryStore for storing group summary stuff
2017-09-25 14:59:32 +01:00
Luke Barnard
e42e7bd3ad
Merge pull request #1419 from matrix-org/dbkr/publicity_toggle
...
Add status & toggle for publicity
2017-09-25 14:52:57 +01:00
Stefan Parviainen
2b5b708057
Translate unknown presence label
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-24 10:14:04 +02:00
Stefan Parviainen
14bce1119c
Make theme names translatable
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-23 21:36:10 +02:00
Stefan Parviainen
4da7a368a4
Fix incorrect variable in string
2017-09-23 10:04:59 +02:00
David Baker
af73f1c3bb
Add status & toggle for publicity
...
This doesn't work at the moment because it looks like it's broken
in synapse as per https://github.com/matrix-org/sytest/pull/391
But if it did work, the client side code might look something
like this.
2017-09-22 19:27:02 +01:00
Luke Barnard
791bc5e7ac
Create GroupSummaryStore for storing group summary stuff
...
- Acts as a layer between GroupView and the group APIs that modify the summary individually. This allows for abstraction of getting the new summary once a successful API hit has been done.
- The plan is to also control the avatar, topic, body of the summary via the same class
2017-09-22 18:52:06 +01:00
Luke Barnard
4c1a85cb71
Merge pull request #1415 from matrix-org/luke/groups-remove-featured-rooms-and-users
...
Implement removal function of features users/rooms
2017-09-22 16:32:40 +01:00
Luke Barnard
2e45f121ee
Add missing comma to en_EN.json
2017-09-22 16:25:31 +01:00
Luke Barnard
3f9d20de97
Implement removal function of features users/rooms
...
With the appeareance of a "X" in the top right of each featured item when editing.
NB: No reloading of summary is done after adding/removing a user/room. The plan is to better than threading a callback all the way down.
2017-09-22 15:56:35 +01:00
David Baker
77efe6a6d0
Merge pull request #1409 from pafcu/develop
...
Remove unneeded strings
2017-09-22 09:46:50 +01:00
Stefan Parviainen
411a67c6b0
Remove unneeded strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-21 18:25:45 +02:00
Luke Barnard
cf23ac5931
Merge branch 'develop' into luke/groups-add-feature-rooms
2017-09-21 17:20:12 +01:00
David Baker
3c2e6fdf9e
Honour the is_privileged flag in GroupView
2017-09-21 16:55:56 +01:00
Luke Barnard
5f840a3031
Implement adding rooms to the group summary
...
This includes making UserPickerDialog more generic such that it can also pick rooms from groups.
2017-09-21 16:53:10 +01:00
Luke Barnard
4d9c43b3c8
Display dialog when errors occur whilst featuring users
2017-09-21 12:34:16 +01:00
Luke Barnard
44c38652ab
Implement UserPickerDialog for adding users
...
Also, use AccessibleButtons.
2017-09-20 15:44:42 +01:00
Luke Barnard
1c6cecbd43
Add "Add a User/Room" buttons and always display default lists
2017-09-20 14:41:29 +01:00
Luke Barnard
5295d7f058
Merge branch 'develop' into luke/feature-flair
2017-09-19 14:55:54 +01:00
Luke Barnard
e9fb5712bd
Merge branch 'develop' into dbkr/group_userlist
2017-09-19 13:26:55 +01:00
Luke Barnard
925cb2dccf
Do translation correctly
2017-09-18 17:44:13 +01:00
Luke Barnard
26941e994f
Merge branch 'develop' into luke/feature-flair
2017-09-18 14:46:50 +01:00
Luke Barnard
548e5f516c
Put flair into labs
2017-09-18 14:38:41 +01:00
Matthew Hodgson
141ae916ce
Merge pull request #1387 from turt2live/travis/tooltip_redacter
...
Show who redacted an event on hover
2017-09-17 22:36:18 +01:00
Matthew Hodgson
6a53b7b149
Merge pull request #1389 from turt2live/travis/ignored_users
...
Add ignore user API support
2017-09-17 22:05:02 +01:00
Matthew Hodgson
bc565ba925
Merge pull request #1392 from turt2live/travis/no_emoji
...
Add option to disable Emoji suggestions
2017-09-17 21:40:43 +01:00
Michael Telatynski
63ccc45551
Merge branches 'develop' and 't3chguy/i18n-1' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n-1
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/i18n/strings/nl.json
# src/i18n/strings/zh_Hans.json
2017-09-17 13:33:34 +01:00
Michael Telatynski
ce2cdf3fa1
sanitize the i18n for fn:textForHistoryVisibilityEvent
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-17 13:28:17 +01:00
turt2live
b2de016b35
Add option to disable Emoji suggestions
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 21:28:12 -06:00