PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
1888 commits 1 branch 0 tags 338 MiB
Commit graph

1888 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Baker
213e284edf Fix https://github.com/vector-im/vector-web/issues/1679 2016-06-21 11:05:37 +01:00
Aviral Dasgupta
f6a76edfdf Fuzzy matching in User and Room providers 2016-06-21 05:05:23 +05:30
Aviral Dasgupta
442291c0a4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-autocomplete 2016-06-21 04:09:22 +05:30
David Baker
fc06ebcc63 Fix view_next_room 2016-06-20 18:43:56 +01:00
David Baker
4c214119b2 Fix PR feedback 2016-06-20 18:05:58 +01:00
David Baker
4d5fbfc5b1 Remove now unused MatrixTools.GetRoomForAlias 2016-06-20 17:11:46 +01:00
David Baker
d8dedae084 Fix /join to be consistent with the other code 
Plus a number of other tidyups:

 * Fix /join to dispatch a view_room for the room alias
   with the additional auto_join parameter
 * Make RoomView automatically join the room if the auto_join
   parameter is true and the user isn't already in it
 * Tidy up RoomView's peeking code, also fixing
   https://github.com/vector-im/vector-web/issues/1220
   in react-sdk (although it still requires a synapse change
   to actually fix, but react-sdk does 'the right thing').
 * Remove duplication of usage text from /join command
 * Amalgamate MatrixChat::_viewRoom's many, many parameters
   into an object and sort out case consistency a little.
 2016-06-20 16:30:51 +01:00
Aviral Dasgupta
4af983ed90 Style changes and improvements in autocomplete 2016-06-20 13:52:55 +05:30
David Baker
8103a795ec Merge pull request #316 from matrix-org/rav/fix_react_version_number 
UserSettings: fix the displayed version of the react-sdk
 2016-06-17 17:13:35 +01:00
Richard van der Hoff
f6835baa9c UserSettings: fix the displayed version of the react-sdk 2016-06-17 17:09:52 +01:00
Richard van der Hoff
1d42443c0c Merge pull request #314 from matrix-org/dbkr/show_canonical_alias 
Show canonical alias in URL bar
 2016-06-17 17:03:18 +01:00
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
David Baker
6adce649eb Use the first alias is there's no canonical alias 2016-06-17 16:56:34 +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
3b5378fa53 Show canonical alias in URL bar 
Use https://github.com/matrix-org/matrix-js-sdk/pull/140 to get the canonical alias, because that's a thing now.
 2016-06-17 15:17:45 +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
Aviral Dasgupta
b9d7743e5a Emoji provider, DDG working, style improvements 2016-06-17 04:58:09 +05:30
Aviral Dasgupta
769b3f0c2a Merge branch 'develop' into feature-autocomplete 2016-06-17 00:37:39 +05:30
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