5e21059144
Merge pull request #729 from vector-im/matthew/truncateroomlist
...
truncate room list
2016-01-22 16:09:28 +00:00
0a32874b39
oops, reset truncate state on hide, not collapse
2016-01-22 16:09:06 +00:00
302c63058b
Invoke onShowMoreRooms to allow parents to kick their scrollbars..
2016-01-22 15:46:58 +00:00
0ee1892a0b
truncate room list
2016-01-22 15:31:42 +00:00
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
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
f3064a2994
Put back removing of "When people join or leave a room" settings push rule
2016-01-21 16:37:17 +01:00
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
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
b913e72735
Remove member event rule as per SYN-607
2016-01-21 12:01:28 +00:00
4d4c6e06ec
Merge remote-tracking branch 'origin/develop' into unread_sync
2016-01-21 10:39:35 +00:00
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
a08d00c672
Apply patch to the right branch: update for new count format
2016-01-21 10:20:45 +00:00
ac2e69ba28
Use new unread count methods
2016-01-20 17:20:19 +00:00
888fde0f53
Fixed call push notifications settings that always stayed OFF
2016-01-20 17:01:09 +01:00
eb62456007
Update for new unread count format
2016-01-20 15:58:21 +00:00
a775086e81
wording from amandine
2016-01-18 19:57:17 +00:00
d5c291ae62
Merge branch 'kegan/invite-search' into matthew/roompreview
2016-01-18 18:00:58 +00:00
d6f6f32c74
WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now
2016-01-18 17:37:13 +00:00
6182c983ab
PushRules settings: Applied review remarks (2/2)
2016-01-18 18:24:53 +01:00
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
7c0fffa79b
PushRules settings: Applied easy review remarks
2016-01-18 18:07:33 +01:00
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
ae14210763
PushRules settings: Put keywords in the right position
2016-01-18 16:31:18 +01:00
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
d7ffe70d44
PushRules settings: Applied Amandine's review comments
2016-01-15 17:28:57 +01:00
cb8b052dc0
PushRules settings: Show unmanaged rules into an "advanced section"
2016-01-15 16:45:27 +01:00
1fcb4ba94f
droptarget and usersettings and roomsettings layout tweaks
2016-01-15 15:26:00 +00:00
2dd2acd4e0
PushRules settings: BF adding a keyword when the keywords rule is OFF
2016-01-15 14:28:50 +01:00
c3469b5b51
PushRules settings: coding: separate UI and data management
2016-01-15 11:33:54 +01:00
7412fc7f97
PushRules settings: changed wordings
2016-01-15 10:51:42 +01:00
378f4bb85c
PushRules settings: Display keywords in alphabetical order
2016-01-14 11:15:59 +01:00
0577edb055
PushRules settings: Added master push rule
2016-01-14 11:03:51 +01:00
629883731e
PushRules settings: BF when adding a new keyword with the keywords rule in Off
2016-01-13 17:56:59 +01:00
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
ac87830e4e
PushRules settings: Applied new wordings: On, Loud, Off
2016-01-13 16:48:22 +01:00
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
c4cb37606b
PushRules settings: Added sanity checks on new keywords
2016-01-13 15:47:00 +01:00
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
1c03c208e1
PushRules settings: update keywords list hs side
2016-01-13 11:46:13 +01:00
10d3076d6b
PushRules settings: Display keywords modal dialog
2016-01-13 09:11:56 +01:00
9fb8c9f67a
PushRules settings: Use a workaround for SYN-590 (Push rule update fails)
2016-01-12 17:33:57 +01:00
b9080c770d
PushRules settings: Fixed triage of matrix content rules into the unique Vector rule
2016-01-12 16:46:27 +01:00
7f95362dd2
PushRules settings: Translate matrix per-word rules into the global Vector rule for a list of keywords
2016-01-12 15:12:58 +01:00
6d510db2db
PPushRules settings: Fixed React warnings
2016-01-11 17:32:37 +01:00
ee13dd7b6c
PushRules settings: Added a dedicated component to display them
2016-01-11 17:24:04 +01:00
a369c862a0
Hit MatrixClient.peekInRoom on rooms we can only peek into.
2016-01-07 14:57:26 +00:00
1a8a4728cd
Enable guest access. Show r/w icons on room directory.
2016-01-07 14:43:12 +00:00
d2635373f0
Merge pull request #585 from vector-im/matthew/dynamic-svg
...
Make SVGs and CSS dynamically recolourable
2016-01-07 11:41:46 +00:00
df111223fc
copyrights for 2016
2016-01-07 04:17:56 +00:00
c0f1ae0133
Use Unread to compute unread status of a room (which uses read receipts).
2016-01-06 18:29:27 +00:00
eacadbff40
remove stale onSvgLoad
2016-01-06 02:29:20 +00:00
cb29a04674
use factored out TintableSvg component for dynamic SVGs
2016-01-06 02:11:34 +00:00
b996022db2
fix up dynamically loaded svgs, and fix bottomleftmenu
2016-01-05 03:34:25 +00:00
bbf08d99cc
tinterize more svg
2016-01-05 00:47:26 +00:00
17b8982c75
move title attributes to the div
2016-01-03 22:35:07 +00:00
3abdcbf806
switch SVGs from imgs to objects, fixing CSS to make onClicks work
2016-01-03 22:30:14 +00:00
8dd90980d8
add cancel button for lightbox and pare down pointer-events stuff a bit
2015-12-28 02:15:23 +00:00
755ea0dfb8
Merge remote-tracking branch 'origin/develop' into notif_sync
2015-12-22 14:46:57 +00:00
67aff6b9f2
adopt MacOS style chevrons
2015-12-21 12:37:51 +00:00
cb1fabc578
Highlight status is now the room's unread notif count
2015-12-18 17:53:31 +00:00
dcea0dd601
Move min-height to RoomList; remove bottommost prop
2015-12-18 17:13:57 +00:00
dc1e2010a6
Merge branch 'develop' into kegan/archived-rooms
2015-12-18 17:00:20 +00:00
7cc1573f33
Add startAsHidden and showSpinner props to RoomSubList
...
startAsHidden: Previously we never started in the hidden state and all was well.
But with archived rooms you DO want to start hidden as you haven't fetched the
room list yet. Without this, you need to click twice (close/open) before the
archived room list will load.
showSpinner: If true, will show a spinner iff there are 0 elements being displayed.
Used when fetching the archived room list in RoomList.
2015-12-18 15:17:18 +00:00
f7c4cca675
Add TODO after spending 15 mins trying to figure out the difference between props.collapsed and state.hidden
2015-12-18 13:32:22 +00:00
869c08a790
Add onHeaderClick and alwaysShowHeader props to RoomSubList for archived room clicking
2015-12-18 11:56:22 +00:00
1a90a2c426
position the inbound call box correctly, and fix various issues with when the video preview and callview are shown
2015-12-17 02:53:53 +00:00
3fb0c9883b
escape key to cancel search box
2015-12-11 02:32:30 +00:00
f2fb1836df
only flash whilst searching
2015-12-11 02:25:51 +00:00
fea3fed460
animate the search button whilst searching
2015-12-11 02:24:58 +00:00
1c9d61d731
dedicated search button
2015-12-11 01:19:48 +00:00
8ecf70dda0
show images with unknown height - fixes issue 475 hopefully
2015-12-09 13:24:15 +00:00
b532fd046a
actually use SVGs - oops
2015-12-08 10:28:00 +00:00
2f905e13e1
Invoke onFinished so the context menu doesn't hang around
2015-12-07 16:04:46 +00:00
39778330b5
Also allow not_sent messages to be cancelled entirely.
2015-12-07 13:55:10 +00:00
1af1297afc
Allow queued events to be cancelled. Make not sent events appear differently to sending events.
2015-12-07 11:38:34 +00:00
25eeaaf1e5
Use UnreadStatus to determine whether an event affects a room;s unread status. Unify rooms going bold with their sort order and don't go bold for m.notify.
2015-12-04 16:24:17 +00:00
ac8fcbb264
Force update the RightPanel when the member in MemberInfo is updated.
2015-12-04 16:16:41 +00:00
95e71a531e
Merge branch 'develop' into kegan/vector-references
...
Update having merged skindexing PR
2015-12-01 18:31:13 +00:00
a63bf7cb35
Merge branch 'develop' into skindex-nextgen
2015-12-01 18:10:57 +00:00
e21d435d84
Remove debug logging
2015-12-01 16:57:40 +00:00
a2b28b826c
Add CustomServerDialog for vector
2015-12-01 16:48:51 +00:00
8d31f72f83
Add VectorLoginHeader
2015-12-01 16:27:23 +00:00
e304a1925d
Add VectorLoginFooter with vector references
2015-12-01 16:12:38 +00:00
c281fe785a
Merge branch 'develop' into skindex-nextgen
2015-12-01 15:53:11 +00:00
8083e7f118
Move vector-only components to src/components.
2015-12-01 15:45:38 +00:00
e07c03a7bb
Merge branch 'develop' into kegan/vector-components
2015-12-01 15:39:02 +00:00
e7f6e09def
Merge pull request #448 from vector-im/kegan/controller-merging4
...
Phase 4 controller merging
2015-12-01 15:34:25 +00:00
2a025201b1
Move remaining vector molecules to be components in vector (for now)
2015-12-01 11:19:54 +00:00
8f5f71ec80
Move MatrixChat to react-sdk. Move all login stuff to react SDK.
...
Removed Modulator stuff.
2015-11-30 18:10:09 +00:00
6a4038daeb
Add 'replaces' tag to mark that the RoomDNDView is a RoomTile
2015-11-30 17:56:55 +00:00
4409f07c2e
oops, don't try to delete nonexistent tags when moving a room from conversations to favs or similar
2015-11-30 15:49:27 +00:00
fd4d7eba12
Remove ErrorDialog and QuestionDialog to react-sdk
2015-11-30 14:11:28 +00:00
f969ccb50c
Move and merge RoomTile/MemberTile to react SDK. Keep DND stuff in vector as RoomDNDView.
2015-11-27 11:52:29 +00:00
fdad00790e
Move and merge Change* components to React SDK. Update references.
2015-11-26 17:11:26 +00:00
0a8f5b6223
Move ImageView
2015-11-26 14:51:30 +00:00
343670c5c4
Move MessageTimestamp
2015-11-26 14:38:48 +00:00
3c12191cb7
Move Spinner
2015-11-26 14:25:20 +00:00
ab22ca6a28
Also move the existing login components to the new structure
2015-11-26 14:11:45 +00:00
8898b444af
Point things at the right places
2015-11-26 13:48:37 +00:00
2e376b1eb9
Clear the 'screen' to load the main left/middle/right panels, then show the settings after post-reg is done
2015-11-20 14:27:39 +00:00
37254e6243
Add PostRegistration component
2015-11-20 12:02:37 +00:00
1edea2a62c
Add a PostRegistration component; hook it up to MatrixChat.
2015-11-20 12:02:23 +00:00
3075c97bae
Set busy Spinner
2015-11-20 10:27:21 +00:00
f62312fbf3
Remove old registration files. Move CaptchaForm to React SDK.
2015-11-20 10:18:04 +00:00
d372018e61
Minor tweaks
2015-11-19 16:47:14 +00:00
bb6eeea0d8
Factor out div ID name to avoid tight coupling with logic class.
2015-11-19 16:08:25 +00:00
3cf9f786aa
Instantiate Signup.Register in Registration component
...
This has to be done rather than in MatrixChat because the render() calls
will create new instances otherwise. Pass in all the strings the logic class
requires to the Registration wire component. This isn't the "best" solution
because unloading/reloading the Registration component will lose registration
state which should be persisted. Ideally we'd DI from the top to ensure this
can't happen (as opposed to relying on module globals...)
2015-11-19 15:44:17 +00:00
e700a5a219
Add TODO on post register logic
2015-11-19 13:58:52 +00:00
eaafc11064
Factor out Captcha UI
2015-11-19 13:44:11 +00:00
5f57cd9559
Merge branch 'develop' into kegan/reg-refactor
2015-11-19 09:50:08 +00:00
c9fe0b96b7
fix whitespace
2015-11-18 20:46:39 +00:00
bc55959fad
Load the Recaptcha script if we have a container for it
...
This is complex enough that the Registration component shouldn't have to
care about it, so it should probably be split into a pure UI component.
2015-11-18 17:46:17 +00:00
5424567a66
Hook up onFormSubmit to make registration (dummy only) work again.
2015-11-18 17:15:20 +00:00
b4c0625961
Show validation errors
2015-11-18 15:32:44 +00:00
ed3527e243
Merge branch 'develop' into kegan/reg-refactor
2015-11-17 17:43:22 +00:00
8e8b27c893
Add RegistrationForm UI component and new Registration wire component
...
Hook it up to MatrixChat instead of the existing logic (this breaks reg). WIP.
2015-11-17 17:40:31 +00:00
c57fb44c71
Fix path resolution
2015-11-17 13:26:23 +00:00
8602e0665d
PR feedback from #355
2015-11-17 10:57:44 +00:00
Matthew Hodgson