Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
209 commits
Select commit Hold shift + click to select a range
c99f5c0
Check upload limits before trying to upload large files
Half-Shot May 3, 2018
0fad90e
Linting
Half-Shot May 3, 2018
7c0811d
size > upload_size as per spec feedback
Half-Shot May 3, 2018
76f0f15
Fix nitpicks
Half-Shot Jun 21, 2018
caf2086
Restructure limits to be set at RoomView, so they may change if the
Half-Shot Jun 21, 2018
736b76b
If HttpStatus == 413, refresh media limits
Half-Shot Jun 21, 2018
541f1d7
Move upload verification logic to RoomView.
Half-Shot Jun 23, 2018
5a72a58
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
Half-Shot Oct 15, 2018
fcce61b
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
Half-Shot Oct 16, 2018
67d39a4
Sneaky ,
Half-Shot Oct 16, 2018
0030ba7
Support .well-known discovery
turt2live Oct 18, 2018
71a9717
Linting
turt2live Oct 18, 2018
328d57f
Remove temporary account_deactivation_preferences
t3chguy Oct 29, 2018
810405c
Translated using Weblate (Albanian)
ujdhesa Nov 16, 2018
3c3c503
Translated using Weblate (Albanian)
ujdhesa Nov 16, 2018
2e86bce
Translated using Weblate (Albanian)
ujdhesa Nov 16, 2018
7a01468
Translated using Weblate (Albanian)
ujdhesa Nov 16, 2018
f8fd2a5
Translated using Weblate (Albanian)
ujdhesa Nov 16, 2018
0e874fe
Translated using Weblate (Albanian)
ujdhesa Nov 16, 2018
2122bf8
Translated using Weblate (Albanian)
ujdhesa Nov 16, 2018
69a3b89
Translated using Weblate (Albanian)
ujdhesa Nov 16, 2018
400ba21
Translated using Weblate (Albanian)
ujdhesa Nov 16, 2018
ae6c468
Translated using Weblate (Hindi)
qnixsynapse Nov 16, 2018
c4668dd
Merge remote-tracking branch 'origin/develop' into develop
Nov 16, 2018
2787ebc
Translated using Weblate (Hindi)
qnixsynapse Nov 16, 2018
94b39cd
Merge remote-tracking branch 'origin/develop' into develop
Nov 16, 2018
ed7ed06
Translated using Weblate (Albanian)
ujdhesa Nov 16, 2018
1d4f95a
Merge remote-tracking branch 'origin/develop' into develop
Nov 16, 2018
e18dc4b
Translated using Weblate (French)
Nov 17, 2018
3ab8adc
Translated using Weblate (Albanian)
ujdhesa Nov 17, 2018
9697d75
Translated using Weblate (Albanian)
ujdhesa Nov 17, 2018
dbb8de5
Translated using Weblate (Hungarian)
szimszon Nov 17, 2018
414ff55
Translated using Weblate (Albanian)
ujdhesa Nov 17, 2018
0eeafa3
Merge remote-tracking branch 'origin/develop' into develop
Nov 19, 2018
4e18635
Translated using Weblate (Hungarian)
szimszon Nov 17, 2018
fce5cb0
Merge remote-tracking branch 'origin/develop' into develop
Nov 19, 2018
3a91f00
Translated using Weblate (French)
Nov 17, 2018
c40f609
Merge remote-tracking branch 'origin/develop' into develop
Nov 21, 2018
0252cf4
Merge remote-tracking branch 'origin/develop' into develop
Nov 21, 2018
8b4702a
Merge remote-tracking branch 'origin/develop' into develop
Nov 21, 2018
6f0f930
Merge branch 'develop' into travis/well-known
turt2live Nov 21, 2018
d324c31
Translated using Weblate (Hungarian)
szimszon Nov 21, 2018
4cfefe4
Introduce an onUsernameBlur and fix hostname parsing
turt2live Nov 21, 2018
5600a9d
Validate the identity server
turt2live Nov 21, 2018
5810f59
Translated using Weblate (Albanian)
ujdhesa Nov 22, 2018
328ab4d
Translated using Weblate (French)
Nov 22, 2018
c6f317b
Translated using Weblate (Polish)
krkk Nov 21, 2018
4122f20
Merge remote-tracking branch 'origin/develop' into develop
Nov 22, 2018
7d45994
Translated using Weblate (Basque)
osoitz Nov 23, 2018
02d950b
Merge remote-tracking branch 'origin/develop' into develop
Nov 23, 2018
25a4aaf
Merge remote-tracking branch 'origin/develop' into develop
Nov 23, 2018
075c13a
Add password strength meter to backup creation UI
dbkr Nov 23, 2018
e27f3f0
Translated using Weblate (Basque)
osoitz Nov 24, 2018
015af7d
Use sensible logging
turt2live Nov 27, 2018
e3f2e69
Merge pull request #2227 from matrix-org/travis/well-known
turt2live Nov 27, 2018
ec3173c
Translated using Weblate (Hindi)
qnixsynapse Nov 27, 2018
f58cf6c
Translated using Weblate (Polish)
krkk Nov 27, 2018
438b940
Merge remote-tracking branch 'origin/develop' into develop
Nov 27, 2018
2b027b7
Suppress CORS errors in the 'failed to join room' dialog
turt2live Nov 27, 2018
2d8a072
Translated using Weblate (French)
Nov 27, 2018
3aa768f
Translated using Weblate (Hungarian)
szimszon Nov 29, 2018
987ad0b
Check if users exist before inviting them and communicate errors
turt2live Nov 29, 2018
84b568a
Appease the linter
turt2live Nov 29, 2018
2b077b4
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
Half-Shot Dec 1, 2018
0834985
Translated using Weblate (Basque)
osoitz Dec 1, 2018
c0ef2f7
Merge pull request #1876 from Half-Shot/hs/upload-limits
turt2live Dec 4, 2018
c163773
Translated using Weblate (Albanian)
ujdhesa Nov 28, 2018
f7a8e14
Translated using Weblate (German)
krombel Dec 2, 2018
e25df6a
Translated using Weblate (Hindi)
qnixsynapse Nov 28, 2018
dbc3e87
Translated using Weblate (Polish)
krkk Dec 3, 2018
35ef2cd
Merge remote-tracking branch 'origin/develop' into develop
Dec 4, 2018
e131a76
Translated using Weblate (Chinese (Traditional))
s8321414 Dec 4, 2018
8510fe7
Translated using Weblate (Hungarian)
szimszon Dec 4, 2018
c4ad15f
Translated using Weblate (French)
Dec 4, 2018
5b2c2a0
comment typo
dbkr Dec 4, 2018
5d94da0
Merge pull request #2294 from matrix-org/dbkr/zxcvbn
dbkr Dec 4, 2018
98b2398
Translated using Weblate (Albanian)
ujdhesa Dec 4, 2018
c5daf14
Merge remote-tracking branch 'origin/develop' into develop
Dec 4, 2018
3f7a3b8
Translated using Weblate (Hungarian)
szimszon Dec 4, 2018
6ab9ae7
Translated using Weblate (Albanian)
ujdhesa Dec 4, 2018
c849a23
Show correct text if passphrase is skipped
dbkr Dec 4, 2018
f1869ed
Merge pull request #2324 from matrix-org/dbkr/text_if_skip_passphrase
dbkr Dec 4, 2018
bfe8f3a
Merge remote-tracking branch 'origin/develop' into develop
Dec 4, 2018
cf9fbe0
Translated using Weblate (Hungarian)
szimszon Dec 4, 2018
5fc25fd
Only mark group as failed to load for summary
jryans Dec 4, 2018
22ff76e
Add error to UI when group member list fails to load
jryans Dec 4, 2018
7f4ee2b
Translated using Weblate (Chinese (Traditional))
s8321414 Dec 5, 2018
633be50
Introduce a default_server_name for aesthetics and rework .well-known
turt2live Dec 5, 2018
573cb8a
Translated using Weblate (French)
Dec 5, 2018
dad8e6a
Merge pull request #2326 from jryans/group-users-error
dbkr Dec 5, 2018
817f78e
Translated using Weblate (Polish)
krkk Dec 5, 2018
28dc6f6
Merge remote-tracking branch 'origin/develop' into develop
Dec 5, 2018
5764622
Translated using Weblate (French)
Dec 5, 2018
9f25c39
Translated using Weblate (Hungarian)
szimszon Dec 4, 2018
c8aa53c
Translated using Weblate (Albanian)
ujdhesa Dec 5, 2018
a3382eb
Merge pull request #2328 from RiotTranslateBot/weblate-riot-web-matri…
dbkr Dec 5, 2018
c553323
Factor out common login code (#2307)
richvdh Dec 5, 2018
0f348a7
Merge branch 'develop' into travis/invite-errors
turt2live Dec 5, 2018
28f4752
Rename returned completion states to be something sensible
turt2live Dec 5, 2018
7e817f4
Add a helpful comment
turt2live Dec 5, 2018
c46bae5
Merge branch 'develop' into travis/cors-on-join
turt2live Dec 5, 2018
c06d42d
Merge pull request #2317 from matrix-org/travis/invite-errors
turt2live Dec 5, 2018
a2b825b
Sort translations by file name
turt2live Dec 5, 2018
216fc64
Fix pinning of rooms without badges
turt2live Dec 5, 2018
daa0ddd
Merge pull request #2306 from matrix-org/travis/cors-on-join
turt2live Dec 5, 2018
79ad95c
Merge remote-tracking branch 'origin/develop' into travis/sort-i18n-2
turt2live Dec 5, 2018
93c9089
Regenerate en_EN.json
turt2live Dec 5, 2018
f08a54e
Don't consider ACL'd servers as permalink candidates
turt2live Dec 6, 2018
45bc1f7
Appease the linter
turt2live Dec 6, 2018
870825b
js-sdk rc.1
dbkr Dec 6, 2018
e2c0144
Prepare changelog for v0.14.7-rc.1
dbkr Dec 6, 2018
58ab9a0
v0.14.7-rc.1
dbkr Dec 6, 2018
77c51af
Ship the babelrc file to npm
dbkr Dec 6, 2018
c6d22cb
Merge pull request #2332 from matrix-org/dbkr/ship_babelrc
dbkr Dec 6, 2018
c94d8d6
Prepare changelog for v0.14.7-rc.2
dbkr Dec 6, 2018
a82b54f
v0.14.7-rc.2
dbkr Dec 6, 2018
31b7a0d
Merge pull request #2259 from matrix-org/t3chguy/account_deactivation…
turt2live Dec 6, 2018
ca13130
Show the IncomingCallBox if the call is for the RoomSubList
turt2live Dec 6, 2018
757181c
Update React guide in code style
jryans Dec 6, 2018
245c839
Merge pull request #2335 from jryans/react-style-guide
ara4n Dec 6, 2018
173669b
Show the number of unread notifications above the bell on the right
turt2live Dec 6, 2018
0b65a1e
Remove outdated info about custom skins
jryans Dec 7, 2018
95d15b7
Fix tinting of notification icon and use a more reliable notification…
turt2live Dec 7, 2018
6d58296
Merge pull request #2329 from matrix-org/travis/sort-i18n-2
dbkr Dec 7, 2018
d7319d7
Merge pull request #2330 from matrix-org/travis/fix-pinned-rooms
dbkr Dec 7, 2018
482e6b5
Merge pull request #2331 from matrix-org/travis/mto-via
turt2live Dec 7, 2018
8f217dc
Merge pull request #2333 from matrix-org/travis/callbox-hidden
dbkr Dec 7, 2018
d40225b
Merge pull request #2337 from jryans/rm-outdated-skin-info
dbkr Dec 7, 2018
a92d290
Add an in-room reminder to set up key recovery
jryans Dec 6, 2018
d062e2c
Check to make sure email addresses look roughly valid before inviting…
turt2live Dec 7, 2018
0a32570
Merge branch 'develop' into travis/well-known-improvements
turt2live Dec 7, 2018
6707186
Change how the default server name and HS URL interact
turt2live Dec 7, 2018
a969237
Disable the submit button while .well-known is underway
turt2live Dec 7, 2018
f2468f5
Speed up room unread checks by not hitting the SettingsStore so often
turt2live Dec 8, 2018
ebdba32
Add a comment about the SettingsStore being slow
turt2live Dec 8, 2018
7803158
Merge pull request #2339 from matrix-org/travis/speed-up-room-list
turt2live Dec 8, 2018
5444a61
Released js-sdk
dbkr Dec 10, 2018
9d456b2
Prepare changelog for v0.14.7
dbkr Dec 10, 2018
37c984e
v0.14.7
dbkr Dec 10, 2018
f578bc6
Merge branch 'master' into develop
dbkr Dec 10, 2018
36dd43f
Avoid preserving HS url at logout
richvdh Dec 10, 2018
010a31d
Merge remote-tracking branch 'origin/develop' into rav/no_preserve_hs…
richvdh Dec 10, 2018
566e035
Merge pull request #2340 from matrix-org/rav/no_preserve_hs_url
bwindels Dec 11, 2018
ab65669
Remove unused string left behind after #2259
jryans Dec 11, 2018
04c3018
Expose hidden notification rules in UI
jryans Dec 11, 2018
bea551f
Merge pull request #2346 from jryans/expose-push-rules
jryans Dec 12, 2018
2ca7477
Fix typo in push rules comment
jryans Dec 12, 2018
ce7969e
Display custom status messages in the UI
turt2live Dec 12, 2018
bc9c08b
Merge pull request #2338 from matrix-org/travis/validate-emails
turt2live Dec 12, 2018
cd9ea2b
Fix alignment of avatars and status messages
turt2live Dec 12, 2018
dd382ec
Fix a bug with determining 1:1 rooms
turt2live Dec 12, 2018
a91963e
Replace the avatar next to the composer with a status entry menu
turt2live Dec 13, 2018
99f5b9e
Misc cleanup of whitespace
turt2live Dec 13, 2018
b0b7932
Move status context menu to its own component
turt2live Dec 13, 2018
f2649f7
Use the now-prefixed js-sdk status message API
turt2live Dec 13, 2018
96300b4
Merge pull request #2336 from matrix-org/travis/notif-button
turt2live Dec 13, 2018
15366fb
Change room recovery reminder button style
jryans Dec 13, 2018
c6f3542
Update checkmark icon
turt2live Dec 13, 2018
63658e0
Add a missing null check
turt2live Dec 13, 2018
5f434cd
Don't break the UI when something goes wrong
turt2live Dec 13, 2018
366f343
Merge pull request #2327 from matrix-org/travis/well-known-improvements
turt2live Dec 13, 2018
49769a4
Fix translation error on notification icon
turt2live Dec 13, 2018
bae9996
Merge pull request #2352 from matrix-org/travis/fix-notification-bell
turt2live Dec 13, 2018
8592e76
Standardize errors about localpart structure
turt2live Dec 13, 2018
576bfed
Remove global flag
turt2live Dec 14, 2018
7ed9559
Merge pull request #2351 from matrix-org/travis/fix-username-requirem…
turt2live Dec 14, 2018
7efd82f
Disable password managers on the status form
turt2live Dec 14, 2018
7b0766a
Apply 50% opacity to the checkmark when there is no status
turt2live Dec 14, 2018
d304c35
Allow widgets to autoplay media
14mRh4X0r Dec 14, 2018
1c4621c
Link to CONTRIBUTING from JS SDK
jryans Dec 18, 2018
c6da61f
Make sure to grab the InlineSpinner object
turt2live Dec 18, 2018
2b14f2a
Clean up when new key backup version fails to backup
jryans Dec 13, 2018
acc2e98
Add New Recovery Method dialog
jryans Dec 13, 2018
66f5d06
Merge pull request #2363 from matrix-org/travis/fix-group-view
turt2live Dec 18, 2018
b036e59
Enable ESLint rule to require defined components in JSX
jryans Dec 18, 2018
37b3644
React-sdk changes to support sandboxed electron
dbkr Dec 18, 2018
ef60a34
Clean up and follow code style
turt2live Dec 18, 2018
3a8b9ab
unused import
dbkr Dec 18, 2018
d20a934
Appease the linter
turt2live Dec 18, 2018
04c9fff
Add a feature flag for custom status messages
turt2live Dec 18, 2018
1ca9137
Merge pull request #2372 from matrix-org/dbkr/electron_sandbox
dbkr Dec 19, 2018
45f0509
Add a comment to describe why we're not using the property we should be
turt2live Dec 19, 2018
a1347ad
Merge branch 'develop' into travis/custom-status
turt2live Dec 19, 2018
a22a949
Remove duplicate CSS file for CreateKeyBackupDialog
jryans Dec 18, 2018
9c4ff40
Convert show recovery key to flexbox
jryans Dec 18, 2018
a597ad1
Add a few more zxcvbn strings
jryans Dec 19, 2018
24f0123
Convert pass phrase entry to flexbox
jryans Dec 19, 2018
37256d2
Use primary styling on download / clipboard key actions
jryans Dec 19, 2018
fd94dc6
Handle errors when fetching commits for changelog
jryans Dec 19, 2018
2e1e536
Merge pull request #2347 from matrix-org/travis/custom-status
turt2live Dec 19, 2018
991104d
Handle well-known data in the login response
richvdh Nov 28, 2018
9c78141
Merge remote-tracking branch 'origin/develop' into rav/well_known_in_…
richvdh Dec 21, 2018
f5ff580
Add some logging for riot-web#7838
turt2live Dec 21, 2018
df89d97
Fetch matching e2e-test branch
turt2live Dec 22, 2018
310f634
Ensure we install the master branch of the e2e tests as a default
turt2live Dec 22, 2018
3dab1b8
Merge pull request #2384 from matrix-org/rav/well_known_in_login_resp…
richvdh Dec 24, 2018
384320e
Consistently order flairs based on room configuration.
christopherjmedlin Dec 24, 2018
1b8a8e9
Merge pull request #2385 from matrix-org/travis/7838-logging
turt2live Dec 29, 2018
135a088
Update scripts/fetchdep.sh
jryans Dec 29, 2018
a3778dc
Merge pull request #2387 from matrix-org/travis/fix-build
turt2live Dec 29, 2018
402f582
Show in-room reminder when key backup creating device unverified
jryans Jan 2, 2019
758e867
Merge pull request #2389 from christopherjmedlin/consistent-flair-ord…
jryans Jan 2, 2019
22167f8
upgrade expect to 23.6.0
Dec 25, 2018
c3185a4
breaking changes from expect upgrade
Dec 25, 2018
0bb3594
replace expect.createSpy() with jest.fn()
Dec 25, 2018
c11d0bd
Merge pull request #2394 from jryans/key-backup-unverified-creator
dbkr Jan 3, 2019
6447a60
Revert "Merge pull request #2336 from matrix-org/travis/notif-button"
turt2live Jan 3, 2019
8017f0a
Merge remote-tracking branch 'origin/experimental' into travis/develo…
turt2live Jan 3, 2019
01eacfa
Regenerate en_EN.json
turt2live Jan 3, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ module.exports = {
}],
"react/jsx-key": ["error"],

// Components in JSX should always be defined.
"react/jsx-no-undef": "error",

// Assert no spacing in JSX curly brackets
// <Element prop={ consideredError} prop={notConsideredError} />
//
Expand Down
2 changes: 1 addition & 1 deletion .travis-test-riot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ popd
if [ "$TRAVIS_BRANCH" = "develop" ]
then
# run end to end tests
git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch master
scripts/fetchdep.sh matrix-org matrix-react-end-to-end-tests master
pushd matrix-react-end-to-end-tests
ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web
# PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
Expand Down
54 changes: 54 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,57 @@
Changes in [0.14.7](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.7) (2018-12-10)
=====================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.7-rc.2...v0.14.7)

* No changes since rc.2

Changes in [0.14.7-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.7-rc.2) (2018-12-06)
===============================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.7-rc.1...v0.14.7-rc.2)

* Ship the babelrc file to npm
[\#2332](https://github.com/matrix-org/matrix-react-sdk/pull/2332)

Changes in [0.14.7-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.7-rc.1) (2018-12-06)
===============================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.6...v0.14.7-rc.1)

* Suppress CORS errors in the 'failed to join room' dialog
[\#2306](https://github.com/matrix-org/matrix-react-sdk/pull/2306)
* Check if users exist before inviting them and communicate errors
[\#2317](https://github.com/matrix-org/matrix-react-sdk/pull/2317)
* Update from Weblate.
[\#2328](https://github.com/matrix-org/matrix-react-sdk/pull/2328)
* Allow group summary to load when /users fails
[\#2326](https://github.com/matrix-org/matrix-react-sdk/pull/2326)
* Show correct text if passphrase is skipped
[\#2324](https://github.com/matrix-org/matrix-react-sdk/pull/2324)
* Add password strength meter to backup creation UI
[\#2294](https://github.com/matrix-org/matrix-react-sdk/pull/2294)
* Check upload limits before trying to upload large files
[\#1876](https://github.com/matrix-org/matrix-react-sdk/pull/1876)
* Support .well-known discovery
[\#2227](https://github.com/matrix-org/matrix-react-sdk/pull/2227)
* Make create key backup dialog async
[\#2291](https://github.com/matrix-org/matrix-react-sdk/pull/2291)
* Forgot to enable continue button on download
[\#2288](https://github.com/matrix-org/matrix-react-sdk/pull/2288)
* Online incremental megolm backups (v2)
[\#2169](https://github.com/matrix-org/matrix-react-sdk/pull/2169)
* Add recovery key download button
[\#2284](https://github.com/matrix-org/matrix-react-sdk/pull/2284)
* Passphrase Support for e2e backups
[\#2283](https://github.com/matrix-org/matrix-react-sdk/pull/2283)
* Update async dialog interface to use promises
[\#2286](https://github.com/matrix-org/matrix-react-sdk/pull/2286)
* Support for m.login.sso
[\#2279](https://github.com/matrix-org/matrix-react-sdk/pull/2279)
* Added badge to non-autoplay GIFs
[\#2235](https://github.com/matrix-org/matrix-react-sdk/pull/2235)
* Improve terms auth flow
[\#2277](https://github.com/matrix-org/matrix-react-sdk/pull/2277)
* Handle crypto db version upgrade
[\#2282](https://github.com/matrix-org/matrix-react-sdk/pull/2282)

Changes in [0.14.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.6) (2018-11-22)
=====================================================================================================
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.5...v0.14.6)
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Contributing code to The React SDK
==================================

matrix-react-sdk follows the same pattern as https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst
matrix-react-sdk follows the same pattern as https://github.com/matrix-org/matrix-js-sdk/blob/master/CONTRIBUTING.rst
58 changes: 0 additions & 58 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,61 +127,3 @@ Github Issues

All issues should be filed under https://github.com/vector-im/riot-web/issues
for now.

OUTDATED: To Create Your Own Skin
=================================

**This is ALL LIES currently, and needs to be updated**

Skins are modules are exported from such a package in the `lib` directory.
`lib/skins` contains one directory per-skin, named after the skin, and the
`modules` directory contains modules as their javascript files.

A basic skin is provided in the matrix-react-skin package. This also contains
a minimal application that instantiates the basic skin making a working matrix
client.

You can use matrix-react-sdk directly, but to do this you would have to provide
'views' for each UI component. To get started quickly, use matrix-react-skin.

To actually change the look of a skin, you can create a base skin (which
does not use views from any other skin) or you can make a derived skin.
Note that derived skins are currently experimental: for example, the CSS
from the skins it is based on will not be automatically included.

To make a skin, create React classes for any custom components you wish to add
in a skin within `src/skins/<skin name>`. These can be based off the files in
`views` in the `matrix-react-skin` package, modifying the require() statement
appropriately.

If you make a derived skin, you only need copy the files you wish to customise.

Once you've made all your view files, you need to make a `skinfo.json`. This
contains all the metadata for a skin. This is a JSON file with, currently, a
single key, 'baseSkin'. Set this to the empty string if your skin is a base skin,
or for a derived skin, set it to the path of your base skin's skinfo.json file, as
you would use in a require call.

Now you have the basis of a skin, you need to generate a skindex.json file. The
`reskindex.js` tool in matrix-react-sdk does this for you. It is suggested that
you add an npm script to run this, as in matrix-react-skin.

For more specific detail on any of these steps, look at matrix-react-skin.

Alternative instructions:

* Create a new NPM project. Be sure to directly depend on react, (otherwise
you can end up with two copies of react).
* Create an index.js file that sets up react. Add require statements for
React and matrix-react-sdk. Load a skin using the 'loadSkin' method on the
SDK and call Render. This can be a skin provided by a separate package or
a skin in the same package.
* Add a way to build your project: we suggest copying the scripts block
from matrix-react-skin (which uses babel and webpack). You could use
different tools but remember that at least the skins and modules of
your project should end up in plain (ie. non ES6, non JSX) javascript in
the lib directory at the end of the build process, as well as any
packaging that you might do.
* Create an index.html file pulling in your compiled javascript and the
CSS bundle from the skin you use. For now, you'll also need to manually
import CSS from any skins that your skin inherts from.
34 changes: 30 additions & 4 deletions code_style.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ ECMAScript

React
-----
- Use React.createClass rather than ES6 classes for components, as the boilerplate is way too heavy on ES6 currently. ES7 might improve it.
- Pull out functions in props to the class, generally as specific event handlers:

```jsx
Expand All @@ -174,11 +173,38 @@ React
<Foo onClick={this.doStuff}> // Better
<Foo onClick={this.onFooClick}> // Best, if onFooClick would do anything other than directly calling doStuff
```
Not doing so is acceptable in a single case; in function-refs:

Not doing so is acceptable in a single case: in function-refs:

```jsx
<Foo ref={(self) => this.component = self}>
```

- Prefer classes that extend `React.Component` (or `React.PureComponent`) instead of `React.createClass`
- You can avoid the need to bind handler functions by using [property initializers](https://reactjs.org/docs/react-component.html#constructor):

```js
class Widget extends React.Component
onFooClick = () => {
...
}
}
```
- To define `propTypes`, use a static property:
```js
class Widget extends React.Component
static propTypes = {
...
}
}
```
- If you need to specify initial component state, [assign it](https://reactjs.org/docs/react-component.html#constructor) to `this.state` in the constructor:
```js
constructor(props) {
super(props);
// Don't call this.setState() here!
this.state = { counter: 0 };
}
```
- Think about whether your component really needs state: are you duplicating
information in component state that could be derived from the model?
12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
"version": "0.14.6",
"version": "0.14.7",
"description": "SDK for matrix.org using React",
"author": "matrix.org",
"repository": {
Expand All @@ -10,6 +10,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"files": [
".babelrc",
".eslintrc.js",
"CHANGELOG.md",
"CONTRIBUTING.rst",
Expand Down Expand Up @@ -72,11 +73,12 @@
"gfm.css": "^1.1.1",
"glob": "^5.0.14",
"highlight.js": "^9.13.0",
"is-ip": "^2.0.0",
"isomorphic-fetch": "^2.2.1",
"linkifyjs": "^2.1.6",
"lodash": "^4.13.1",
"lolex": "2.3.2",
"matrix-js-sdk": "0.14.1",
"matrix-js-sdk": "0.14.2",
"optimist": "^0.6.1",
"pako": "^1.0.5",
"prop-types": "^15.5.8",
Expand All @@ -96,7 +98,8 @@
"text-encoding-utf-8": "^1.0.1",
"url": "^0.11.0",
"velocity-vector": "github:vector-im/velocity#059e3b2",
"whatwg-fetch": "^1.1.1"
"whatwg-fetch": "^1.1.1",
"zxcvbn": "^4.4.2"
},
"devDependencies": {
"babel-cli": "^6.26.0",
Expand All @@ -121,8 +124,9 @@
"eslint-plugin-flowtype": "^2.30.0",
"eslint-plugin-react": "^7.7.0",
"estree-walker": "^0.5.0",
"expect": "^1.16.0",
"expect": "^23.6.0",
"flow-parser": "^0.57.3",
"jest-mock": "^23.2.0",
"karma": "^3.0.0",
"karma-chrome-launcher": "^0.2.3",
"karma-cli": "^1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion res/css/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ body {
margin: 0px;
}

div.error, div.warning {
.error, .warning {
color: $warning-color;
}

Expand Down
5 changes: 4 additions & 1 deletion res/css/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
@import "./structures/_ViewSource.scss";
@import "./structures/login/_Login.scss";
@import "./views/avatars/_BaseAvatar.scss";
@import "./views/avatars/_MemberStatusMessageAvatar.scss";
@import "./views/context_menus/_MessageContextMenu.scss";
@import "./views/context_menus/_RoomTileContextMenu.scss";
@import "./views/context_menus/_StatusMessageContextMenu.scss";
@import "./views/context_menus/_TagTileContextMenu.scss";
@import "./views/context_menus/_TopLeftMenu.scss";
@import "./views/dialogs/_BugReportDialog.scss";
Expand All @@ -35,7 +37,6 @@
@import "./views/dialogs/_ChatInviteDialog.scss";
@import "./views/dialogs/_ConfirmUserActionDialog.scss";
@import "./views/dialogs/_CreateGroupDialog.scss";
@import "./views/dialogs/_CreateKeyBackupDialog.scss";
@import "./views/dialogs/_CreateRoomDialog.scss";
@import "./views/dialogs/_DeactivateAccountDialog.scss";
@import "./views/dialogs/_DevtoolsDialog.scss";
Expand All @@ -49,6 +50,7 @@
@import "./views/dialogs/_ShareDialog.scss";
@import "./views/dialogs/_UnknownDeviceDialog.scss";
@import "./views/dialogs/keybackup/_CreateKeyBackupDialog.scss";
@import "./views/dialogs/keybackup/_NewRecoveryMethodDialog.scss";
@import "./views/dialogs/keybackup/_RestoreKeyBackupDialog.scss";
@import "./views/directory/_NetworkDropdown.scss";
@import "./views/elements/_AccessibleButton.scss";
Expand Down Expand Up @@ -104,6 +106,7 @@
@import "./views/rooms/_RoomHeader.scss";
@import "./views/rooms/_RoomList.scss";
@import "./views/rooms/_RoomPreviewBar.scss";
@import "./views/rooms/_RoomRecoveryReminder.scss";
@import "./views/rooms/_RoomSettings.scss";
@import "./views/rooms/_RoomTile.scss";
@import "./views/rooms/_RoomTooltip.scss";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_CreateKeyBackupDialog {
padding-right: 40px;
}

.mx_CreateKeyBackupDialog_recoveryKey {
padding: 20px;
color: $info-plinth-fg-color;
background-color: $info-plinth-bg-color;
.mx_MemberStatusMessageAvatar_hasStatus {
border: 2px solid $accent-color;
border-radius: 40px;
}
55 changes: 55 additions & 0 deletions res/css/views/context_menus/_StatusMessageContextMenu.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
Copyright 2018 New Vector Ltd

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_StatusMessageContextMenu_message {
display: inline-block;
border-radius: 3px 0 0 3px;
border: 1px solid $input-border-color;
font-size: 13px;
padding: 7px 7px 7px 9px;
width: 135px;
background-color: $primary-bg-color !important;
}

.mx_StatusMessageContextMenu_submit {
display: inline-block;
}

.mx_StatusMessageContextMenu_submitFaded {
opacity: 0.5;
}

.mx_StatusMessageContextMenu_submit img {
vertical-align: middle;
margin-left: 8px;
}

.mx_StatusMessageContextMenu hr {
border: 0.5px solid $menu-border-color;
}

.mx_StatusMessageContextMenu_clearIcon {
margin: 5px 15px 5px 5px;
vertical-align: middle;
}

.mx_StatusMessageContextMenu_clear {
padding: 2px;
}

.mx_StatusMessageContextMenu_hasStatus .mx_StatusMessageContextMenu_clear {
color: $warning-color;
}
Loading