OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
24,326 Commits
215 Branches
561 Tags
462 MiB
Commit Graph

24326 Commits (59f1657b4382a88ad87396af8852a6f9d3a0682a)

Author SHA1 Message Date
David Baker 27ca7b48f7 Just do all dispatches async: setting the flag obviously does not work for more than 2 nested dispatches. 2015-10-05 18:43:22 +01:00
David Baker b8dd2452db Display correct message for when an invited but not joined user is kicked. 2015-10-05 16:44:50 +01:00
David Baker a1892ee963 Improve url / screen handling 
Including taking you to the room you asked for originally after login
 2015-10-05 15:31:08 +01:00
David Baker ad313d7711 Merge branch 'vector-merge' 2015-10-02 18:55:53 +01:00
David Baker 55f656f150 0.0.2 2015-10-02 18:55:09 +01:00
David Baker 711272a7c9 Merge pull request #18 from matrix-org/vector-merge 
Vector merge
 2015-10-02 18:50:52 +01:00
David Baker 2d3b87d56d Don't set empty mime types on metadata. 2015-10-02 18:37:15 +01:00
David Baker 2bce4e4d62 Merge c62d97ca04 from vector-im 
The hack is *evil*. Not dirty.
 2015-10-02 14:37:34 +01:00
David Baker 54048ee37c Update Readme 2015-10-01 16:02:21 +01:00
David Baker 7de136a930 Port over new logic for filtering actions: makes the end call button appear & disappear approriately 2015-10-01 10:19:18 +01:00
David Baker 5004a3a5b3 Make end call button work for conf calls 2015-10-01 09:42:58 +01:00
David Baker cb89d3760a Hacks to make sure we don't end up with multiple split-brain CallHandlers when npm linked. 2015-09-30 18:21:25 +01:00
David Baker b68665ead5 Add support for the basic notion of conference calls and an experimental concept of modules to provide the actual functionality. Rejig Skinner to be simpler. 2015-09-30 16:50:46 +01:00
David Baker 9fb5702c2f make MatrixClientPeg an actual global too otherwise things go very wierd 2015-09-28 17:46:49 +01:00
David Baker 8af6c2275b Make it easier to override default avatar urls 2015-09-28 17:06:13 +01:00
David Baker 3792d5494a Dispatcher should be a global too 2015-09-28 14:48:50 +01:00
David Baker 3be50e327d Manually merge memberlist fix from vector master 2015-09-28 11:32:00 +01:00
David Baker 4472f63b5f We need js sdk 0.2.1 for getRoomIdForAlias 2015-09-25 17:49:35 +01:00
David Baker 6348c2cf99 Change how viewing a room alias works to make way for jumping into a room once you've logged in. 2015-09-25 17:22:42 +01:00
David Baker bc2eca16f9 Unused guff 2015-09-25 16:25:20 +01:00
David Baker fe369858b7 Unused variables & redundant stuff 2015-09-25 15:17:46 +01:00
David Baker 56530d80d7 Add link to guthub issue about webpack's loader path silliness 2015-09-25 13:53:58 +01:00
David Baker d172aaf41f Add -loader packages as deps 
Even though we don't use webpack directly, webpack needs the loaders
to be in the dependency package's node_modules directory, so this
lets packages that depend on us use webpack.
 2015-09-25 13:39:21 +01:00
David Baker 5af43dc6a9 Remove unused action dispatch 2015-09-23 09:39:49 +01:00
David Baker 96627d4477 Port membertile fix 2015-09-22 16:51:16 +01:00
David Baker 3838569625 Port memberlist branch fixes 2015-09-22 16:37:39 +01:00
David Baker b32658cfd0 Load fewer events when switching to a room: they take surprisingly long to render. 2015-09-22 15:18:16 +01:00
David Baker 980ce7fdae Remainder of the controllers from vector 2015-09-21 17:23:51 +01:00
David Baker 49c5f7cb95 Use same protocol as client was loaded over for recaptcha to prevent JS origin errors. 2015-09-21 16:53:50 +01:00
David Baker 1b82d92fa1 Port registration fixes 2015-09-21 16:38:12 +01:00
David Baker 65498600de port login fixes 2015-09-21 16:36:17 +01:00
David Baker 28c4a648be Port roomlist fixes 2015-09-21 16:31:31 +01:00
David Baker e2c9afb278 port create room 2015-09-21 16:28:39 +01:00
David Baker 29d2ed7191 Merge userselector changes 2015-09-21 16:17:29 +01:00
David Baker 82aa603596 Merge in resend support 2015-09-21 16:14:19 +01:00
David Baker a8eb93bd6f Member list 2015-09-18 18:39:16 +01:00
David Baker 31ee667102 Room header 2015-09-18 14:34:36 +01:00
David Baker b9538a077c Missed files from last commit 2015-09-18 13:54:20 +01:00
David Baker 343de6245f Port ServerConfig changes 2015-09-18 13:33:51 +01:00
David Baker 08b5888d03 More porting: make sending messages work again! 2015-09-18 10:44:57 +01:00
David Baker abeed92501 Partial porting over of vector controller logic to react sdk. 2015-09-17 18:23:38 +01:00
David Baker 6eb18f0268 Fix reskindex 2015-09-17 18:21:35 +01:00
David Baker d938ba70d3 Port over room leaving 2015-09-17 12:10:01 +01:00
David Baker 88aaf82c88 Backport: linkify emotes 2015-09-16 16:23:35 +01:00
David Baker f3b30477ce Backport: add other presets into room presets 2015-09-16 16:10:39 +01:00
David Baker a4cbbf0d92 Backport Notifier improvements from Vector, including TextForEvent 2015-09-16 14:48:49 +01:00
David Baker 25ab56106a Backport labels & placeholders for Editable text from Vector 2015-09-16 14:18:25 +01:00
David Baker 6cca5f4c05 backport fixes from vector 2015-09-16 13:48:24 +01:00
David Baker aba4c1e9af We don't use catw here anymore 2015-09-15 14:46:41 +01:00
David Baker 2d0c8ac9ff Working skin stuff, minus css 2015-09-15 13:34:36 +01:00