Commit graph

62745 commits

Author SHA1 Message Date
Kegsay
f9a5f4b61e Merge pull request #420 from vector-im/kegan/controller-merging
Phase 1 controller merging (general structure)
2015-11-27 14:59:38 +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
4a2fe426bf Move and merge RoomTile and MemberTile. Extract DND stuff.
DND stuff lives in Vector. RoomTile on its own is UNTESTED and will probably
break since we don't conditionally check for onDragXXX function props.
2015-11-27 11:50:33 +00:00
Kegan Dougal
b007edca63 Merge and move RoomHeader/RoomSettings into React SDK 2015-11-27 10:42:25 +00:00
Kegan Dougal
bf46ce19e0 Merge and move RoomHeader/RoomSettings 2015-11-27 10:42:03 +00:00
Kegan Dougal
3ce29622ed Move and merge MemberInfo to React SDK 2015-11-26 17:49:55 +00:00
Kegan Dougal
11efb1ede4 Move and merge MemberInfo 2015-11-26 17:49:39 +00:00
Kegan Dougal
1a6afc2ef0 Move and merge UserSelector 2015-11-26 17:38:01 +00:00
Kegan Dougal
6e9e314f24 Move and merge UserSelector 2015-11-26 17:37:40 +00:00
Kegan Dougal
6dea8e7256 Move and merge MessageComposer 2015-11-26 17:31:37 +00:00
Kegan Dougal
206c45e703 Move and merge MessageComposer 2015-11-26 17:31:10 +00:00
Kegan Dougal
7595071e6a Move and merge ProgressBar 2015-11-26 17:21:35 +00:00
Kegan Dougal
75afc3a7de Move and merge ProgressBar 2015-11-26 17:21:08 +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
fc7707971e Move and merge Change Avatar|DisplayName|Password components 2015-11-26 17:10:36 +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
6c9f3303c6 Convert voip molecules to components
Don't pull in VectorConferenceHandler; instead accept a prop which meets a
conference handler interface.
2015-11-26 16:38:56 +00:00
Kegan Dougal
172735a837 Move create_room atoms to components 2015-11-26 15:44:42 +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
e55ecfeacb Add VideoFeed component 2015-11-26 15:20:57 +00:00
Kegan Dougal
4fda0ce0c9 Fix typo 2015-11-26 15:17:34 +00:00
Kegan Dougal
17d789eb97 Merge EditableText component 2015-11-26 15:16:50 +00:00
Kegan Dougal
83eae1b64a Move and merge EditableText into React SDK 2015-11-26 15:15:45 +00:00
Kegan Dougal
8bde761a8a Add EnableNotificationButton component 2015-11-26 15:11:08 +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
c2ae6238b9 Nuke LogoutButton; nothing used it. 2015-11-26 14:48:02 +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
659fc8fcfb Point to new Spinner location 2015-11-26 14:24:21 +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
1dc4e14606 Import things at the right levels 2015-11-26 13:49:39 +00:00
Kegan Dougal
8898b444af Point things at the right places 2015-11-26 13:48:37 +00:00
Kegan Dougal
7846d49403 Add missing deps; Move stuff in 'views' to have functional descriptors 2015-11-26 13:45:04 +00:00
Kegan Dougal
776369299d Move login components to views 2015-11-26 13:27:52 +00:00
Kegan Dougal
d079617ce2 Nuke MemberAvatar/RoomAvatar; moved to react SDK 2015-11-26 13:25:56 +00:00
Kegan Dougal
b69fff5b01 Define component directories. Merge MemberAvatar and RoomAvatar to new-style components.
Spoken to @ara4n about names/conventions. Settled on the following layout:

  src/components
      |_____________views
      |               |____ tiles
      |               |       |___ MTextTile.js
      |               |       |___ MNoticeTile.js
      |               |       |___ ...
      |               |
      |               |____ avatars
      |               |       |____ RoomAvatar.js
      |               |       |____ MemberAvatar.js
      |               |       |____ ...
      |               |
      |               |____ ...
      |
      |_____________structures
                      |____ RoomView.js
                      |____ UserSettings.js
                      |____ CreateRoom.js
                      |____ ...

Views are the "pure UI" components which can be reused. Structures are the
wire components which give important contextual information to the views e.g.
a view may be MemberList, but it's where it is in the structure that defines
that it is a *Room* MemberList.
2015-11-26 12:02:31 +00:00
Matthew Hodgson
93c67771af Merge pull request #324 from vector-im/erikj/video
Add basic m.video view support
2015-11-24 16:06:11 +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
92728ff4e6 spell out npm run build 2015-11-22 01:13:08 +00:00
Matthew Hodgson
01641543da only try to syntax highlight html 2015-11-21 12:33:45 +00:00