0fdc2d817c
mark as jsx
2016-07-08 15:59:34 +01:00
1a3bc814e1
clarify event handlers
2016-07-08 15:58:18 +01:00
afa6acc20a
All the trailing commas
2016-07-08 15:42:42 +01:00
04728ae03b
PR fixes + more general notes
2016-07-07 12:09:02 +01:00
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
dfe745c9e6
Add a JS code style doc
2016-07-04 17:15:15 +01:00
28e620f19b
Run eslint in jenkins script
2016-07-01 19:38:14 +01:00
21cc4cba9a
Correct npm run lint command line
2016-07-01 19:30:53 +01:00
9f5a2d57df
Merge pull request #329 from aviraldg/feature-eslint
...
feat: add and configure eslint
2016-07-01 19:26:16 +01:00
1c002866e8
feat: add and configure eslint
2016-07-01 23:08:51 +05:30
a671e07da7
Merge pull request #326 from matrix-org/dbkr/fix_user_links
...
Fix user links
2016-06-30 17:43:08 +01:00
ce39822957
Merge pull request #327 from theworldbright/1492-fix-ordering-memberlist
...
Fix ordering of Memberlist
2016-06-29 10:21:15 +01:00
7609b9eba8
Simplify logic for timestamp ordering of memberlist
2016-06-29 17:45:24 +09:00
b3d871aa6a
Add back comment
2016-06-29 17:33:41 +09:00
69cb0a8f1c
Switch ordering of Idle users
2016-06-29 17:08:17 +09:00
72a1d5a0de
Remove unused comments
2016-06-29 16:58:08 +09:00
174caceabf
Use lastActiveAgo to reorder member list
2016-06-29 16:57:59 +09:00
ba47c5a198
Merge remote-tracking branch 'origin/develop' into dbkr/fix_user_links
2016-06-28 17:15:17 +01:00
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
e8337b2119
More PR feedback
2016-06-28 17:11:47 +01:00
548c392236
PR feedback
2016-06-28 14:59:45 +01:00
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
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
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
b01b786dfc
Merge pull request #324 from matrix-org/rav/device_blocking
...
Implement device blocking
2016-06-23 18:24:21 +01:00
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
dc50a0f24a
Add logging to TimelinePanel test
...
to see where it fails on jenkins
2016-06-23 16:20:40 +01:00
5cda2a6802
Disable colour output in jenkins script
...
As it really confuses jenkins
2016-06-23 14:38:08 +01:00
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
0df6209a57
Merge pull request #322 from matrix-org/rav/remove_encrypt_command
...
Remove /encrypt command
2016-06-23 13:41:18 +01:00
cdaf317f1d
Merge pull request #321 from matrix-org/rav/encrypt_room_setting
...
RoomSettings: add encryption setting
2016-06-23 13:40:30 +01:00
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
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
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
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
e741226c02
Merge pull request #319 from matrix-org/rav/room_power_levels
...
RoomSettings: refactor permissions calculations
2016-06-23 10:43:58 +01:00
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
5195140ff8
reposition Login spinner
2016-06-21 19:50:03 +01:00
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
d3265ab970
Redundant getDeafultHs()
...
This now can never be falsey so no point checking it
2016-06-21 17:46:55 +01:00
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
213e284edf
Fix https://github.com/vector-im/vector-web/issues/1679
2016-06-21 11:05:37 +01:00
fc06ebcc63
Fix view_next_room
2016-06-20 18:43:56 +01:00
4c214119b2
Fix PR feedback
2016-06-20 18:05:58 +01:00
4d5fbfc5b1
Remove now unused MatrixTools.GetRoomForAlias
2016-06-20 17:11:46 +01:00
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
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
f6835baa9c
UserSettings: fix the displayed version of the react-sdk
2016-06-17 17:09:52 +01:00
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
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