f21b6203ed
Merge branch 'kegan/controller-merging' into kegan/controller-merging2
2015-11-26 14:31:31 +00:00
8517f9f2bf
Missed one
2015-11-26 14:29:26 +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
d079617ce2
Nuke MemberAvatar/RoomAvatar; moved to react SDK
2015-11-26 13:25:56 +00:00
f9040e08ce
fix conflicts
2015-11-24 16:05:58 +00:00
fd8864d528
STOP PEOPLE SHOUTING
2015-11-22 22:35:34 +00:00
841c790337
naughty override to stop RoomList panel scrolling horizontally
2015-11-22 15:47:50 +00:00
324c3e7dcf
override more GFM css
2015-11-22 15:47:10 +00:00
01641543da
only try to syntax highlight html
2015-11-21 12:33:45 +00:00
9038b984ff
fix css link
2015-11-21 12:15:38 +00:00
da97185fcd
highlight <code/> blocks via highlight.js
2015-11-21 12:14:56 +00:00
b6e9c1eaab
oops, forgot gfm.css
2015-11-20 20:20:30 +00:00
76c6d6d4d6
add target=_blank onto all HTML links, and apply GFM.css for CSS for markdown
2015-11-20 20:12:23 +00:00
4c11de787e
make h2 layout specific to the list
2015-11-20 20:11:06 +00:00
96c825b89f
wrap whitespace on notices
2015-11-20 20:10:49 +00:00
29af81e827
Refactor HTML markup stuff into its own class, and whitelist h1 and h2
2015-11-20 18:58:13 +00:00
3cf9f5248b
Fix the ref we keep to be the react element and make velociraptor correctly track what nodes it had at the start (c.key not c.props.key)
2015-11-20 18:22:38 +00:00
06427d663d
Add support for playing gifs on mouse enter/leave
2015-11-20 16:36:58 +00:00
2c51a5c199
Bugfix: don't cache the read avatar rect as it's relative to the viewport and it will move when we scroll!
2015-11-20 16:01:51 +00:00
29ee7d2b13
Remove useless logging
2015-11-20 14:34:26 +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
99ccff098c
Merge pull request #399 from vector-im/kegan/reg-refactor
...
Refactor registration
2015-11-20 10:28:26 +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
02d5154aaf
more alt tags
2015-11-19 17:45:03 +00:00
41eaf18470
add hoverover test for edit button
2015-11-19 17:43:55 +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
2d481a6302
Recheck registration state since we may be able to immediately do an HTTP hit if we've been given good QPs
2015-11-19 14:17:18 +00:00
e700a5a219
Add TODO on post register logic
2015-11-19 13:58:52 +00:00
f7127ab701
Merge pull request #397 from vector-im/z_indices
...
Sort out dialog z index so read receipts avatars are behind the dialog background
2015-11-19 13:53:51 +00:00
eaafc11064
Factor out Captcha UI
2015-11-19 13:44:11 +00:00
3a003341ad
Merge pull request #387 from vector-im/rav/suppress_unread_on_memberchange
...
Don't mark rooms as unread on m.room.member changes
2015-11-19 13:22:37 +00:00
f7fe871fee
If read receipts avatar isn't on screen, animate it from the top of the screen.
2015-11-19 11:33:15 +00:00
09b0d221df
Kill the last getDOMNode()
2015-11-19 11:03:33 +00:00
ed3d3a9e23
Shift css around a bit so it more closely matches DOM order
2015-11-19 10:49:24 +00:00
eb1c6b347d
Move z-index to the dialog wrapper because that's the shallowest positioned element in the DOM and therefore what creates the first stacking context
2015-11-19 10:46:49 +00:00
5f57cd9559
Merge branch 'develop' into kegan/reg-refactor
2015-11-19 09:50:08 +00:00
0dd85d9adf
Hidden localstorage option to enable bouncy read receipts :p
2015-11-19 09:44:24 +00:00
23d45d7f33
fix initials behaviour on FF
2015-11-18 23:46:43 +00:00
69fdd485e6
general faff to make the new edit button position interact properly with dave's 'click to show all read receipts'
2015-11-18 23:41:38 +00:00
bf3e90bb47
dirty hack to fix the uneven spacing
2015-11-18 23:04:12 +00:00
68a005bf1f
stop edit option from colliding with scrollbar again
2015-11-18 22:24:54 +00:00
884d0de90b
s/React/ReactDOM/ to fix another 0.14 warning
2015-11-18 22:22:19 +00:00
6e3afcde53
dodgy fudge to put the edit button alongside the read receipts. in future I think we should turn it into a chevron next to the timestamp
2015-11-18 22:19:21 +00:00
d66006893a
fix react 0.14 warning from getDOMNode()
2015-11-18 22:10:08 +00:00
8fed464cf6
and the new voice icon
2015-11-18 21:18:16 +00:00
08ba0457e8
add a temporary voice call button
2015-11-18 21:17:58 +00:00
098491e350
avoid hoverover artefacts on avatar initials
2015-11-18 20:56:43 +00:00
46541a3f2e
logout button on splashscreen to avoid wedging users whose server has gone awol
2015-11-18 20:47:14 +00:00
c9fe0b96b7
fix whitespace
2015-11-18 20:46:39 +00:00
742ae354e5
clicking anywhere in the composer pane should focus on the textarea
2015-11-18 20:15:15 +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
f0df3f29b9
Show all read avatars on click
2015-11-18 17:12:17 +00:00
b4c0625961
Show validation errors
2015-11-18 15:32:44 +00:00
1099892784
Merge pull request #379 from vector-im/read_receipts
...
Read receipts
2015-11-18 14:53:29 +00:00
c42d4f901b
Don't mark rooms as unread on m.room.member changes
...
A quick and hacky fix to issue #169 .
2015-11-18 11:01:47 +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
c63dd376d8
Fix member avatar initials (I failed at git conflict merging)
2015-11-17 17:31:03 +00:00
da55081c68
Add member name to avatars as the title since if displayed without accompanying text (as with read receipts) they can be somewhat unhelpful. May as well have them all the time I think.
2015-11-17 15:59:44 +00:00
80c2bd0c7f
Remove bouncing, set animation time to be constant (prevents temporary overalpping) and exclude ourselves.
2015-11-17 15:51:00 +00:00
714c96283e
Setting defaults from config.json got lost
2015-11-17 15:12:55 +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
af1e3373ea
Merge pull request #355 from vector-im/kegan/login-refactor
...
Refactor login page
2015-11-17 10:47:56 +00:00
79e39429b7
add todo
2015-11-17 02:40:19 +00:00
7b3eea0b58
experiment with trying to turn UserSettings into a controller-less 'wiring component' which wires together a series of smaller components (in this case, so small they're mainly <input/s>
2015-11-17 02:15:55 +00:00
88c5a5e074
missing copyright
2015-11-17 02:14:06 +00:00
e23b90abd5
More s/messageWrapper/messagePanel/
2015-11-16 16:52:07 +00:00
7f61a0252f
remove logging
2015-11-16 16:45:28 +00:00
bb59e9276b
Merge remote-tracking branch 'origin/develop' into read_receipts
2015-11-16 16:33:39 +00:00
d6b86598e5
Bouncy bouncy!
2015-11-16 16:13:21 +00:00
bf91155e60
implement multiline input
2015-11-15 03:36:10 +00:00
ef181f55d5
make modal dialogs higher in z-index
2015-11-14 00:14:41 +00:00
1c7e7cd111
kill stale z-index param
2015-11-14 00:13:13 +00:00
063e387a65
turn off the placeholder drag & drop function to get an opinion from folks
2015-11-13 23:51:48 +00:00
ca07c8f429
Merge pull request #365 from vector-im/avatar_initial_a11y
...
Mark up the avatar initials so they're not read out by screen readers
2015-11-13 18:37:10 +00:00
2fd7196cdd
also handle a11y on room avatars
2015-11-13 18:36:46 +00:00
ff59fc84c5
don't bold the selected room just because, as it bold = new msgs
2015-11-13 18:25:10 +00:00
9d620dfb1d
Hopefully now mostly complete animations: we iterate through zero or more start states and then settle on the final place.
2015-11-13 16:43:54 +00:00
bc2c744bed
more bits of read receipt animation implemented
2015-11-13 11:42:51 +00:00
2fabf69ce3
Mark up the avatar initials so they're not read out by screen readers
2015-11-13 09:28:56 +00:00
f8d628d336
fix composer avatar
2015-11-13 02:44:46 +00:00
20f84ce322
override gemini-scrollbar CSS to stop the scrollview from pushing out the container, causing FF's flexbox to adapt and keep growing infinitely
2015-11-13 02:29:59 +00:00
2cf0ceb260
back out previous bodges to flexbox to make geminiscrollbar work in FF
2015-11-13 02:29:18 +00:00
36b7deac35
clear unread message count more aggressively (and revert previous thinko)
2015-11-13 01:42:09 +00:00
04305460db
make firefox slightly happier
2015-11-13 01:19:40 +00:00
caa2fd97d1
sacrifice dead goats to make gemini-scrollbars work on firefox 42 and chrome 48 and later. the problem is that flexbox interacts badly with gemini-scrollbars, as gemini looks at the offsetWidth of the container in order to make the width of its enclosed scrollable view = width+scrollbarwidth. The problem is that flexbox then sees that the scrollable view has expanded, and unhelpfully flexes the container to fit it. This fixes the problem by providing more explicit widths for the containers to stop them flexing. I'm not sure I want to know why we don't also see the same problem with heights.
2015-11-13 00:46:50 +00:00
e0efb6862e
Merge pull request #354 from vector-im/ignore-non-mxc
...
Display some sensible UI for non-mxc content URLs.
2015-11-12 17:43:20 +00:00
1ac47f32fe
Fix scrolling on browsers where gemini scrollbars don't kick in.
2015-11-12 17:18:22 +00:00
b1438355e2
Github and Sublime don't like this not being escaped. Displays fine though in React like this.
2015-11-12 15:58:12 +00:00
021eaf5c29
Vector is the default IS in Vector
2015-11-12 15:54:07 +00:00
726afd30bb
Swap old login for new
2015-11-12 15:49:32 +00:00
58472b8251
Move Cas/PasswordLogin to react-sdk. Use them as normal components.
2015-11-12 15:38:04 +00:00
8826eb60cc
Call through to password login
2015-11-12 15:16:29 +00:00
c8a8306165
Display some sensible UI for non-mxc content URLs.
2015-11-12 14:16:57 +00:00
c12c716dc0
fix URLs on image
2015-11-12 13:34:00 +00:00
05eda88ea2
Split out logic/UI for logging in
...
- Add 'PasswordLogin' UI component
- Add 'LoginPage' wire component which, along with Signup from react SDK,
replaces the 'Login' page.
- Move UI code (state/props) from ServerConfig which was lobotomoised in the
React SDK.
Unfinished.
2015-11-12 11:57:33 +00:00
2cae5e7a00
revert bad fix to managing history
2015-11-11 02:31:37 +01:00
2fff6f4d5f
fix spinner layout yet more
2015-11-11 02:31:17 +01:00
81128ef06e
hopefully fix https://github.com/vector-im/vector-web/issues/226
2015-11-11 02:07:41 +01:00
dd3427d8d0
remove unused component
2015-11-11 02:01:11 +01:00
2c9273a86c
avoid the initial sync from clobbering the location bar
2015-11-11 02:00:51 +01:00
bc3ee949f5
fix warning about missing thead
2015-11-11 02:00:18 +01:00
5aa468f1e3
skin simpleheader
2015-11-11 01:59:56 +01:00
c2af09fbaa
fix Spinner CSS a bit
2015-11-11 00:57:31 +01:00
bbd7124ac7
improve comment on how our dynamic height CSS works
2015-11-11 00:57:16 +01:00
adb7915b3e
suppress warning
2015-11-11 00:56:51 +01:00
5c92b09da1
improve spacing on login screen
2015-11-11 00:56:44 +01:00
2e9e03bd45
oops, refresh the login options on mount. make autofocus work too.
2015-11-11 00:39:48 +01:00
19b31ff30d
oops, make this actually work.
2015-11-11 00:06:49 +01:00
801154fd8a
apply jsx
2015-11-11 00:05:35 +01:00
f628591e27
fix login page vertical scroll and centering
2015-11-10 19:19:23 +00:00
9cbd4ae2e4
fix raging typos
2015-11-10 19:15:14 +00:00
0825e0a2e2
retrieve last used HS/IS URL from local storage, and associated tweaks
2015-11-10 19:09:24 +00:00
68c1ddd5d2
replace react-loader with Spinner everywhere
2015-11-10 18:12:26 +00:00
9a6624d1c7
Do read receipt avatars with absolute positioning: this should be a lot easier to animate. Also mess around with the MemberAvatar a bit so it's easier to style.
2015-11-10 17:44:59 +00:00
c9823d07fd
Limit number of read avatars, lay them out as per the design & order them.
2015-11-10 13:51:11 +00:00
450036a6ed
Merge remote-tracking branch 'origin/develop' into read_receipts
2015-11-10 11:26:42 +00:00
ef7a38e558
gemini scrollbar on the memberlist too
2015-11-10 02:26:46 +00:00
2ca64d9c15
add gemini-scrollbar to the main roomview
2015-11-10 02:04:21 +00:00
cb887c699e
use gemini-scrollbar to provide fake scrollbars for the room list
2015-11-10 01:40:08 +00:00
2ccd881665
port to react 0.14, removing getDOMNode()s for DOM components and turning them into ReactDOM.findDOMNode()s for React components
2015-11-09 23:54:10 +00:00
87bb7c9b7b
upgrade to react 0.14
2015-11-09 23:13:46 +00:00
6d9817e5e7
Merge pull request #342 from vector-im/matthew/orderable-roomlist
...
Implement reorderable rooms via room tagging.
2015-11-09 16:05:00 +00:00
23c93de82e
Merge branch 'develop' into matthew/orderable-roomlist
2015-11-09 16:04:20 +00:00
bea64082a9
put the DragDropContext on LeftPanel rather than MatrixChat to allow index.js to continue to abuse MatrixChat by directly invoking the showScreen method on it
2015-11-09 15:44:08 +00:00
c3385d597a
Merge pull request #332 from vector-im/kegan/syncing
...
Implement connection lost bar + resend all
2015-11-09 15:35:38 +00:00
752f8bdbb8
remove random bold initials
2015-11-09 14:04:43 +00:00
1f69760173
fix comedy scrolling parallax avatar initial bug
2015-11-09 12:41:23 +00:00
66add5673b
de-hash rooms
2015-11-09 11:53:50 +00:00
a3082753ef
shove initials onto default room & member avatars as per the design
2015-11-09 02:12:26 +00:00
eaa2f94327
warning png
2015-11-09 00:13:40 +00:00
615879ffdd
skin to match CSS (spacing will need to be fixed once matthew/ordered-roomlist lands)
2015-11-09 00:13:25 +00:00
05d921256f
re-skin the notification bar
2015-11-08 23:37:14 +00:00
9526deb024
add error dialogs and order search results by recents
2015-11-08 16:19:53 +00:00
567176ea6c
put a load of margin on the bottommost sublist to increase its hit target size and avoid problems when toggling its hiddenness
2015-11-08 14:08:17 +00:00
5494a4ea6c
s/deprioritize/demote/
2015-11-08 13:50:36 +00:00
827c0da33c
commented out debug
2015-11-08 13:42:45 +00:00
f0dbb422f6
update the actual target list, which may not be the same as the one we dropped on
2015-11-08 13:13:01 +00:00
5c406856ed
adjust column widths to match design
2015-11-08 12:59:19 +00:00
b15def84bc
fix spacing of the layout to match latest designs
2015-11-08 12:48:23 +00:00
bbbe074d92
hide all the debugging behind if (debug)
2015-11-08 12:24:32 +00:00
36da1accca
click on CallView preview to jump to call
2015-11-08 12:14:10 +00:00
e289235e17
fix tooltip positioning when collapsed
2015-11-08 12:02:26 +00:00
c60e8736c1
handle collapsed drop-targets better
2015-11-08 11:50:15 +00:00
69899e3718
position sublist chevron better when collapsed
2015-11-08 11:44:13 +00:00
ed4c5b9f73
switch initial spinner to mx_Spinner
2015-11-07 20:16:44 +00:00
4e170a2831
fix onRoomTags signature
2015-11-07 20:16:05 +00:00
07200d7953
Merge branch 'develop' into matthew/orderable-roomlist
2015-11-07 17:29:18 +00:00
4a195dd3f0
sacrifice a small mountainside of goats to make placeholder-based work correctly
2015-11-07 02:57:56 +00:00
fe442f5c24
fix various edge cases when dragging stuff back to the conversations list
2015-11-06 23:30:57 +01:00
89327bd38f
precedence fail :(
2015-11-06 21:33:28 +01:00
f102e3b3b7
collapsible sublist graphics
2015-11-06 21:25:35 +01:00
1150e22190
collapsible sublists
2015-11-06 21:25:20 +01:00
886ffbf158
switch to m.* prefixes for tags before it's too late
2015-11-06 21:00:34 +01:00
c884c5fc33
actually manage manual ordering; support arbitrary tags; bug fixes
2015-11-06 20:54:07 +01:00
fdf79d709e
Replace CAS login with token login
2015-11-06 11:22:59 +00:00
e20388388e
null check
2015-11-05 17:40:37 +00:00
3a8c263e8e
Add resending bar (and resend all option)
...
Factor out resend logic which was in the context menu into a separate
Resend file (it shouldn't be in the skin, but it also isn't really
suitable for a controller given 2 different views invoke it..)
2015-11-05 15:59:03 +00:00
804af341ac
Add a 'connection lost' bar.
2015-11-05 14:52:44 +00:00
4bf6992398
Don't send read receipts for our own events and null check in a few places.
2015-11-05 14:16:15 +00:00
8842147ec3
skin RoomDropTarget correctly
2015-11-05 11:21:45 +00:00
942659df0d
Work around the bug where some channels have no name from the js sdk which was causing vector to exception and never load.
2015-11-04 14:15:57 +00:00
61e55b3ca3
implement most of drag & drop.
2015-11-04 02:25:08 +00:00
7fe7af6026
refactor out the sections of the RoomList into RoomSubLists. Start wiring up tags
2015-11-04 00:19:37 +00:00
7dc5f91fad
Remove unused code
2015-11-03 18:59:45 +00:00
5b773b99c0
Add basic m.video view support
2015-11-03 18:56:55 +00:00
8b9b268ec0
make our state explicit
2015-11-03 14:35:55 +00:00
27cf9cf561
put invites above recents
2015-11-03 14:35:48 +00:00
b1b2704bed
avoid racey NPE on first login
2015-11-03 14:35:39 +00:00
2a4a02f36e
More on read receipts: listen for events, add keys & class / very minimal css.
2015-11-03 13:44:40 +00:00
11c38014e5
Sort of display read avatars but without live updating
2015-11-02 18:55:28 +00:00
6e63153d83
Add unsupported suffix on Ongoing conf notification if conf calls are unsupported in the browser
2015-11-02 18:01:20 +00:00
159f0c9594
Merge remote-tracking branch 'origin/develop' into read_receipts
2015-11-02 14:29:20 +00:00
e869814f2d
Don't display anything if TextForEvent doesn't give us any text. Fixes #253 (catapillar of doom).
2015-11-02 14:14:47 +00:00
38780ad492
Merge branch 'develop' into kegan/reject-invites
2015-11-02 09:47:51 +00:00
e25d31a9fe
Merge pull request #296 from vector-im/matthew/redesign
...
Matthew/redesign
2015-10-30 18:30:13 +00:00
56d00c2ec7
make onFinished required prop for modal contents
2015-10-30 18:26:22 +00:00
79af89fd1b
fix missing decl
2015-10-30 18:26:05 +00:00
11e176df66
comment for the hidden collapse button
2015-10-30 18:23:08 +00:00
75bc878657
comment what a CR is
2015-10-30 18:22:21 +00:00
ddbc8dffb3
switch from enums to string literals for SearchBar.Scope
2015-10-30 18:21:54 +00:00
6aad99a505
comment \u200b
2015-10-30 18:20:29 +00:00
35cebc56d3
rewrite the HTML message stuff to fix XSS and improve clarity
2015-10-30 18:19:20 +00:00
668234be4c
Add reject button and impl
2015-10-30 17:18:25 +00:00
626e8bab1a
Merge pull request #283 from vector-im/kegan/blocking
...
Add feature-based browser blocking
2015-10-30 14:59:06 +00:00
633bbd8f29
Review comments: add chrome blurb.
2015-10-30 14:58:47 +00:00
ffb9ce89c7
Merge branch 'develop' into matthew/redesign
2015-10-30 11:50:34 +00:00
fdfa0cbd0e
display search results correct; support HTML markup
2015-10-30 04:10:37 +00:00
d315e4afcd
show m.room.names
2015-10-30 02:06:34 +00:00
80c04048d0
cancel viewsource dialog with escape
2015-10-29 21:30:29 +00:00
05d96f4cfb
fix filters, and stop react exploding on unrecognised event tiles
2015-10-29 18:28:30 +00:00
Kegan Dougal