OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
1,740 Commits
201 Branches
546 Tags
419 MiB
Commit Graph

1740 Commits (8b8deb86ed2d734f54c9076bb5283a3b344aa17c)

Author SHA1 Message Date
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 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
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
David Baker 72b3ce200d Make the room directory join rooms by alias 
Also makes some improvement on the multiple code path mess for joining rooms
 2016-06-09 18:49:06 +01:00
David Baker 049e3a968b Merge pull request #303 from matrix-org/rav/factor_out_createroom 
Factor out common parts of room creation
 2016-06-09 11:05:22 +01:00
David Baker 888c0611e8 Merge pull request #302 from matrix-org/rav/guest_device_spinner 
Fix spinner-of-doom in member info for guests
 2016-06-09 11:03:40 +01:00
Richard van der Hoff de36aa63fb Factor out common parts of room creation 
Take the duplicated code out of MatrixChat and MemberInfo, and put it in a
separate 'createRoom' module
 2016-06-09 10:58:25 +01:00
Richard van der Hoff 2352661513 MemberInfo: remove spinner if device query fails 
If the request to /keys/query fails (for example, because we are a guest), we
need to remove the spinner.
 2016-06-09 10:57:19 +01:00
David Baker 98ef793809 Default IS should be vector.im now 2016-06-09 10:56:14 +01:00
David Baker bb405563c8 Fix default servers 2016-06-09 10:54:56 +01:00
Richard van der Hoff ef764c112e Merge pull request #300 from matrix-org/rav/device_verification 
Support for marking devices as verified
 2016-06-09 10:44:42 +01:00
Richard van der Hoff 7700bb0ed9 Merge pull request #301 from matrix-org/dbkr/optional_config 
Make the config optional
 2016-06-09 10:40:47 +01:00
David Baker 05404efa34 Remove if (this.props.config) 
Since it now defaults to the empty dictionary (and if you pass null in, you deserve everything you get).
 2016-06-09 09:53:37 +01:00
Richard van der Hoff 1dfb3f71ae Merge branch 'develop' into rav/device_verification 2016-06-08 21:34:47 +01:00
Richard van der Hoff cab24bb14c Switch matrix-js-sdk back to develop 2016-06-08 21:34:30 +01:00
Richard van der Hoff 85770feb31 device verification: use a js-sdk event 
We'll probably want to be able to bubble up device verifications from the
js-sdk at some point, so let's use a js-sdk event for this.
 2016-06-08 21:25:42 +01:00
David Baker c123f02842 Make the config optional 2016-06-08 18:45:46 +01:00
Richard van der Hoff 7ce49c752f Wire up events to update UI on device verification 
Use the dispatcher to update event tiles and memberdeviceinfo when a device is
marked as verified.
 2016-06-08 18:35:43 +01:00
David Baker b5ff247f09 Merge pull request #299 from matrix-org/dbkr/SdkConfig 
Pass brand parameter down to Notifications
 2016-06-08 17:34:10 +01:00
Richard van der Hoff 1616431d27 EventTile: add classes to indicate verifiedness 
Add a couple of CSS classes to event tiles to reflect whether encrypted events
have been verified or not.
 2016-06-08 17:02:42 +01:00
Richard van der Hoff f3e66e6fd2 Add device info to member info 
Requires e81ce23 in matrix-js-sdk
 2016-06-08 17:02:42 +01:00
Richard van der Hoff 086698cd11 Add device info to user settings 
Requires e81ce23 from matrix-js-sdk
 2016-06-08 17:02:42 +01:00
David Baker 7e8c8dd336 Remove SdkConfig 
just take a config in MatrixChat, pass the individual things down through the chain.

This may become unwieldy: let's see how it goes.
 2016-06-08 14:54:34 +01:00
David Baker 12816c5e1f Explanatory comment 2016-06-07 22:14:56 +01:00