Kegan Dougal
0210670e91
Merge branch 'develop' into kegan/vector-references
...
Conflicts:
src/component-index.js
2015-12-02 09:37:28 +00:00
Matthew Hodgson
cba27a7488
erm, surely we need to actually run reskindex after all that?
2015-12-02 01:37:26 +00:00
Matthew Hodgson
349a88d640
stop clobbering our font colours
2015-12-01 21:44:22 +00:00
David Baker
95e71a531e
Merge branch 'develop' into kegan/vector-references
...
Update having merged skindexing PR
2015-12-01 18:31:13 +00:00
David Baker
d2c6e2195e
Merge pull request #447 from vector-im/skindex-nextgen
...
Update skindexing for new world order
2015-12-01 18:12:47 +00:00
David Baker
a63bf7cb35
Merge branch 'develop' into skindex-nextgen
2015-12-01 18:10:57 +00:00
David Baker
7ff5e42f3e
Run the CSS through webpack so we can pull in CSS files from modules with require rather than symlinking into the node_module directory which is breaking people on different npm versions.
2015-12-01 18:05:43 +00:00
Matthew Hodgson
2c12b9128b
highlight binged rooms more clearly
2015-12-01 16:57:49 +00:00
Kegan Dougal
e21d435d84
Remove debug logging
2015-12-01 16:57:40 +00:00
Kegan Dougal
a2b28b826c
Add CustomServerDialog for vector
2015-12-01 16:48:51 +00:00
Kegan Dougal
8d31f72f83
Add VectorLoginHeader
2015-12-01 16:27:23 +00:00
Kegan Dougal
e304a1925d
Add VectorLoginFooter with vector references
2015-12-01 16:12:38 +00:00
David Baker
c281fe785a
Merge branch 'develop' into skindex-nextgen
2015-12-01 15:53:11 +00:00
Kegan Dougal
8083e7f118
Move vector-only components to src/components.
2015-12-01 15:45:38 +00:00
David Baker
5098c7d16f
Merge branch 'develop' into skindex-nextgen
2015-12-01 15:44:45 +00:00
Kegan Dougal
e07c03a7bb
Merge branch 'develop' into kegan/vector-components
2015-12-01 15:39:02 +00:00
Kegsay
e7f6e09def
Merge pull request #448 from vector-im/kegan/controller-merging4
...
Phase 4 controller merging
2015-12-01 15:34:25 +00:00
Matthew Hodgson
075d2b508d
fix highlights on markdown
2015-12-01 13:13:51 +00:00
Kegan Dougal
e55e2bdd0d
Remove unused class
2015-12-01 11:22:19 +00:00
Kegan Dougal
2a025201b1
Move remaining vector molecules to be components in vector (for now)
2015-12-01 11:19:54 +00:00
Matthew Hodgson
f89dcacf07
fix bottomleftmenu layout a bit
2015-12-01 11:11:32 +00:00
Matthew Hodgson
99f47b8601
match design spacing correctly
2015-12-01 11:07:12 +00:00
Matthew Hodgson
1896ab67d1
fix room avatar offset
2015-12-01 11:05:11 +00:00
Kegan Dougal
8f5f71ec80
Move MatrixChat to react-sdk. Move all login stuff to react SDK.
...
Removed Modulator stuff.
2015-11-30 18:10:09 +00:00
David Baker
021056cfd1
Move copyright header
2015-11-30 18:00:54 +00:00
David Baker
6a4038daeb
Add 'replaces' tag to mark that the RoomDNDView is a RoomTile
2015-11-30 17:56:55 +00:00
David Baker
cadfbcbed3
Merge branch 'develop' into skindex-nextgen
2015-11-30 17:56:40 +00:00
David Baker
6f646260aa
WIP of component indexing update
2015-11-30 17:31:32 +00:00
Matthew Hodgson
badfdb5e3e
actually, seems FF is happy with this again now
2015-11-30 17:24:38 +00:00
Matthew Hodgson
2345624d31
switch to Open Sans, juggling font-size appropriately (as Open Sans is physically larger for the same point size as Myriad Pro, irritatingly), and fix some really weird baseline CSS bugs in read receipts that were introduced. Hopefully this doesn't re-introduce the intermittent baseline offset bug for the initials on Chrome & FF
2015-11-30 17:17:09 +00:00
Kegan Dougal
ddc4f30bb6
Remove RoomView and port it to react-sdk. Move Resend.js to react-sdk
2015-11-30 17:16:31 +00:00
Kegan Dougal
4e7aa78ed7
Move RoomList to react-sdk. Inject a ConferenceHandler.
2015-11-30 16:56:05 +00:00
Kegan Dougal
e792ebb837
Move and merge UserSettings to react-sdk
2015-11-30 15:53:13 +00:00
Matthew Hodgson
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
Kegan Dougal
b89bd35cad
Merge branch 'develop' into kegan/controller-merging4
2015-11-30 15:42:32 +00:00
Matthew Hodgson
7636645efc
rename message components as per RL discussion this morning
2015-11-30 15:25:21 +00:00
Kegan Dougal
bd906cbc69
Move and merge LogoutPrompt to react-sdk
2015-11-30 15:23:37 +00:00
Kegan Dougal
cb30cbb09a
Remove MemberList and put it in react-sdk
2015-11-30 15:14:04 +00:00
Kegan Dougal
2b37e5334a
Remove Notifier and put it in react-sdk
2015-11-30 15:05:00 +00:00
Matthew Hodgson
f947400131
Open Sans
2015-11-30 14:17:33 +00:00
Kegan Dougal
fd4d7eba12
Remove ErrorDialog and QuestionDialog to react-sdk
2015-11-30 14:11:28 +00:00
Matthew Hodgson
8a00e71139
remove spurious Vector layer Avatar helper class
2015-11-30 13:56:53 +00:00
Kegan Dougal
83b3702769
Merge branch 'develop' into kegan/controller-merging4
2015-11-30 10:56:14 +00:00
Kegan Dougal
450b2d4d67
Move CreateRoom to react-sdk
2015-11-30 10:55:52 +00:00
Matthew Hodgson
cd040ae0dd
fix zalgo properly! remove ugly regexp hacks for detecting combining diacritics and instead set the right font ordering, as Arial combines nicely with Myriad Pro whilst Helvetica doesn't. (Myriad Pro itself has no combining diacritic characters)
2015-11-30 01:13:59 +00:00
Matthew Hodgson
9a64dc27fc
improve layout for search results, fix syntax highlighting quirks in sublime, and don't crash on zero results
2015-11-29 13:32:13 +00:00
Matthew Hodgson
af6bd53d38
revert 23d45d7f33 and apply a better fix which works for both chrome & FF
2015-11-29 13:18:37 +00:00
Matthew Hodgson
01f0e61d6e
fix search ordering; add room labels; hide input areas if searching
2015-11-29 04:41:17 +00:00
Matthew Hodgson
fc02331cd3
fix CSS for search timestamps
2015-11-29 03:20:19 +00:00
Matthew Hodgson
e43edee9bb
call highlighted search terms highlights, and uphold them if provided by synapse
2015-11-29 03:19:51 +00:00
Matthew Hodgson
8de94d45b1
swim like a salmon and manually update skindex for a generic TextualMessage type
2015-11-28 21:11:37 +00:00
Matthew Hodgson
9e97160c85
fix inline <code/> blocks
2015-11-27 16:20:37 +00:00
Kegan Dougal
07001ae35e
Remove unused files
2015-11-27 16:11:58 +00:00
Kegan Dougal
0ef7c8d16d
Use the right name
2015-11-27 15:43:16 +00:00
Kegan Dougal
df86e85492
Move ContextualMenu to React SDK
2015-11-27 15:37:00 +00:00
Kegan Dougal
05c9b44b81
Move velocity stuff to react sdk
2015-11-27 15:34:26 +00:00
Kegan Dougal
a5d00c73b2
Move HtmlUtils to react SDK
2015-11-27 15:01:06 +00:00
Kegan Dougal
40b974f22d
Move all Event/Message Tiles to React SDK.
2015-11-27 14:35:16 +00:00
Kegan Dougal
f969ccb50c
Move and merge RoomTile/MemberTile to react SDK. Keep DND stuff in vector as RoomDNDView.
2015-11-27 11:52:29 +00:00
Kegan Dougal
b007edca63
Merge and move RoomHeader/RoomSettings into React SDK
2015-11-27 10:42:25 +00:00
Kegan Dougal
3ce29622ed
Move and merge MemberInfo to React SDK
2015-11-26 17:49:55 +00:00
Kegan Dougal
1a6afc2ef0
Move and merge UserSelector
2015-11-26 17:38:01 +00:00
Kegan Dougal
6dea8e7256
Move and merge MessageComposer
2015-11-26 17:31:37 +00:00
Kegan Dougal
7595071e6a
Move and merge ProgressBar
2015-11-26 17:21:35 +00:00
Kegan Dougal
fdad00790e
Move and merge Change* components to React SDK. Update references.
2015-11-26 17:11:26 +00:00
Kegan Dougal
9ecf5bed64
Nuke old CallView controller
2015-11-26 16:48:32 +00:00
Kegan Dougal
ff9608c914
Move and merge voip molecules. Inject the ConferenceHandler as a prop
...
This keeps the vector conf logic munge separate from react SDK.
2015-11-26 16:39:58 +00:00
Kegan Dougal
49e5f18f62
Move and merge create_room atoms to react SDK
2015-11-26 15:43:57 +00:00
Kegan Dougal
c5b0ea7e9f
Move VideoFeed to React SDK
2015-11-26 15:24:32 +00:00
Kegan Dougal
83eae1b64a
Move and merge EditableText into React SDK
2015-11-26 15:15:45 +00:00
Kegan Dougal
35ee9c9ddd
Move and merge EnableNotificationsButton to react SDK
2015-11-26 15:10:49 +00:00
Kegan Dougal
0a8f5b6223
Move ImageView
2015-11-26 14:51:30 +00:00
Kegan Dougal
3f120c7027
Nuke LogoutButton; nothing used it.
2015-11-26 14:47:11 +00:00
Kegan Dougal
343670c5c4
Move MessageTimestamp
2015-11-26 14:38:48 +00:00
Kegan Dougal
f21b6203ed
Merge branch 'kegan/controller-merging' into kegan/controller-merging2
2015-11-26 14:31:31 +00:00
Kegan Dougal
8517f9f2bf
Missed one
2015-11-26 14:29:26 +00:00
Kegan Dougal
3c12191cb7
Move Spinner
2015-11-26 14:25:20 +00:00
Kegan Dougal
ab22ca6a28
Also move the existing login components to the new structure
2015-11-26 14:11:45 +00:00
Kegan Dougal
8898b444af
Point things at the right places
2015-11-26 13:48:37 +00:00
Kegan Dougal
d079617ce2
Nuke MemberAvatar/RoomAvatar; moved to react SDK
2015-11-26 13:25:56 +00:00
Matthew Hodgson
f9040e08ce
fix conflicts
2015-11-24 16:05:58 +00:00
Matthew Hodgson
fd8864d528
STOP PEOPLE SHOUTING
2015-11-22 22:35:34 +00:00
Matthew Hodgson
841c790337
naughty override to stop RoomList panel scrolling horizontally
2015-11-22 15:47:50 +00:00
Matthew Hodgson
324c3e7dcf
override more GFM css
2015-11-22 15:47:10 +00:00
Matthew Hodgson
01641543da
only try to syntax highlight html
2015-11-21 12:33:45 +00:00
Matthew Hodgson
9038b984ff
fix css link
2015-11-21 12:15:38 +00:00
Matthew Hodgson
da97185fcd
highlight <code/> blocks via highlight.js
2015-11-21 12:14:56 +00:00
Matthew Hodgson
b6e9c1eaab
oops, forgot gfm.css
2015-11-20 20:20:30 +00:00
Matthew Hodgson
76c6d6d4d6
add target=_blank onto all HTML links, and apply GFM.css for CSS for markdown
2015-11-20 20:12:23 +00:00
Matthew Hodgson
4c11de787e
make h2 layout specific to the list
2015-11-20 20:11:06 +00:00
Matthew Hodgson
96c825b89f
wrap whitespace on notices
2015-11-20 20:10:49 +00:00
Matthew Hodgson
29af81e827
Refactor HTML markup stuff into its own class, and whitelist h1 and h2
2015-11-20 18:58:13 +00:00
David Baker
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
Kegan Dougal
06427d663d
Add support for playing gifs on mouse enter/leave
2015-11-20 16:36:58 +00:00
David Baker
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
Kegan Dougal
29ee7d2b13
Remove useless logging
2015-11-20 14:34:26 +00:00
Kegan Dougal
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
Kegan Dougal
37254e6243
Add PostRegistration component
2015-11-20 12:02:37 +00:00
Kegan Dougal
1edea2a62c
Add a PostRegistration component; hook it up to MatrixChat.
2015-11-20 12:02:23 +00:00
Kegsay
99ccff098c
Merge pull request #399 from vector-im/kegan/reg-refactor
...
Refactor registration
2015-11-20 10:28:26 +00:00
Kegan Dougal
3075c97bae
Set busy Spinner
2015-11-20 10:27:21 +00:00
Kegan Dougal
f62312fbf3
Remove old registration files. Move CaptchaForm to React SDK.
2015-11-20 10:18:04 +00:00
Matthew Hodgson
02d5154aaf
more alt tags
2015-11-19 17:45:03 +00:00
Matthew Hodgson
41eaf18470
add hoverover test for edit button
2015-11-19 17:43:55 +00:00
Kegan Dougal
d372018e61
Minor tweaks
2015-11-19 16:47:14 +00:00
Kegan Dougal
bb6eeea0d8
Factor out div ID name to avoid tight coupling with logic class.
2015-11-19 16:08:25 +00:00
Kegan Dougal
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
Kegan Dougal
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
Kegan Dougal
e700a5a219
Add TODO on post register logic
2015-11-19 13:58:52 +00:00
Matthew Hodgson
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
Kegan Dougal
eaafc11064
Factor out Captcha UI
2015-11-19 13:44:11 +00:00
Richard van der Hoff
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
David Baker
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
David Baker
09b0d221df
Kill the last getDOMNode()
2015-11-19 11:03:33 +00:00
David Baker
ed3d3a9e23
Shift css around a bit so it more closely matches DOM order
2015-11-19 10:49:24 +00:00
David Baker
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
Kegan Dougal
5f57cd9559
Merge branch 'develop' into kegan/reg-refactor
2015-11-19 09:50:08 +00:00
David Baker
0dd85d9adf
Hidden localstorage option to enable bouncy read receipts :p
2015-11-19 09:44:24 +00:00
Matthew Hodgson
23d45d7f33
fix initials behaviour on FF
2015-11-18 23:46:43 +00:00
Matthew Hodgson
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
Matthew Hodgson
bf3e90bb47
dirty hack to fix the uneven spacing
2015-11-18 23:04:12 +00:00
Matthew Hodgson
68a005bf1f
stop edit option from colliding with scrollbar again
2015-11-18 22:24:54 +00:00
Matthew Hodgson
884d0de90b
s/React/ReactDOM/ to fix another 0.14 warning
2015-11-18 22:22:19 +00:00
Matthew Hodgson
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
Matthew Hodgson
d66006893a
fix react 0.14 warning from getDOMNode()
2015-11-18 22:10:08 +00:00
Matthew Hodgson
8fed464cf6
and the new voice icon
2015-11-18 21:18:16 +00:00
Matthew Hodgson
08ba0457e8
add a temporary voice call button
2015-11-18 21:17:58 +00:00
Matthew Hodgson
098491e350
avoid hoverover artefacts on avatar initials
2015-11-18 20:56:43 +00:00
Matthew Hodgson
46541a3f2e
logout button on splashscreen to avoid wedging users whose server has gone awol
2015-11-18 20:47:14 +00:00
Matthew Hodgson
c9fe0b96b7
fix whitespace
2015-11-18 20:46:39 +00:00
Matthew Hodgson
742ae354e5
clicking anywhere in the composer pane should focus on the textarea
2015-11-18 20:15:15 +00:00
Kegan Dougal
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
Kegan Dougal
5424567a66
Hook up onFormSubmit to make registration (dummy only) work again.
2015-11-18 17:15:20 +00:00
David Baker
f0df3f29b9
Show all read avatars on click
2015-11-18 17:12:17 +00:00
Kegan Dougal
b4c0625961
Show validation errors
2015-11-18 15:32:44 +00:00
David Baker
1099892784
Merge pull request #379 from vector-im/read_receipts
...
Read receipts
2015-11-18 14:53:29 +00:00
Richard van der Hoff
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
Kegan Dougal
ed3527e243
Merge branch 'develop' into kegan/reg-refactor
2015-11-17 17:43:22 +00:00
Kegan Dougal
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
David Baker
c63dd376d8
Fix member avatar initials (I failed at git conflict merging)
2015-11-17 17:31:03 +00:00
David Baker
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
David Baker
80c2bd0c7f
Remove bouncing, set animation time to be constant (prevents temporary overalpping) and exclude ourselves.
2015-11-17 15:51:00 +00:00
Kegan Dougal
714c96283e
Setting defaults from config.json got lost
2015-11-17 15:12:55 +00:00
Kegan Dougal
c57fb44c71
Fix path resolution
2015-11-17 13:26:23 +00:00
Kegan Dougal
8602e0665d
PR feedback from #355
2015-11-17 10:57:44 +00:00
Kegsay
af1e3373ea
Merge pull request #355 from vector-im/kegan/login-refactor
...
Refactor login page
2015-11-17 10:47:56 +00:00
Matthew Hodgson
79e39429b7
add todo
2015-11-17 02:40:19 +00:00
Matthew Hodgson
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
Matthew Hodgson
88c5a5e074
missing copyright
2015-11-17 02:14:06 +00:00
David Baker
e23b90abd5
More s/messageWrapper/messagePanel/
2015-11-16 16:52:07 +00:00
