gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,467 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

1467 Commits

Author SHA1 Message Date
David Baker 383a958abe Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into vector 2015-07-17 14:36:15 +01:00
David Baker 9a79539978 missed removeventlistener 2015-07-17 14:35:33 +01:00
Kegan Dougal 5c6b8a4cf9 Merge branch 'irc-style-commands' into vector 2015-07-17 14:26:58 +01:00
Kegan Dougal b6f9ca0f95 When accepting calls, go to the right room. Relink video elements when CallView loads. 2015-07-17 14:25:51 +01:00
David Baker 6a76d8ace8 Update room header when room name changes 2015-07-17 13:48:24 +01:00
David Baker 8fe6411539 Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into vector 2015-07-17 12:26:02 +01:00
David Baker b53640f892 Just return nothing for unknown events 2015-07-17 12:23:24 +01:00
David Baker 70fce0989b Merge pull request #11 from matrix-org/irc-style-commands 
IRC-style commands
 2015-07-17 12:06:32 +01:00
David Baker 00c45e48a9 Merge branch 'vector' into irc-style-commands 2015-07-17 12:03:10 +01:00
David Baker 37108ac56c Make notifications sensible again and have information once and only once. 2015-07-17 11:57:26 +01:00
David Baker 1b03aa8119 Display nick changes and factor out getting text for events into a common place. 2015-07-17 11:57:26 +01:00
Kegan Dougal 2bb2295499 Implement /join 2015-07-17 11:48:40 +01:00
Kegan Dougal 001372ec39 Fix nick changes 2015-07-17 11:13:05 +01:00
Kegan Dougal 006907e52f Add kick message. Add reasons if given. 2015-07-17 09:47:30 +01:00
Kegan Dougal c8caf34777 Merge branch 'vector' into irc-style-commands 2015-07-17 09:17:58 +01:00
Matthew Hodgson 891ba40114 basic date separator support 2015-07-17 00:12:54 +01:00
Matthew Hodgson 1a95148dae basic date separator support 2015-07-17 00:12:53 +01:00
Matthew Hodgson a2ca5f2847 improve badges and room tile layout 2015-07-17 00:12:53 +01:00
Matthew Hodgson 28dcfb2f12 make it work on ff 2015-07-17 00:12:53 +01:00
David Baker 0f39ec580f Slightly improve error messages 2015-07-16 22:06:00 +01:00
David Baker 8ccce4d702 Make new login style work 2015-07-16 21:46:39 +01:00
David Baker d08c47a328 Fix npe 2015-07-16 21:45:59 +01:00
David Baker cfbef0177e Fix custom server or registration & do some of new login UI 2015-07-16 19:30:27 +01:00
David Baker 8feeb93215 Merge pull request #10 from matrix-org/editable_room_name 
Make room name editable
 2015-07-16 19:29:49 +01:00
Kegan Dougal 1126769686 Merge branch 'vector' into irc-style-commands 2015-07-16 18:08:30 +01:00
Erik Johnston 789e70f2d6 Remove old atoms 2015-07-16 18:07:28 +01:00
Erik Johnston df999fb2f8 Remove deleted atoms 2015-07-16 18:03:29 +01:00
Kegan Dougal d4a98b3850 Show correct membership messages for ban/unban. 2015-07-16 17:57:57 +01:00
Erik Johnston ce3dab3c5b Make room name editable 2015-07-16 17:42:33 +01:00
Kegan Dougal 91943d8a45 Merge branch 'vector' into irc-style-commands 2015-07-16 17:41:30 +01:00
Kegan Dougal 9aa66c1d8b Add SlashCommands to functionally process /commands. 2015-07-16 17:41:12 +01:00
David Baker 03733e6a0f Merge pull request #9 from matrix-org/create_room 
Wire in create room.
 2015-07-16 17:37:48 +01:00
Kegan Dougal 59ca26ee93 Use target not sender when displaying member text. 2015-07-16 17:37:35 +01:00
Erik Johnston 98160c3947 Add ability to remove people from invite list 2015-07-16 17:30:10 +01:00
Erik Johnston 68d60aadd1 Make Presets stateless 2015-07-16 17:24:33 +01:00
Erik Johnston aa1b763518 Make CreateRoom remember what the values of its fields were. Remove some fairly pointless atoms 2015-07-16 17:20:03 +01:00
David Baker 75f8363be0 Merge branch 'master' into vector 2015-07-16 16:53:27 +01:00
David Baker e6260987cc some s/then/done/ 2015-07-16 16:53:08 +01:00
David Baker 3a6423dd0a Merge branch 'master' into vector 2015-07-16 16:52:19 +01:00
David Baker 9b6060a363 Decouple login view & controller 2015-07-16 16:49:40 +01:00
Kegan Dougal 6b81022e28 Move position of incoming call buttons. 2015-07-16 16:32:21 +01:00
Erik Johnston 47f4c0dfff Use Loader 2015-07-16 16:20:00 +01:00
Erik Johnston ebedf0b907 Add comment about RoomAlias magic 2015-07-16 16:17:29 +01:00
Erik Johnston 95968bf619 Make server_name magix in RoomAlias optional 2015-07-16 16:14:55 +01:00
David Baker 50edc619af Merge branch 'master' into vector 2015-07-16 16:13:24 +01:00
David Baker 64042c9de8 Handle localstorage exceptions. 2015-07-16 16:12:54 +01:00
David Baker ebe6072225 Make this a done so it doesn't swallow exceptions 2015-07-16 16:04:31 +01:00
Erik Johnston cd26d1323f Wire together checkboxes and presets and use new /createRoom api 2015-07-16 15:55:46 +01:00
David Baker 155dd74a6f Merge pull request #8 from matrix-org/message-history-arrow-keys 
Implement sent message history (up/down keys).
 2015-07-16 15:41:57 +01:00
Kegan Dougal b043889169 Implement sent message history (up/down keys). 
This includes preserving and restoring partially entered text per room. This
is mostly ported straight from Angular.
 2015-07-16 15:22:46 +01:00