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

1761 Commits (aa67e3374451de4dce4d2b4848ead37162a24934)

Author SHA1 Message Date
Richard van der Hoff aa67e33744 Merge pull request #313 from matrix-org/dbkr/roomview_tests 
Some basic tests for RoomView
 2016-06-17 17:02:02 +01:00
David Baker 4f96bd1b01 Merge pull request #315 from matrix-org/rav/unverify_device 
Support for making devices unverified
 2016-06-17 17:00:12 +01:00
Richard van der Hoff ad00abe9c0 Support for making devices unverified 
Because its useful for testing

Requires support from js-sdk, and (ideally) css from vector-web
 2016-06-17 16:24:23 +01:00
David Baker 53d92df6f8 Set up / teardown container div in before/afterEach 2016-06-17 15:50:13 +01:00
David Baker b2f0ed09ab Sort alphabetically (and name consistently) 2016-06-17 15:46:31 +01:00
David Baker d3a463e9ac restore the room header too 2016-06-17 12:23:45 +01:00
David Baker b0bf24c136 Comment 2016-06-17 12:22:16 +01:00
David Baker 1fbf027a40 Some basic tests for RoomView 2016-06-17 12:20:26 +01:00
David Baker 624e34c48a Merge pull request #312 from matrix-org/rav/eventlistnener_warning 
Fix eventListener warning
 2016-06-16 11:15:08 +01:00
Richard van der Hoff 0cc4497ef0 Merge pull request #307 from matrix-org/dbkr/fix_peeking 
Fix peeking and member list vanishing
 2016-06-16 11:13:20 +01:00
Richard van der Hoff 3e44d7307f Fix eventListener warning 
Bump up maxEventListeners on the MatrixClient to shut up the warning about
leaks.
 2016-06-16 11:03:09 +01:00
David Baker 721ae68aa4 Merge pull request #311 from aviraldg/fix-rte-history 
Use different keys for new MessageComposerInput
 2016-06-16 10:16:41 +01:00
Aviral Dasgupta 8b1332cd29 Use different keys for new MessageComposerInput 2016-06-16 14:46:09 +05:30
David Baker 6ae3276c46 Merge pull request #310 from aviraldg/fix-rte-escape 
Fix RTE escaping, HTML output with breaks
 2016-06-15 16:06:04 +01:00
Aviral Dasgupta 56ac1ed0c0 update comment 2016-06-15 20:34:37 +05:30
Aviral Dasgupta 8b8deb86ed Fix RTE escaping, HTML output with breaks 2016-06-15 20:24:37 +05:30
David Baker 8fd8847890 Merge pull request #308 from aviraldg/feature-rte-improvements 
Fix cursor bug, persist editor mode & rte default
 2016-06-14 19:49:13 +01:00
Aviral Dasgupta 3f1b57b35b Fix cursor bug, persist editor mode & rte default 2016-06-15 00:13:34 +05:30
David Baker 5199cd04a2 Merge pull request #292 from aviraldg/feature-rte 
Rich Text Editor
 2016-06-14 15:27:39 +01:00
Aviral Dasgupta ba69e4365d more RTE fixes 2016-06-14 19:28:51 +05:30
Aviral Dasgupta 8cb086ef31 use constants for keycodes in RTE 2016-06-14 19:14:09 +05:30
Aviral Dasgupta 2606ea9596 fixes and improvements in RichText 2016-06-14 19:10:35 +05:30
David Baker 40b1b99c38 underscore prefix internal method 2016-06-14 14:40:03 +01:00
David Baker a95d8b5ed6 Move init logic into componentWillMount 
to simplify getInitialState
 2016-06-14 14:38:45 +01:00
David Baker 0ef5cc891e Add currentRoomId / Alias to getInitialState 
with docs
 2016-06-14 14:10:49 +01:00
David Baker b8eee08d69 Fix member list vanishing 
Add a callback to RoomView that it can give the room ID to once it's resolved it, since this lookup is now the responsibility of the roomview and only the roomview. The view_room action now has either an alias or an ID, not both. Also fix RoomView to load the room properly and not try to peek when it shouldn't.
 2016-06-14 12:56:37 +01:00
David Baker 094d54b398 Merge pull request #306 from matrix-org/rav/labify_e2e 
Hide e2e features if not enabled
 2016-06-14 12:00:32 +01:00
Richard van der Hoff e973d18085 Hide e2e features if not enabled 
Don't show the device info in the MemberInfo and UserSettings unless the user
has ticked the 'labs' box.
 2016-06-14 11:57:08 +01:00
David Baker aaefdf19c5 Fix MatrixChat syntax fail 2016-06-14 11:57:07 +01:00
David Baker 11a38fce48 Fix peeking 
Sorts out more of the room joining mess. currentRoom which held the room ID is now more appropriately called currentRoomId. RoomView will now take a roomID or alias as before but will now look up the room ID as required if given the alias. Also, now look up the alias every time you click on it so it's never stale, rather than looking in your current rooms for a room that thinks it has that ID.
 2016-06-14 11:37:04 +01:00
Aviral Dasgupta 34be17cc7e use rte labs setting 2016-06-14 00:10:43 +05:30
Aviral Dasgupta 74527a439c Merge branch 'develop' into feature-rte 2016-06-13 23:57:10 +05:30
David Baker 3312a4d57e Merge pull request #305 from aviraldg/feature-labs 
Add experimental "Labs" section to settings
 2016-06-13 19:24:03 +01:00
Aviral Dasgupta 5831a68e11 Labs improvements 2016-06-13 23:25:31 +05:30
Aviral Dasgupta 727e6daaae Fix key attr placement in UserSettings 2016-06-13 22:11:21 +05:30
Aviral Dasgupta c3a9658392 Add experimental "Labs" section to settings 2016-06-13 22:04:12 +05:30
Aviral Dasgupta df69d1de44 Add basic Markdown highlighting 
Add basic Markdown highlighting
 2016-06-12 04:47:05 +05:30
Pedro Ferreira e75a28bb0d Minimal house cleaning 2016-06-12 01:08:31 +02:00
Pedro Ferreira 294a8efdc4 Fix behaviour of modifyText 
Since it was not correctly extracting the selected part of the text
string
 2016-06-12 01:08:31 +02:00
Pedro Ferreira 8f45f168d5 Fix highlighting behaviour on switch 
Hopefully made the code a little bit clearer.
 2016-06-12 01:08:31 +02:00
Pedro Ferreira a5a3e4e915 Basic Markdown highlighting 2016-06-12 01:07:16 +02:00
Aviral Dasgupta c0d7629980 get /commands working again 2016-06-12 00:11:27 +05:30
Aviral Dasgupta b960d220d2 cleanup, better comments, markdown hotkeys 2016-06-11 22:24:09 +05:30
Aviral Dasgupta e4217c3fb7 rte improvements, markdown mode 2016-06-11 15:52:08 +05:30
Richard van der Hoff 469c415557 Merge pull request #304 from matrix-org/dbkr/directory_join_by_alias 
Make the room directory join rooms by alias
 2016-06-10 15:23:12 +01:00
David Baker 719928f389 Remove view_room_alias 
As it was basically the same as view_room. Use view_room instead which will handle whether we pass an ID or an alias into RoomView
 2016-06-10 15:12:42 +01:00
Aviral Dasgupta bf8e56e04c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-rte 2016-06-10 04:43:44 +05:30
Aviral Dasgupta 4e0720db12 Fix MessageComposerInput.setLastTextEntry 2016-06-10 00:03:40 +05:30
Aviral Dasgupta 29cdd1fc41 user and room decorators, history & typing notifs 2016-06-09 23:53:09 +05:30
David Baker b60ab9d695 Remove XXX now it's fixed (yay!) 2016-06-09 18:50:18 +01:00