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
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
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
0aa90d918c
bump js-sdk dep to develop
2015-11-05 14:45:16 +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
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
4dac9bc1b8
Use relative rather than absolute paths for icons
2015-11-02 23:47:04 +00:00
11c38014e5
Sort of display read avatars but without live updating
2015-11-02 18:55:28 +00:00
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
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
3b82884947
Merge pull request #298 from vector-im/kegan/reject-invites
...
Add invite rejection
2015-11-02 09:50:17 +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
ce9a91e155
bundle.css shouldn't be necessary apart from the vector/bundle.* above
2015-10-30 11:33:33 +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
Matthew Hodgson