Commit graph

62750 commits

Author SHA1 Message Date
Matthew Hodgson
b15def84bc fix spacing of the layout to match latest designs 2015-11-08 12:48:23 +00:00
Matthew Hodgson
bbbe074d92 hide all the debugging behind if (debug) 2015-11-08 12:24:32 +00:00
Matthew Hodgson
36da1accca click on CallView preview to jump to call 2015-11-08 12:14:10 +00:00
Matthew Hodgson
e289235e17 fix tooltip positioning when collapsed 2015-11-08 12:02:26 +00:00
Matthew Hodgson
c60e8736c1 handle collapsed drop-targets better 2015-11-08 11:50:15 +00:00
Matthew Hodgson
69899e3718 position sublist chevron better when collapsed 2015-11-08 11:44:13 +00:00
Matthew Hodgson
ed4c5b9f73 switch initial spinner to mx_Spinner 2015-11-07 20:16:44 +00:00
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
David Baker
b556eff492 Merge pull request #28 from stevenhammerton/sh-cas-token-login
SH - CAS / Login Token Login Update
2015-11-06 15:40:56 +00:00
Steven Hammerton
fec362c4df JS SDK no longer does redirect for us, get the URL and update browser window location 2015-11-06 12:12:51 +00:00
Steven Hammerton
a7c53e99d9 Clear query params from url with a nasty location update 2015-11-06 11:42:13 +00:00
Steven Hammerton
fdf79d709e Replace CAS login with token login 2015-11-06 11:22:59 +00:00
Steven Hammerton
de165ea6ad Update CAS login to allow HS to do interaction with CAS and client receives and redeems login token 2015-11-06 11:21:13 +00:00
Kegan Dougal
b0e71c9872 Fix bugs from typos from hackathon 2015-11-06 09:57:22 +00:00
David Baker
e20388388e null check 2015-11-05 17:40:37 +00:00
Kegan Dougal
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
David Baker
7882780357 Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-05 15:33:50 +00:00
Kegsay
f5116fe026 Merge pull request #27 from matrix-org/kegan/syncing
Unbreak everything (JS SDK had breaking API change)
2015-11-05 15:20:42 +00:00
David Baker
f4e65f8e17 Remove name event listener 2015-11-05 15:07:46 +00:00
David Baker
3114422cb7 Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-05 15:05:29 +00:00
Kegan Dougal
804af341ac Add a 'connection lost' bar. 2015-11-05 14:52:44 +00:00
David Baker
d8edbd2e3c Requires js-sdk develop 2015-11-05 14:45:48 +00:00
David Baker
0aa90d918c bump js-sdk dep to develop 2015-11-05 14:45:16 +00:00
Kegan Dougal
a7c6a923f0 Unbreak everything (JS SDK had breaking API change) 2015-11-05 14:37:05 +00:00
David Baker
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
David Baker
f9385b455a Don't try to send read receipts if the room is null 2015-11-05 13:27:03 +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
Erik Johnston
7dc5f91fad Remove unused code 2015-11-03 18:59:45 +00:00
Erik Johnston
5b773b99c0 Add basic m.video view support 2015-11-03 18:56:55 +00:00
David Baker
3fec3a7326 Better error message if there is no accessSync (which there isn't on old node) 2015-11-03 18:29:49 +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
David Baker
86ef0e762e Merge code to send read receipts into react-sdk RoomView controller 2015-11-03 14:08:51 +00:00
David Baker
2a4a02f36e More on read receipts: listen for events, add keys & class / very minimal css. 2015-11-03 13:44:40 +00:00
David Baker
5a72f199e1 listen for read receipts 2015-11-03 11:41:18 +00:00
David Baker
7c9b773bf8 unintentionally comitted logging 2015-11-03 11:22:18 +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