OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
1,929 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

1929 Commits (b7e95b3883163b4ee1cbeed246b63d5b9b23069e)

Author SHA1 Message Date
Aviral Dasgupta 48f2c4a696 feat: render unicode emoji as emojione images 2016-07-05 03:13:53 +05:30
David Baker 9b364c1be5 Merge pull request #331 from aviraldg/fix-autocomplete-1 
Autocomplete fixes
 2016-07-04 21:53:52 +01:00
Aviral Dasgupta ed305bd547 fix: https for DDG, provide range for UserProvider 2016-07-05 01:37:01 +05:30
Aviral Dasgupta 22a2593bf2 fix: unbreak old MessageComposerInput/TabComplete 2016-07-05 01:32:40 +05:30
David Baker 87300e3a9f Merge pull request #296 from aviraldg/feature-autocomplete 
Better autocomplete
 2016-07-04 18:16:26 +01:00
Aviral Dasgupta b3d8292113 feat: use canonical room alias for room completion 2016-07-04 22:34:58 +05:30
Aviral Dasgupta 73b726e5fb feat: import only flatMap from lodash 2016-07-04 21:56:09 +05:30
David Baker 56c73b68a9 Use markdown 
because the rst wasn't formatting and we use md for everything else in this repo, and in a document that talks about consistency...
 2016-07-04 17:23:38 +01:00
David Baker dfe745c9e6 Add a JS code style doc 2016-07-04 17:15:15 +01:00
Aviral Dasgupta 30b7efd585 fix: code cleanup, fix getCurrentCommand 2016-07-04 21:44:35 +05:30
Aviral Dasgupta cccc58b47f feat: implement autocomplete replacement 2016-07-03 22:15:13 +05:30
Aviral Dasgupta 8961c87cf9 feat: Autocomplete selection wraparound 2016-07-03 01:11:34 +05:30
Aviral Dasgupta cd928fe6f5 Merge remote-tracking branch 'upstream/develop' into feature-autocomplete 2016-07-03 00:00:02 +05:30
David Baker 28e620f19b Run eslint in jenkins script 2016-07-01 19:38:14 +01:00
David Baker 21cc4cba9a Correct npm run lint command line 2016-07-01 19:30:53 +01:00
David Baker 9f5a2d57df Merge pull request #329 from aviraldg/feature-eslint 
feat: add and configure eslint
 2016-07-01 19:26:16 +01:00
Aviral Dasgupta 1c002866e8 feat: add and configure eslint 2016-07-01 23:08:51 +05:30
Richard van der Hoff a671e07da7 Merge pull request #326 from matrix-org/dbkr/fix_user_links 
Fix user links
 2016-06-30 17:43:08 +01:00
Richard van der Hoff ce39822957 Merge pull request #327 from theworldbright/1492-fix-ordering-memberlist 
Fix ordering of Memberlist
 2016-06-29 10:21:15 +01:00
theworldbright 7609b9eba8 Simplify logic for timestamp ordering of memberlist 2016-06-29 17:45:24 +09:00
theworldbright b3d871aa6a Add back comment 2016-06-29 17:33:41 +09:00
theworldbright 69cb0a8f1c Switch ordering of Idle users 2016-06-29 17:08:17 +09:00
theworldbright 72a1d5a0de Remove unused comments 2016-06-29 16:58:08 +09:00
theworldbright 174caceabf Use lastActiveAgo to reorder member list 2016-06-29 16:57:59 +09:00
David Baker ba47c5a198 Merge remote-tracking branch 'origin/develop' into dbkr/fix_user_links 2016-06-28 17:15:17 +01:00
David Baker a4329aa346 Merge pull request #325 from matrix-org/dbkr/room_not_exist_error 
Display an error message if room not found
 2016-06-28 17:14:30 +01:00
David Baker e8337b2119 More PR feedback 2016-06-28 17:11:47 +01:00
David Baker 548c392236 PR feedback 2016-06-28 14:59:45 +01:00
David Baker c016eb78c8 Fix user links 
'Start chat' was broken on the sidebar if the panel was displayed by clicking on a link to a user. This adds null checking for the hack that we use to display users in the member panel.
 2016-06-28 14:28:05 +01:00
David Baker 98c03869a7 Display an error message if room not found 
Fixes https://github.com/vector-im/vector-web/issues/1012
 2016-06-24 15:34:07 +01:00
David Baker 1c280badde Increase timeout on TimelinePanel test 
Since it looks like this timeout sometimes isn't sufficient to scroll all the way up when jenkins is very busy
 2016-06-23 18:36:44 +01:00
David Baker b01b786dfc Merge pull request #324 from matrix-org/rav/device_blocking 
Implement device blocking
 2016-06-23 18:24:21 +01:00
Richard van der Hoff a1dd427420 Implement device blocking 
This is the react-sdk part of
https://github.com/matrix-org/matrix-js-sdk/pull/146. It adds 'Block'/'Unblock'
buttons to the device list, and updates the deviceVerified listeners to listen
for deviceVerificationChanged instead.

Also adds an extra <div> to the deviceinfo section to help me with the
CSS.
 2016-06-23 17:30:04 +01:00
David Baker dc50a0f24a Add logging to TimelinePanel test 
to see where it fails on jenkins
 2016-06-23 16:20:40 +01:00
David Baker 5cda2a6802 Disable colour output in jenkins script 
As it really confuses jenkins
 2016-06-23 14:38:08 +01:00
Richard van der Hoff e046f5359f CreateRoom: remove reference to encryption module 
The CreateRoom structure isn't currently used, but contained a reference to the
(now defunct) encryption module; remove the reference for now.
 2016-06-23 14:08:45 +01:00
David Baker 0df6209a57 Merge pull request #322 from matrix-org/rav/remove_encrypt_command 
Remove /encrypt command
 2016-06-23 13:41:18 +01:00
Richard van der Hoff cdaf317f1d Merge pull request #321 from matrix-org/rav/encrypt_room_setting 
RoomSettings: add encryption setting
 2016-06-23 13:40:30 +01:00
Richard van der Hoff 6283b200fb Remove /encrypt command 
Now that we have the room setting to enable encryption, the /encrypt command is
not only redundant, but confusing, since it's in conflict with the room
setting.
 2016-06-23 13:21:55 +01:00
David Baker 38a1a0b30f Merge pull request #320 from matrix-org/rav/fix_room_setting_warnings 
Fix a pair of warnings from RoomSettings
 2016-06-23 12:46:01 +01:00
Richard van der Hoff 3a21958faf RoomSettings: add encryption setting 
Add a knob to RoomSettings which will send the appropriate event to enable
encryption in the room.
 2016-06-23 12:21:31 +01:00
Richard van der Hoff 7a7d7c0e02 Fix a pair of warnings from RoomSettings 
- initialise the 'publish' checkbox correctly so react doesn't grumble about it
  turning from uncontrolled into controlled

- PowerSelector's 'controlled' property isn't really required, so mark it as
  such.
 2016-06-23 11:15:55 +01:00
David Baker e741226c02 Merge pull request #319 from matrix-org/rav/room_power_levels 
RoomSettings: refactor permissions calculations
 2016-06-23 10:43:58 +01:00
Richard van der Hoff a04f03669c RoomSettings: refactor permissions calculations 
The logic for calculating who had permission for what was impenetrable (and
wrong, in parts), so rewrite it to be a bit clearer.
 2016-06-23 10:36:16 +01:00
Matthew Hodgson 5195140ff8 reposition Login spinner 2016-06-21 19:50:03 +01:00
Richard van der Hoff 2ddfccdab3 Merge pull request #318 from matrix-org/dbkr/fix_default_hs 
Fix https://github.com/vector-im/vector-web/issues/1679
 2016-06-21 17:55:27 +01:00
David Baker d3265ab970 Redundant getDeafultHs() 
This now can never be falsey so no point checking it
 2016-06-21 17:46:55 +01:00
Richard van der Hoff 801a2c0647 Merge pull request #317 from matrix-org/dbkr/fix_slash_join 
Fix /join to be consistent with the other code
 2016-06-21 17:07:43 +01:00
Aviral Dasgupta a74db3a815 Get basic keyboard selection working 2016-06-21 18:33:39 +05:30
Aviral Dasgupta fb6eec0f7d Hide/show autocomplete based on selection state 2016-06-21 15:46:20 +05:30