Commit Graph

493 Commits

Author SHA1 Message Date
Michael Telatynski 47d4e5f8d1 nest quotes, but only when people want to click through them
loads pre-emptively

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-18 19:28:01 +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 38e8488c2a we don't actually use state.room
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-12 23:25:38 +00:00
Michael Telatynski b6182f7e6c Tidy Quote class, removing comments etc
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-10 12:54:19 +00:00
Michael Telatynski 0f85391587 Implement Rich Quoting/Replies
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-10 12:50:41 +00:00
Luke Barnard 3addb924b1 Replace (IRC) with flair
If a user has public groups that are honoured in their flair, remove the (IRC) to give the appearance that the flair replaces it.
2017-11-28 13:50:05 +00:00
Stefan Parviainen 8090aadb0e Add aria-labels to ActionButtons
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-17 14:33:39 +01:00
Luke Barnard dad797d4a2 Run linting --fix 2017-11-16 13:19:36 +00:00
Richard Lewis 750e64deee Pass required props to TintableSvg. 2017-11-15 15:17:21 +00:00
Richard Lewis 7bab7813bb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour 2017-11-15 13:26:29 +00:00
Richard Lewis 59d405d4fa Use TintableSvgButtons for widget menubar icons. 2017-11-15 13:24:38 +00:00
Richard Lewis 6c2e9096cd Tintable SVGs that behave like normal image buttons / links. 2017-11-15 13:08:24 +00:00
Matthew Hodgson 96a3eff5d3 lint hell 2017-11-15 11:25:56 +00:00
Travis Ralston bd4102eb3d Merge branch 'develop' into travis/granular-settings 2017-11-14 19:12:48 -07:00
Richard Lewis 58966c5c3d Make edit icon green by default 2017-11-14 19:53:59 +00:00
Richard Lewis e87940f63c Make app tile title stronger 2017-11-14 19:53:32 +00:00
Luke Barnard 3fa1bece0a Simplify further
Also fix not-i18n-friendly "of" to be "=".
2017-11-14 13:06:54 +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
Luke Barnard d2ef6bffa8 Remove reverseRoles
This variable seemed redundant in hindsight, it seemed better to remove it than to worry about where it went in the component.
2017-11-14 12:02:37 +00:00
Travis Ralston c5c346f0b7 Merge branch 'develop' into travis/granular-settings 2017-11-13 12:18:41 -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
Luke Barnard 88010fa26c Determine whether power level is custom once Roles have been determined
Instead of potentially inspecting an empty {} before mounting.

This fixes an issue where "Custom of N" would appear on the first mount of MemberInfo - part of https://github.com/vector-im/riot-web/issues/5107#issuecomment-331882294
2017-11-13 11:57:34 +00:00
Luke Barnard a96bfee9f2 Remove unused UserSettingsStore import 2017-11-10 16:12:27 +00:00
Luke Barnard ceda5939f9 Remember to import React 2017-11-10 15:55:55 +00:00
Luke Barnard 853d33a93a Make groups a fully-fleged baked-in feature 2017-11-10 15:42:11 +00:00
Luke Barnard 6e1cf6ce17 Merge pull request #1548 from matrix-org/rxl881/widgetrendering
Improve widget rendering on prop updates
2017-11-10 12:41:20 +00:00
Richard Lewis ba8a9f2a43 Comment length 2017-11-10 11:50:14 +00:00
Luke Barnard 6deeaf94d6 group name not required 2017-11-10 11:43:05 +00:00
Richard Lewis d2070a08d8 Replace 'qs' dep. with 'querystring' 2017-11-10 11:42:56 +00:00
Richard Lewis bd6b5c4498 Improve function name. 2017-11-10 10:17:55 +00:00
Richard Lewis 98ac3dd19b Explicitly set initialisation state. 2017-11-10 09:44:58 +00:00
Richard Lewis da8b1ff1cd Ensure that loading state is reset when showing app panel. 2017-11-09 14:28:24 +00:00
Richard Lewis f796bc79c3 Fix addition of scalar token to widget URL.
Add error logging.
2017-11-09 14:07:29 +00:00
Luke Barnard 9027780215 Show group name in flair tooltip if one is set
e.g. "Group Name (+group_id:homeserver)" or "+group_id:homeserver"

Fixes https://github.com/vector-im/riot-web/issues/5341
2017-11-09 12:38:43 +00:00
Richard Lewis 8016fb82d7 Fix broken commit. 2017-11-08 20:38:54 +00:00
Richard Lewis 56581ef408 Fix various loadingElement related issues. 2017-11-08 20:38:31 +00:00
Richard Lewis b2b07d9370 Formatting 2017-11-08 20:17:28 +00:00
Richard Lewis be0a76dbd6 Update variable name and JSdoc for improved clarity. 2017-11-08 17:44:54 +00:00
Travis Ralston 289b0c2b6a Merge branch 'develop' into travis/granular-settings 2017-11-07 14:55:12 -07:00
Luke Barnard 646cabf324 Add missing whitespace 2017-11-07 15:15:10 +00:00
Luke Barnard ddc1ff2f23 Name things in a sane way 2017-11-07 15:13:26 +00:00
Luke Barnard 62305a1ccd Implement tooltip for group rooms 2017-11-07 14:07:31 +00:00
Richard Lewis 96de72ab44 Switch to using existing dep "qs" and record in package.json 2017-11-07 12:45:12 +00:00
Richard Lewis d3784b4925 Fix URL parameter encoding. 2017-11-07 12:33:38 +00:00
Richard Lewis eb8c15075a Fix url params parsing. 2017-11-07 11:58:38 +00:00
Richard Lewis 70c4100350 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering 2017-11-07 11:04:05 +00:00
Travis Ralston 781b94c8f4 Appease the linter
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 15:37:06 -07:00
Travis Ralston 45140cab69 Don't assume false means "use state"
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:52:42 -07:00
Travis Ralston cb17c0a379 Migrate blacklistUnverifiedDevicesPerRoom
This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:15:55 -07:00