Matthew Hodgson
|
4e170a2831
|
fix onRoomTags signature
|
2015-11-07 20:16:05 +00:00 |
|
Matthew Hodgson
|
07200d7953
|
Merge branch 'develop' into matthew/orderable-roomlist
|
2015-11-07 17:29:18 +00:00 |
|
Matthew Hodgson
|
4a195dd3f0
|
sacrifice a small mountainside of goats to make placeholder-based work correctly
|
2015-11-07 02:57:56 +00:00 |
|
Matthew Hodgson
|
fe442f5c24
|
fix various edge cases when dragging stuff back to the conversations list
|
2015-11-06 23:30:57 +01:00 |
|
Matthew Hodgson
|
89327bd38f
|
precedence fail :(
|
2015-11-06 21:33:28 +01:00 |
|
Matthew Hodgson
|
f102e3b3b7
|
collapsible sublist graphics
|
2015-11-06 21:25:35 +01:00 |
|
Matthew Hodgson
|
1150e22190
|
collapsible sublists
|
2015-11-06 21:25:20 +01:00 |
|
Matthew Hodgson
|
886ffbf158
|
switch to m.* prefixes for tags before it's too late
|
2015-11-06 21:00:34 +01:00 |
|
Matthew Hodgson
|
c884c5fc33
|
actually manage manual ordering; support arbitrary tags; bug fixes
|
2015-11-06 20:54:07 +01:00 |
|
David Baker
|
d462e0b21b
|
Merge pull request #335 from stevenhammerton/sh-cas-token-login
Replace CAS login with token login
|
2015-11-06 15:41:15 +00:00 |
|
Steven Hammerton
|
fdf79d709e
|
Replace CAS login with token login
|
2015-11-06 11:22:59 +00:00 |
|
Matthew Hodgson
|
8842147ec3
|
skin RoomDropTarget correctly
|
2015-11-05 11:21:45 +00:00 |
|
David Baker
|
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 |
|
Matthew Hodgson
|
61e55b3ca3
|
implement most of drag & drop.
|
2015-11-04 02:25:08 +00:00 |
|
Matthew Hodgson
|
7fe7af6026
|
refactor out the sections of the RoomList into RoomSubLists. Start wiring up tags
|
2015-11-04 00:19:37 +00:00 |
|
Matthew Hodgson
|
8b9b268ec0
|
make our state explicit
|
2015-11-03 14:35:55 +00:00 |
|
Matthew Hodgson
|
27cf9cf561
|
put invites above recents
|
2015-11-03 14:35:48 +00:00 |
|
Matthew Hodgson
|
b1b2704bed
|
avoid racey NPE on first login
|
2015-11-03 14:35:39 +00:00 |
|
Matthew Hodgson
|
ff35e02b4d
|
Merge pull request #317 from vector-im/erikj/icons
Use relative rather than absolute paths for icons
|
2015-11-02 23:53:27 +00:00 |
|
Erik Johnston
|
4dac9bc1b8
|
Use relative rather than absolute paths for icons
|
2015-11-02 23:47:04 +00:00 |
|
Kegsay
|
842d6b6c2c
|
Merge pull request #314 from vector-im/kegan/graceful-no-voip
Add unsupported suffix on Ongoing conf notification if conf calls are…
|
2015-11-02 18:18:46 +00:00 |
|
Kegan Dougal
|
6e63153d83
|
Add unsupported suffix on Ongoing conf notification if conf calls are unsupported in the browser
|
2015-11-02 18:01:20 +00:00 |
|
David Baker
|
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 |
|
Kegsay
|
3b82884947
|
Merge pull request #298 from vector-im/kegan/reject-invites
Add invite rejection
|
2015-11-02 09:50:17 +00:00 |
|
Kegan Dougal
|
38780ad492
|
Merge branch 'develop' into kegan/reject-invites
|
2015-11-02 09:47:51 +00:00 |
|
Matthew Hodgson
|
e25d31a9fe
|
Merge pull request #296 from vector-im/matthew/redesign
Matthew/redesign
|
2015-10-30 18:30:13 +00:00 |
|
Matthew Hodgson
|
56d00c2ec7
|
make onFinished required prop for modal contents
|
2015-10-30 18:26:22 +00:00 |
|
Matthew Hodgson
|
79af89fd1b
|
fix missing decl
|
2015-10-30 18:26:05 +00:00 |
|
Matthew Hodgson
|
11e176df66
|
comment for the hidden collapse button
|
2015-10-30 18:23:08 +00:00 |
|
Matthew Hodgson
|
75bc878657
|
comment what a CR is
|
2015-10-30 18:22:21 +00:00 |
|
Matthew Hodgson
|
ddbc8dffb3
|
switch from enums to string literals for SearchBar.Scope
|
2015-10-30 18:21:54 +00:00 |
|
Matthew Hodgson
|
6aad99a505
|
comment \u200b
|
2015-10-30 18:20:29 +00:00 |
|
Matthew Hodgson
|
35cebc56d3
|
rewrite the HTML message stuff to fix XSS and improve clarity
|
2015-10-30 18:19:20 +00:00 |
|
Kegan Dougal
|
668234be4c
|
Add reject button and impl
|
2015-10-30 17:18:25 +00:00 |
|
Kegsay
|
626e8bab1a
|
Merge pull request #283 from vector-im/kegan/blocking
Add feature-based browser blocking
|
2015-10-30 14:59:06 +00:00 |
|
Kegan Dougal
|
633bbd8f29
|
Review comments: add chrome blurb.
|
2015-10-30 14:58:47 +00:00 |
|
David Baker
|
ffb9ce89c7
|
Merge branch 'develop' into matthew/redesign
|
2015-10-30 11:50:34 +00:00 |
|
David Baker
|
ce9a91e155
|
bundle.css shouldn't be necessary apart from the vector/bundle.* above
|
2015-10-30 11:33:33 +00:00 |
|
Matthew Hodgson
|
fdfa0cbd0e
|
display search results correct; support HTML markup
|
2015-10-30 04:10:37 +00:00 |
|
Matthew Hodgson
|
d315e4afcd
|
show m.room.names
|
2015-10-30 02:06:34 +00:00 |
|
Matthew Hodgson
|
80c04048d0
|
cancel viewsource dialog with escape
|
2015-10-29 21:30:29 +00:00 |
|
Matthew Hodgson
|
05d96f4cfb
|
fix filters, and stop react exploding on unrecognised event tiles
|
2015-10-29 18:28:30 +00:00 |
|
Matthew Hodgson
|
8239e57fa1
|
more lightbox tweaks
|
2015-10-29 18:28:30 +00:00 |
|
David Baker
|
f4ca30bb38
|
Throw exception if EventTile is instantiated with an event type it doesn't support.
|
2015-10-29 18:12:42 +00:00 |
|
Kegan Dougal
|
cc313f350c
|
Merge branch 'develop' into kegan/blocking
|
2015-10-29 16:03:26 +00:00 |
|
Erik Johnston
|
ae2768af9c
|
Remove left/right padding from ongoing call notification, so that we don't get scrollbars in chrome
|
2015-10-29 15:57:31 +00:00 |
|
Kegan Dougal
|
511b1f409c
|
Add objectfit and localstorage to browser features
|
2015-10-29 15:56:03 +00:00 |
|
Matthew Hodgson
|
9fd2bf0989
|
remove transparent background for now; specify image width & height; punt the label over to the far RHS; to get around various layout problems in Chrome 44 and Safari 8
|
2015-10-29 11:01:23 +00:00 |
|
Matthew Hodgson
|
2c05515141
|
simplify keys
|
2015-10-29 02:34:06 +00:00 |
|
Matthew Hodgson
|
eb6fbe6a5a
|
theoretically scope the search, but it doesn't work
|
2015-10-29 02:24:35 +00:00 |
|