mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Commit graph

  • e6260987cc some s/then/done/ David Baker 2015-07-16 16:53:08 +01:00
  • 3a6423dd0a Merge branch 'master' into vector David Baker 2015-07-16 16:52:19 +01:00
  • 9b6060a363 Decouple login view & controller David Baker 2015-07-16 16:49:40 +01:00
  • 6b81022e28 Move position of incoming call buttons. Kegan Dougal 2015-07-16 16:32:11 +01:00
  • 47f4c0dfff Use Loader Erik Johnston 2015-07-16 16:20:00 +01:00
  • ebedf0b907 Add comment about RoomAlias magic Erik Johnston 2015-07-16 16:17:29 +01:00
  • 95968bf619 Make server_name magix in RoomAlias optional Erik Johnston 2015-07-16 16:14:55 +01:00
  • 50edc619af Merge branch 'master' into vector David Baker 2015-07-16 16:13:24 +01:00
  • 64042c9de8 Handle localstorage exceptions. David Baker 2015-07-16 16:12:54 +01:00
  • ebe6072225 Make this a done so it doesn't swallow exceptions David Baker 2015-07-16 16:04:12 +01:00
  • cd26d1323f Wire together checkboxes and presets and use new /createRoom api Erik Johnston 2015-07-16 15:55:46 +01:00
  • 155dd74a6f Merge pull request #8 from matrix-org/message-history-arrow-keys David Baker 2015-07-16 15:41:57 +01:00
  • b043889169 Implement sent message history (up/down keys). Kegan Dougal 2015-07-16 15:22:46 +01:00
  • 1677a3bf3a text change David Baker 2015-07-16 15:16:04 +01:00
  • dac94d2293 mplement custom registration screen David Baker 2015-07-16 15:15:14 +01:00
  • 41bab56133 Merge pull request #7 from matrix-org/nick-completion David Baker 2015-07-16 14:52:46 +01:00
  • 42c9766203 s/did/will/ Kegan Dougal 2015-07-16 14:39:15 +01:00
  • 6fbb7d7da4 Implement nick completion (tab-complete). Kegan Dougal 2015-07-16 14:25:57 +01:00
  • cf38b8a5bb Merge branch 'master' into vector David Baker 2015-07-16 14:19:50 +01:00
  • a6df6ca29b Don't forget form values on error David Baker 2015-07-16 14:19:13 +01:00
  • 7aa4d50560 Handle registration errors. David Baker 2015-07-16 14:08:52 +01:00
  • c708976635 Wire up CreateRoom to UI. Erik Johnston 2015-07-16 13:49:34 +01:00
  • 0a3a3dac1a Display call logs in the UI. Kegan Dougal 2015-07-16 13:30:14 +01:00
  • c4379e4827 Remove 'status' from payload; unused. Kegan Dougal 2015-07-16 12:57:59 +01:00
  • 41f659db4c Merge branch 'master' into vector David Baker 2015-07-16 12:44:42 +01:00
  • df790c1b54 Refactor view/controller logic between files, fix syntax & silly bugs. David Baker 2015-07-16 12:44:04 +01:00
  • a6f857e9d8 Merge pull request #6 from matrix-org/voip David Baker 2015-07-16 12:31:36 +01:00
  • 5f3721f471 Tidying up Kegan Dougal 2015-07-16 11:54:53 +01:00
  • c056bdf104 Only allow calls to be placed if there are 2 joined members. Kegan Dougal 2015-07-16 11:34:39 +01:00
  • 50f9d34211 Only display video elements in video calls. Kegan Dougal 2015-07-16 11:30:34 +01:00
  • eedd437ca7 Minimal CSS bodge so the video actually dies when the call ends. Kegan Dougal 2015-07-16 11:21:43 +01:00
  • 7ffd97b5dc Implement call FSM. All works. Kegan Dougal 2015-07-16 11:05:09 +01:00
  • 73a1c2b581 Merge pull request #5 from matrix-org/user_settings David Baker 2015-07-16 10:56:28 +01:00
  • 5d9db52b32 I just couldn't help myself Erik Johnston 2015-07-16 10:53:51 +01:00
  • f17a9b14c2 Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into user_settings Erik Johnston 2015-07-16 10:46:40 +01:00
  • 3555f35737 Check to make sure passwords aren't blank Erik Johnston 2015-07-16 10:43:16 +01:00
  • ca593b8544 Remove commented out code Erik Johnston 2015-07-16 10:39:58 +01:00
  • 5d99abf18c Correctly pull in client version from package.json Erik Johnston 2015-07-16 10:38:00 +01:00
  • 139b92fcd6 Merge branch 'master' into vector David Baker 2015-07-16 10:33:53 +01:00
  • ecd1f09095 Glue in video elements. Kegan Dougal 2015-07-16 10:26:41 +01:00
  • 02045858f7 Wire up change password Erik Johnston 2015-07-16 10:23:31 +01:00
  • e2757b3587 Merge pull request #4 from matrix-org/registration David Baker 2015-07-16 09:58:53 +01:00
  • 931a4f29c8 Argh, accidentally committed again David Baker 2015-07-16 09:57:14 +01:00
  • edc3302d89 Fix broken RoomView CSS due to name clashes and splitting an element in two. Erik Johnston 2015-07-16 09:43:00 +01:00
  • bc93aeb50e Flesh out the user_settings page Erik Johnston 2015-07-16 09:37:58 +01:00
  • 1b4358624f Add a basic modal dialog implementation Erik Johnston 2015-07-16 09:37:14 +01:00
  • 77114e0081 Improve registration so the container page can pick what URL it's going to route through to registration. David Baker 2015-07-15 20:33:12 +01:00
  • 23d9cee299 didn't mean to commit that David Baker 2015-07-15 19:30:10 +01:00
  • 4756427e61 First cut working regisatration David Baker 2015-07-15 19:25:36 +01:00
  • 4f132c418f Fix a couple state bugs. Kegan Dougal 2015-07-15 17:48:26 +01:00
  • 14a4da54f8 Wire up hangup/answer buttons. Kegan Dougal 2015-07-15 17:36:47 +01:00
  • 37c9c8fbb4 Add CallHandler singleton and add CallView. Kegan Dougal 2015-07-15 16:52:23 +01:00
  • 6316f1b195 Add call handling logic. Outbound voice calls work! Kegan Dougal 2015-07-15 15:36:45 +01:00
  • 2b81f46030 Add placeHolder prop for EditableText Erik Johnston 2015-07-15 15:04:39 +01:00
  • dfd54f3b95 Basic structure of user settings Erik Johnston 2015-07-15 15:04:24 +01:00
  • 7e30c0f47b Add CallHandler to handle call logic and make VideoViews/WaveformViews. Kegan Dougal 2015-07-15 14:57:52 +01:00
  • 28cebab9a3 Add voip subdirectory. Kegan Dougal 2015-07-15 14:35:04 +01:00
  • 7cbb43fddb Merge branch 'vector' into voip Kegan Dougal 2015-07-15 14:21:58 +01:00
  • 78bea916e1 Dispatch events when calls are made/received. Kegan Dougal 2015-07-15 14:06:44 +01:00
  • 844a883ad8 Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector Erik Johnston 2015-07-15 13:59:24 +01:00
  • fe98d6ec69 Merge pull request #3 from matrix-org/editable_text David Baker 2015-07-15 13:58:26 +01:00
  • 5cd92229eb Add an editable text atom Erik Johnston 2015-07-15 13:52:27 +01:00
  • f94a061fda Add onClick listeners. Add getters for refs. Kegan Dougal 2015-07-15 13:34:11 +01:00
  • aba103b8e0 Add VideoFeed atom and VideoView organism. Kegan Dougal 2015-07-15 13:09:15 +01:00
  • 2fc08aeb12 Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector Erik Johnston 2015-07-15 10:36:47 +01:00
  • e0fae13b76 Merge pull request #2 from matrix-org/create_room David Baker 2015-07-15 10:24:44 +01:00
  • c69606df44 oops Matthew Hodgson 2015-07-15 04:29:30 +01:00
  • 8db6c17220 fix header Matthew Hodgson 2015-07-15 04:26:25 +01:00
  • b739e7be9e fix avatar spacing Matthew Hodgson 2015-07-15 04:21:32 +01:00
  • ce38d4ea12 moar graphics Matthew Hodgson 2015-07-15 04:16:51 +01:00
  • 9b384e52b5 implement latest skin Matthew Hodgson 2015-07-15 04:16:38 +01:00
  • c0bd574997 improve padding on membership list Matthew Hodgson 2015-07-15 00:36:54 +01:00
  • 9a51cace34 fix bad membership list horizontal scrolling Matthew Hodgson 2015-07-15 00:31:47 +01:00
  • 03d048c06f Get as far as requesting a token David Baker 2015-07-14 19:39:18 +01:00
  • aacc31b2ce Registration works with recaptcha David Baker 2015-07-14 18:46:15 +01:00
  • 4f7dcdf566 Naming conventions Erik Johnston 2015-07-14 17:48:12 +01:00
  • bb06b752b4 Document CreateRoom phases Erik Johnston 2015-07-14 17:40:49 +01:00
  • c4764af9a2 Add phases to CreateRoom organism Erik Johnston 2015-07-14 17:27:22 +01:00
  • a077abfb99 Remove console.log Erik Johnston 2015-07-14 17:04:44 +01:00
  • 03b715b8bf Add onRoomCreated callback to CreateRoom organism Erik Johnston 2015-07-14 17:01:06 +01:00
  • a748c090fb Move all element specific code into skins/ Erik Johnston 2015-07-14 16:59:11 +01:00
  • b53e710d20 Add invite selection to create room dialog Erik Johnston 2015-07-14 16:53:49 +01:00
  • ed52cdf6df Add basic CreateRoom organism. Supports setting room name and selecting preset Erik Johnston 2015-07-14 15:14:26 +01:00
  • 77e76972f0 avatars for joins & parts Matthew Hodgson 2015-07-14 14:31:13 +01:00
  • dff9353339 tabs->spaces everywhere; sorry folks - \!blame sublime Matthew Hodgson 2015-07-14 12:11:01 +01:00
  • 69d1844773 fix NPE for invites Matthew Hodgson 2015-07-14 12:10:15 +01:00
  • 6b0167375c badges and broken avatars Matthew Hodgson 2015-07-14 02:13:00 +01:00
  • 341fe868e4 group messages together from the same user Matthew Hodgson 2015-07-14 00:25:51 +01:00
  • a7e4a2847e Start of registration support. David Baker 2015-07-13 19:14:02 +01:00
  • a5d24329c2 https for google fonts Matthew Hodgson 2015-07-13 17:01:35 +01:00
  • 10b3f250ec make it work in safari Matthew Hodgson 2015-07-13 14:56:58 +01:00
  • 18066d848a relative paths Matthew Hodgson 2015-07-13 02:11:05 +01:00
  • 06dfbbf821 fine tune header bar Matthew Hodgson 2015-07-13 02:02:56 +01:00
  • 20f1c075fc fix message tile layout a bit Matthew Hodgson 2015-07-13 01:59:07 +01:00
  • bfe0cdcfd1 vector wireframes Matthew Hodgson 2015-07-13 01:51:24 +01:00
  • 98baa0cb0a improve css consistency Matthew Hodgson 2015-07-12 16:36:43 +01:00
  • a1ab40064e fix CSS namespacing Matthew Hodgson 2015-07-12 14:52:37 +01:00
  • c4b2530cc0 unbreak the custom app (broken by adding linkify to the underlying app) Matthew Hodgson 2015-07-12 14:27:26 +01:00
  • c33899e93a bump to the same react version as the custom app Matthew Hodgson 2015-07-12 14:26:51 +01:00
  • 49e687f584 typo Matthew Hodgson 2015-07-12 14:09:53 +01:00