Commit graph

326 commits

Author SHA1 Message Date
David Baker
ad2541299f Add ability to delete an alias from room directory
Hidden behind shift-click for now, but we're going to need to do this a lot to moderate the public room list.
2016-06-21 16:47:40 +01:00
Matthew Hodgson
4dfb0e9a90 Merge branch 'develop' into matthew/scalar 2016-06-19 22:40:58 +01:00
Matthew Hodgson
654429dbdb improve wording on 'search room names' 2016-06-18 21:12:32 +01:00
David Baker
3547bd8d00 Update for react-sdk dbkr/fix_peeking branch
With the react-sdk update, this does nothing functionally since the room ID would just
have been ignored, but update this to correctly supply only one of ID/alias.
2016-06-14 13:02:34 +01:00
David Baker
d7504aeda5 Switch to new view_room 2016-06-10 15:13:41 +01:00
David Baker
a030e46c69 Use join_room_by_alias in RoomDirectory
This still doesn't actually cause the room to be joined by alias though, so still need to fix that
2016-06-09 17:13:02 +01:00
David Baker
f61cfbc542 Fix RoomDirectory to join by alias whenever possible. 2016-06-09 16:41:01 +01:00
David Baker
f595f6f141 This check shouldn't be here with the || 2016-06-09 10:25:49 +01:00
David Baker
4fc311da90 Style fix 2016-06-09 09:56:11 +01:00
David Baker
f6aa9a7ea4 Make the config optional
Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.
2016-06-08 18:46:21 +01:00
David Baker
1e40fd750f Don't use SdkConfig
instead take brand from a prop
2016-06-08 14:55:47 +01:00
David Baker
f9aaf7d903 Use the SdkConfig interface
rather than pulling in config.json directly.

json-loader appears to still be necessary due to some horrendous json dependency in the depths of sanitize-html.
2016-06-06 19:13:30 +01:00
Matthew Hodgson
a2e73cceee Merge branch 'develop' into matthew/scalar 2016-06-06 10:24:39 +01:00
Matthew Hodgson
d976046e6a set email branding whenever emails are added from vector 2016-06-02 13:15:13 +01:00
Matthew Hodgson
c4d408d095 CSS for IntegrationsManager 2016-05-18 17:02:39 +01:00
Matthew Hodgson
ac24d6707f Add integs mgt 2016-05-18 15:02:03 +01:00
Matthew Hodgson
e5835d2731 typo 2016-05-18 15:01:36 +01:00
Matthew Hodgson
e640f65640 add close button to room search filter 2016-05-16 23:36:52 +01:00
Kegan Dougal
bc166f19b7 Fix NPE when loading the Settings page which infini-spinnered 2016-05-16 16:04:06 +01:00
Matthew Hodgson
af9838408b s/devices/notification targets/ 2016-05-04 11:58:37 +01:00
David Baker
efe1c767f0 Un-inline onChange 2016-05-03 11:36:44 +01:00
David Baker
a72d0c5b7f Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs 2016-04-21 10:17:15 +01:00
David Baker
3cb092051e Merge branch 'develop' into dbkr/email_notifs 2016-04-21 10:11:55 +01:00
Richard van der Hoff
02f58ef9e3 Don't relayout scrollpanels every time something changes
Gemini's habit of reflowing everything everytime anything changes at all makes
for an unresponsive app. Turn it off everywhere we use gemini.
2016-04-20 12:29:32 +01:00
Matthew Hodgson
aeb438dc62 fix tbody & keying warnings 2016-04-17 17:44:04 +01:00
Matthew Hodgson
10a053019d fix thinkos - thanks @richvdh for posthoc review 2016-04-17 17:35:17 +01:00
Matthew Hodgson
58c431abc2 fix spinner layout bouncing when changing notifs
all-important s/done/then/ on pushRulesPromise to ensure that the refresh completes before relaying-out the page
s/Loud/Highlight & sound/
2016-04-17 14:00:20 +01:00
Matthew Hodgson
d512e25cca persist search filter over being hidden 2016-04-17 00:28:33 +01:00
Matthew Hodgson
fdf83a5ad5 fix tooltip offset 2016-04-15 22:24:20 +01:00
Matthew Hodgson
48e082e124 Merge pull request #1402 from vector-im/matthew/design_tweaks
Matthew/design tweaks
2016-04-15 18:48:30 +01:00
Matthew Hodgson
7cd24e7dbd commented out fading for RoomDirectory 2016-04-15 18:29:57 +01:00
Matthew Hodgson
cf3cdaccf3 fix up UserSettings a bit 2016-04-15 18:23:47 +01:00
Matthew Hodgson
51bc18aef0 prettier icon 2016-04-15 18:05:57 +01:00
Matthew Hodgson
26d12bebe4 wire up searchbox filtering, and some minor overall tweaks 2016-04-15 17:54:48 +01:00
Matthew Hodgson
90ae024a4e tidy up rightpanel and searchbox 2016-04-15 15:53:27 +01:00
Richard van der Hoff
eab206c3bd Improve handling of notification rules we can't parse
* An absent rule is the same as a rule with 'enabled == false', and is not
necessarily 'OFF' (particularly in the case of the bot rule, which is
inverted).

* If we don't understand the rule, then don't tick any of the radio buttons,
and instead show it in the 'external' section.
2016-04-15 12:42:03 +01:00
Matthew Hodgson
f8d5101dbc add lost SVGs and implement SearchBox skeleton 2016-04-15 02:23:12 +01:00
Richard van der Hoff
5450223cc7 More notifications fixes
Fix another thing I broke during the refactor
2016-04-14 22:31:40 +01:00
Matthew Hodgson
25b5c14527 fix new bottomleft menu 2016-04-14 22:26:48 +01:00
Matthew Hodgson
6bc4c87ce4 update to new bottomleftmenu. update header and composer heights 2016-04-14 21:43:49 +01:00
Matthew Hodgson
96c4a24d3d skin RoomSubList chevrons, horizontal rules and selected room 2016-04-14 21:10:55 +01:00
Richard van der Hoff
c6b501811f Move more stuff out of Notifications.js 2016-04-14 19:54:03 +01:00
Richard van der Hoff
ff5dff45f5 Start Notifications component refactor
Factor some things out of the mega Notifications component, and add a dummy
unit test to show willing
2016-04-13 18:44:41 +01:00
Matthew Hodgson
50f94eb040 stop guests rom trying to blunder into non-guest rooms 2016-04-13 13:33:23 +01:00
David Baker
5794c30def Devices should be below 'advanced' 2016-04-13 11:35:53 +01:00
Matthew Hodgson
18bd1058d3 Merge pull request #1376 from vector-im/matthew/fadable
make the UI fadable to help with decluttering
2016-04-12 18:04:47 +01:00
Matthew Hodgson
05e963d1e2 make the UI fadable to help with decluttering 2016-04-12 17:17:08 +01:00
David Baker
5d9c8f3726 Support config for email notifs
Add support to notif settings for adding an email pusher, only for the first email address for now.
2016-04-12 16:19:20 +01:00
David Baker
356a4a4392 Typo and use CSS rather than <i> 2016-04-12 14:10:17 +01:00
David Baker
c5524851f3 Comment future possibility for deleting pushers 2016-04-12 13:22:58 +01:00
David Baker
cff1c3010b Get & display pushers in settings
Really this is so (in a subsequent PR) we can show whether a user has an email pusher, but we can basically display the list of pushers for free, so adding this too.
2016-04-12 13:18:57 +01:00
Matthew Hodgson
46572ae793 click on group call thumbnail should return you to the group call, not the 1:1 2016-04-12 02:27:35 +01:00
Matthew Hodgson
efd01d6929 move localstorage crap entirely to TextualBody 2016-04-11 23:54:00 +01:00
Matthew Hodgson
cdc89c0623 add the concept of eventTileOps for managing widget visibility based on vdh's PR feedback 2016-04-08 21:42:42 +01:00
Matthew Hodgson
d107151f8a rename size prop as fileSize, add comments, and honour explicit properties rather than mxEvent fields 2016-04-07 18:10:15 +01:00
Matthew Hodgson
d7eb23db53 specify sizes and hyperlinks for non-event images 2016-04-04 00:16:52 +01:00
Matthew Hodgson
333f1e46ca document properties and remove spurious 'view full screen' button 2016-04-03 23:57:44 +01:00
Matthew Hodgson
d414127f80 track whether widget should be hidden on the event, as well as persisting it in localStorage 2016-04-03 23:31:42 +01:00
Matthew Hodgson
ff2885087d support cancelling and uncancelling previews 2016-04-03 02:50:51 +01:00
Aviral Dasgupta
cf17ea6254 Show full-size avatar on MemberInfo avatar click
fixes vector-im/vector-web#65
2016-04-03 00:53:17 +05:30
Matthew Hodgson
512a9125bf fix zalgos in SenderProfile again, whilst maintaining limited-width name via inline-block. and without doubling emote vertical space... 2016-03-30 19:47:06 +01:00
Richard van der Hoff
851b601d2c Pass SimpleRoomHeader topic in as a named prop 2016-03-29 23:25:26 +01:00
Richard van der Hoff
cf0340c1c7 RoomDirectory: use SimpleRoomHeader instead of RoomHeader
SimpleRoomHeader and RoomHeader are now separate things
(https://github.com/matrix-org/matrix-react-sdk/pull/252), so update Vector
accordingly.
2016-03-29 16:45:24 +01:00
Matthew Hodgson
27ab79fd38 handle unaliased room naming more sanely 2016-03-23 11:50:38 +00:00
Matthew Hodgson
8cbc8db1cb oops 2016-03-23 11:38:17 +00:00
Matthew Hodgson
e32299a50c fix enable notifs text 2016-03-23 11:32:47 +00:00
Matthew Hodgson
c843ee3157 handle canonical aliases correctly; search on names; support rooms with no aliases 2016-03-23 11:26:18 +00:00
Matthew Hodgson
d4a36f5081 permalink button 2016-03-19 23:26:04 +00:00
Matthew Hodgson
19cb06d040 prop fix 2016-03-18 20:08:31 +00:00
Matthew Hodgson
a6257a1148 show right panel if needed when viewing users 2016-03-18 16:09:00 +00:00
Matthew Hodgson
aca4457a89 apparently we don't need a default onClick 2016-03-17 17:00:58 +00:00
Matthew Hodgson
d7a851a353 make senderprofiles clickable 2016-03-17 16:28:49 +00:00
Matthew Hodgson
c6f95dfb3b Merge pull request #1180 from vector-im/matthew/fix-notif-spam
fix notif spam when logging in from a guest session by correctly logging out first.
2016-03-17 14:37:21 +00:00
Matthew Hodgson
cddfa62e27 reorder the push settings as off, on, loud - fixes https://github.com/vector-im/vector-web/issues/1117 2016-03-17 02:24:48 +00:00
Matthew Hodgson
a6e3b39f16 fix notif spam on launch by correctly logging out again. reverts start_login_from_guest stuff 2016-03-17 02:08:05 +00:00
Matthew Hodgson
50d18ac771 Merge pull request #1165 from vector-im/matthew/cancellable-upgrade
use new start_login_from_guest dispatch for cancellable logins from guest accounts
2016-03-16 14:37:50 +00:00
Mark Haines
05e479a76c Use then() chaining rather than manual callbacks 2016-03-16 10:59:40 +00:00
Matthew Hodgson
cb45db36c2 use new start_login_from_guest dispatch for cancellable logins from guest accounts 2016-03-15 21:02:25 +00:00
Mark Haines
31915db6f6 Remove trailing whitespace 2016-03-15 18:38:24 +00:00
Mark Haines
eb01cb9cba Merge pull request #1037 from vector-im/markjh/change_push_actions
Update the actions of default rules instead of overriding.
2016-03-15 18:10:04 +00:00
Mark Haines
9b85d88036 s/somme/some/ 2016-03-15 15:23:18 +00:00
Mark Haines
3224a4e49e Add helper functions for decoding and encoding lists of push actions 2016-03-15 11:26:32 +00:00
Mark Haines
8b1444c954 Port the legacy im.vector rules to the new format on startup 2016-03-15 10:49:10 +00:00
Richard van der Hoff
e777db3fc4 Add setting for audio notifications
Expose the enableAudioNotifications setting in the user settings panel.
2016-03-10 11:01:29 +00:00
Matthew Hodgson
a4d22ffe8c improve IS warning 2016-03-06 17:11:08 -05:00
David Baker
d732927dba Re-enable upgrade registration.
Revert https://github.com/vector-im/vector-web/issues/818 now that https://github.com/vector-im/vector-web/issues/759 is fixed.
2016-03-04 15:42:22 +00:00
Matthew Hodgson
2586280f2c add opera 2016-03-03 15:31:08 +00:00
Matthew Hodgson
04fb8f9a81 de-kegan the CompatibilityPage :( 2016-03-03 15:22:12 +00:00
David Baker
b03e6a8d73 add comment explaining data passing hack 2016-03-02 14:34:31 +00:00
David Baker
2271ec7634 Display room metadata from room previews when we come from the public room directory (more hacks to work around the fact that we can't get this data from the HS) 2016-03-02 14:24:00 +00:00
David Baker
332354e5b6 Uncommit 71cb04c50a (I failed to branch) 2016-03-02 14:23:20 +00:00
David Baker
71cb04c50a Display room metadata from room previews when we come from the public room directory (more hacks to work around the fact that we can't get this data from the HS) 2016-03-02 14:21:32 +00:00
Mark Haines
3b2d0a6c01 Fix up reading the push rules 2016-02-29 16:56:33 +00:00
Mark Haines
731d94eea4 Update the actions of default rules instead of overriding.
The Matrix CS API, and synapse now supports setting the actions for default
rules. Doing that makes managing the rules much simpler from a vector
persepctive since the ON/LOUD/OFF toggle buttons can be implemented by
setting the actions and enabling/disabling the default rules rather than
overidding them.

Overriding the default rules was difficult because it was not possible
to intermingle the evaluation of user-specified rules with the default
rules. So even though you could add a rule with the same conditions as a
default rule, it would evaluate before *all* the other default rules.

Also creating new rules under a im.vector namespace creates challenges
if we want vector to cooperate with other matrix clients that want to
provide a similar set of toggle switches for the push rules.
2016-02-26 20:51:16 +00:00
David Baker
55c7c08ac2 Sender can be null, so null check. 2016-02-23 17:59:13 +00:00
Matthew Hodgson
f2fc4a88ae gemini up roomdirectory 2016-02-22 09:35:11 +00:00
Matthew Hodgson
2ca5529faa support hyperlinked topics 2016-02-20 23:54:47 +00:00
Matthew Hodgson
a35ab6bcef tart up room directory 2016-02-20 13:36:48 +00:00
Matthew Hodgson
3910877f8f ensure local activity bumps rooms up the roomlist 2016-02-19 02:09:04 +00:00
Matthew Hodgson
f3df0d07f8 filter room directory case insensitively 2016-02-14 13:32:15 +02:00
David Baker
485343864c semicolon 2016-02-05 10:57:49 +00:00
David Baker
f035b8c50e Rate limit UI updates to avoid browser death 2016-02-04 18:09:24 +00:00
Kegsay
6c5a00162c Merge pull request #856 from vector-im/kegan/version-stamp
Add a version update checker and NewVersionBar to show on the UI.
2016-02-03 17:09:24 +00:00
Kegan Dougal
5eed734325 Add a version update checker and NewVersionBar to show on the UI. 2016-02-03 16:16:14 +00:00
David Baker
d132c75263 Remove the autoPeek stuff and always either peek or show the join prompt bar 2016-02-02 15:51:23 +00:00
David Baker
d1dc082489 Remove empty if block 2016-02-01 18:02:52 +00:00
David Baker
6a36b022e4 New style guest warning bar 2016-01-28 13:00:44 +00:00
Matthew Hodgson
5e21059144 Merge pull request #729 from vector-im/matthew/truncateroomlist
truncate room list
2016-01-22 16:09:28 +00:00
Matthew Hodgson
0a32874b39 oops, reset truncate state on hide, not collapse 2016-01-22 16:09:06 +00:00
Kegan Dougal
302c63058b Invoke onShowMoreRooms to allow parents to kick their scrollbars.. 2016-01-22 15:46:58 +00:00
Matthew Hodgson
0ee1892a0b truncate room list 2016-01-22 15:31:42 +00:00
David Baker
e11ae99a9f Add vector rules with the appropriate kind, otherwise the room_message rule takes precedence over content / display name rules etc and prevents bings. 2016-01-22 14:12:29 +00:00
manuroe
ce45f0b1e6 Push settings: Use a dont_notify rule when 1:1 or group chat rooms are set to OFF 2016-01-22 09:30:31 +01:00
manuroe
f3064a2994 Put back removing of "When people join or leave a room" settings push rule 2016-01-21 16:37:17 +01:00
manuroe
029cf754ee Added notif settings for "Messages sent by bot" (https://github.com/vector-im/vector-web/issues/692)
In order to do that, the rules definitions have been update to support "dont_notify" hs default push rules
2016-01-21 16:16:44 +01:00
David Baker
1a248c8e5c Merge pull request #710 from vector-im/unread_sync
Use read receipts to calculate unread room status
2016-01-21 13:29:49 +00:00
David Baker
b913e72735 Remove member event rule as per SYN-607 2016-01-21 12:01:28 +00:00
David Baker
4d4c6e06ec Merge remote-tracking branch 'origin/develop' into unread_sync 2016-01-21 10:39:35 +00:00
David Baker
2d917910da Merge pull request #556 from vector-im/notif_sync
Use unread count for room highlight state
2016-01-21 10:31:46 +00:00
David Baker
a08d00c672 Apply patch to the right branch: update for new count format 2016-01-21 10:20:45 +00:00
David Baker
ac2e69ba28 Use new unread count methods 2016-01-20 17:20:19 +00:00
manuroe
888fde0f53 Fixed call push notifications settings that always stayed OFF 2016-01-20 17:01:09 +01:00
David Baker
eb62456007 Update for new unread count format 2016-01-20 15:58:21 +00:00
Matthew Hodgson
a775086e81 wording from amandine 2016-01-18 19:57:17 +00:00
Matthew Hodgson
d5c291ae62 Merge branch 'kegan/invite-search' into matthew/roompreview 2016-01-18 18:00:58 +00:00
Matthew Hodgson
d6f6f32c74 WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now 2016-01-18 17:37:13 +00:00
manuroe
6182c983ab PushRules settings: Applied review remarks (2/2) 2016-01-18 18:24:53 +01:00
manuroe
fdf5b0a4fc Merge branch 'develop' into push-rules-settings
# Conflicts:
#	src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
2016-01-18 18:14:20 +01:00
manuroe
7c0fffa79b PushRules settings: Applied easy review remarks 2016-01-18 18:07:33 +01:00
manuroe
bdcf683942 PushRules settings: Create a dedicated rule for "Messages sent to group".
The default fallback rule cannot be used because it matches with too much events.
2016-01-18 16:41:48 +01:00
manuroe
ae14210763 PushRules settings: Put keywords in the right position 2016-01-18 16:31:18 +01:00
manuroe
830160f074 PushRules settings: Enabled all radio buttons of the table.
Each rule is described in the code so that if the server does not have it in its default rules or if the user wants to use actions different from the hs one, the code will create a new rule that will override the hs one.
2016-01-18 16:24:06 +01:00
manuroe
d7ffe70d44 PushRules settings: Applied Amandine's review comments 2016-01-15 17:28:57 +01:00
manuroe
cb8b052dc0 PushRules settings: Show unmanaged rules into an "advanced section" 2016-01-15 16:45:27 +01:00
Matthew Hodgson
1fcb4ba94f droptarget and usersettings and roomsettings layout tweaks 2016-01-15 15:26:00 +00:00
manuroe
2dd2acd4e0 PushRules settings: BF adding a keyword when the keywords rule is OFF 2016-01-15 14:28:50 +01:00
manuroe
c3469b5b51 PushRules settings: coding: separate UI and data management 2016-01-15 11:33:54 +01:00
manuroe
7412fc7f97 PushRules settings: changed wordings 2016-01-15 10:51:42 +01:00
manuroe
378f4bb85c PushRules settings: Display keywords in alphabetical order 2016-01-14 11:15:59 +01:00
manuroe
0577edb055 PushRules settings: Added master push rule 2016-01-14 11:03:51 +01:00
manuroe
629883731e PushRules settings: BF when adding a new keyword with the keywords rule in Off 2016-01-13 17:56:59 +01:00
manuroe
0475bcd9de PushRules settings: BF when changing state of the keywords rule with such a sequence: on -> off -> loud. 2016-01-13 17:10:26 +01:00
manuroe
ac87830e4e PushRules settings: Applied new wordings: On, Loud, Off 2016-01-13 16:48:22 +01:00
manuroe
7fc5ab3c6e PushRules settings: Use the new TextInputDialog to display keywords list. We earn the focus at the end of the keywords list and the management of enter and esc keys 2016-01-13 16:36:57 +01:00
manuroe
c4cb37606b PushRules settings: Added sanity checks on new keywords 2016-01-13 15:47:00 +01:00
manuroe
e5b7a47fee PushRules settings: if a newly typed keyword was part of a push rule not managed by the Vector UI, delete the rule and create it compliant with Vector parameters 2016-01-13 12:00:04 +01:00
manuroe
1c03c208e1 PushRules settings: update keywords list hs side 2016-01-13 11:46:13 +01:00
manuroe
10d3076d6b PushRules settings: Display keywords modal dialog 2016-01-13 09:11:56 +01:00
manuroe
9fb8c9f67a PushRules settings: Use a workaround for SYN-590 (Push rule update fails) 2016-01-12 17:33:57 +01:00
manuroe
b9080c770d PushRules settings: Fixed triage of matrix content rules into the unique Vector rule 2016-01-12 16:46:27 +01:00