OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
29,280 Commits
218 Branches
563 Tags
448 MiB
Commit Graph

29280 Commits (a35b20a15a4e6dfdaeea2bf3f4e5d1ccb3065ac6)

Author SHA1 Message Date
David Baker 83c3c43c27 Merge pull request #41 from matrix-org/skindex-nextgen 
Update skindexing for new world order
 2015-12-01 18:11:49 +00:00
David Baker d7a00a5a86 Merge branch 'develop' into skindex-nextgen 2015-12-01 18:10:04 +00:00
Kegan Dougal bb289a4145 Add CustomServerDialog class 2015-12-01 16:49:15 +00:00
Kegan Dougal 673b01267a Use LoginHeader everywhere 2015-12-01 16:29:58 +00:00
Kegan Dougal 05a6121934 Add default LoginHeader 2015-12-01 16:27:48 +00:00
Kegan Dougal 52f3d7f18b Add generic LoginFooter. Remove vector reference 2015-12-01 16:12:13 +00:00
Kegsay 8b103da3d3 Merge pull request #43 from matrix-org/kegan/vector-components 
Move remaining Vector-only components
 2015-12-01 15:59:01 +00:00
David Baker 77b99de46b Update component index 2015-12-01 15:52:32 +00:00
David Baker 5e2a4fa537 Merge branch 'develop' into skindex-nextgen 2015-12-01 15:48:05 +00:00
Kegan Dougal 636be0c003 Update getComponent paths 2015-12-01 15:45:11 +00:00
Kegan Dougal 726c893663 Merge branch 'develop' into kegan/vector-components 2015-12-01 15:39:15 +00:00
Kegan Dougal d5819d54db Fix typos 2015-12-01 15:36:40 +00:00
Matthew Hodgson 4fe2cc54d6 Merge pull request #42 from matrix-org/kegan/controller-merging4 
Phase 4 controller merging
 2015-12-01 15:15:39 +00:00
Kegan Dougal fe16b221f8 s/vector.im/matrix.org/ 2015-12-01 13:48:53 +00:00
Kegan Dougal 784c1b63dc Move remaining vector molecules to components 2015-12-01 11:19:25 +00:00
David Baker 7f27ffd7bd Fix typos & variable shadowing from PR comments 2015-12-01 10:26:08 +00:00
David Baker 1de5d68e95 Un-commit accidentally committed file upload stuff 2015-12-01 10:25:35 +00:00
David Baker 1df03aa82a Remove unintentional logging 2015-12-01 10:20:21 +00:00
Kegan Dougal 1e694da460 Move MatrixChat and login components to react SDK. 
Removed Modulator as it is no longer necessary in this form. ConferenceHandler
is injected in src/vector/index.js
 2015-11-30 18:11:04 +00:00
David Baker 4f8895f160 Copyright header on component index 2015-11-30 18:00:19 +00:00
David Baker ae8c5bdcb0 better comment & regenerated index 2015-11-30 17:56:01 +00:00
David Baker ef0cf1f28e Merge branch 'develop' into skindex-nextgen 2015-11-30 17:34:40 +00:00
David Baker 730b33535a More WIP component indexing 2015-11-30 17:33:04 +00:00
David Baker 4a144ac03d WIP of new component indexing 2015-11-30 17:30:32 +00:00
Kegan Dougal 02a71b20a9 Merge and move RoomView to /structures. Add Resend.js from vector. 2015-11-30 17:15:57 +00:00
Matthew Hodgson c67005c306 switch avatar initial layout to work with Open Sans 2015-11-30 17:15:02 +00:00
Kegan Dougal f9e38e5326 Move and merge RoomList 2015-11-30 16:55:00 +00:00
Kegan Dougal f96e7a0dc8 Add UserSettings structure 2015-11-30 15:52:41 +00:00
Kegan Dougal 03485c2fca Merge branch 'develop' into kegan/controller-merging4 2015-11-30 15:39:14 +00:00
Matthew Hodgson 59d9b83099 Merge pull request #40 from matrix-org/matthew/rename-message-components 
rename message components as per RL discussion this morning
 2015-11-30 15:37:01 +00:00
Kegan Dougal e008b5578d Move and merge LogoutPrompt 2015-11-30 15:23:16 +00:00
Matthew Hodgson a8fd1b5d7a rename message components as per RL discussion this morning 2015-11-30 15:19:43 +00:00
Kegan Dougal 80a235adf9 Move and merge MemberList 2015-11-30 15:13:28 +00:00
Kegan Dougal 945a65f4b5 Move Notifier to src/ since it isn't a component. 2015-11-30 15:04:24 +00:00
Matthew Hodgson 960cc2d6b4 simplify avatar logic slightly 2015-11-30 14:39:42 +00:00
Kegan Dougal 8a98fcd427 Merge branch 'develop' into kegan/controller-merging4 2015-11-30 14:14:41 +00:00
Kegan Dougal 2002af6c7d Assign a default onFinished call to prevent TypeErrors being thrown. 2015-11-30 14:14:30 +00:00
Kegan Dougal fcb6db684b Move and merge QuestionDialog and ErrorDialog 2015-11-30 14:11:04 +00:00
Kegan Dougal 78cfaeb5c3 Merge branch 'develop' into kegan/controller-merging4 2015-11-30 10:56:39 +00:00
Kegan Dougal cf6b5461cc Move and merge CreateRoom 2015-11-30 10:55:15 +00:00
Matthew Hodgson 28b85bb226 remove unnecessary zalgo hacks 2015-11-30 01:12:41 +00:00
Matthew Hodgson 96aa42471d fix messagecomposer layout when switching between rooms on FF 2015-11-30 01:12:32 +00:00
Matthew Hodgson ba090a6ad5 only dispatch user_activity event if the mouse actually moves (rather than the DOM moving under the mouse) 2015-11-29 15:39:10 +00:00
Matthew Hodgson bed7d50ab8 reactor the highlighting code to avoid duplication and make it more coherent 2015-11-29 13:00:58 +00:00
Matthew Hodgson ca6cdfafd3 clean up spurious whitespace 2015-11-29 13:00:37 +00:00
Matthew Hodgson c96fa7f15d fix autoplay on chrome and remove loop for m.video 2015-11-29 12:34:01 +00:00
Matthew Hodgson d6b188751a s/autoplay/autoPlay/ 2015-11-29 03:25:55 +00:00
Matthew Hodgson 0b483c4707 rename searchTerms to highlights, and support highlighting multiple search terms 2015-11-29 03:22:01 +00:00
Matthew Hodgson 3cc1b1ad82 fix unwanted vertical scrollbar issue and typo 2015-11-29 03:21:21 +00:00
Matthew Hodgson f028b343b0 HTML and Markdown emotes. 2015-11-28 22:34:45 +00:00