3983535536
Merge pull request #1916 from akihikodaki/sinon
...
Update sinon to 5.0.7
2018-06-08 16:41:11 +01:00
4834816a06
v0.12.7-rc.1
2018-06-06 16:06:45 +01:00
881e9a8070
js-sdk rc.1
2018-06-06 16:00:16 +01:00
ab41212258
fix double-nested code blocks & bump md-serializer
2018-05-26 00:37:21 +01:00
bbdc27019a
v0.12.6
2018-05-25 15:16:01 +01:00
8a3ae1ed63
released js-sdk
2018-05-25 15:12:48 +01:00
02377b57c0
v0.12.6-rc.1
2018-05-24 18:22:56 +01:00
3851fa80ff
js-sdk RC
2018-05-24 18:19:11 +01:00
864a33f978
switch to using 'code' for both blocks & marks to match md-serializer
2018-05-23 20:12:13 +01:00
87c3e92014
bump dep
2018-05-23 13:32:48 +01:00
5b4a036e8c
bump dep
2018-05-23 03:53:05 +01:00
95bfface99
comment out broken logic for stripping p tags & bump dep
2018-05-23 03:43:40 +01:00
079b1238a1
bump right dep
2018-05-23 03:20:59 +01:00
a822a1c9a0
bump dep
2018-05-23 03:19:33 +01:00
6f3634c33f
bump slate-md-serializer
2018-05-23 03:08:55 +01:00
edc8264cff
shift to custom slate-md-serializer
2018-05-23 02:48:57 +01:00
fc1c4996fc
slate-md-serializer 3.1.0 now escapes correctly
2018-05-23 02:15:34 +01:00
35ab573bc5
Update sinon to 5.0.7
2018-05-21 18:44:00 +09:00
4972a234c4
Merge branch 'develop' into matthew/slate
2018-05-19 12:58:43 +01:00
fa7f6c2c4c
v0.12.5
2018-05-17 17:04:39 +01:00
bf0ec249b6
v0.12.4
2018-05-16 11:49:06 +01:00
a0b6bd183c
v0.12.4-rc.6
2018-05-15 18:03:40 +01:00
db092c81d3
v0.12.4-rc.5
2018-05-15 15:54:15 +01:00
b60ccad29b
Merge branch 'develop' into matthew/slate
2018-05-15 01:00:07 +01:00
7bfc50bf42
v0.12.4-rc.4
2018-05-14 18:23:14 +01:00
721410b710
Merge branch 'develop' into matthew/slate
2018-05-13 19:50:55 +01:00
d90292c6f1
v0.12.4-rc.3
2018-05-11 18:26:35 +01:00
6a0bff6685
v0.12.4-rc.2
2018-05-09 17:34:54 +01:00
ddf98705f2
v0.12.4-rc.1
2018-05-09 13:44:42 +01:00
76a8b61772
Merge branch 'master' into develop
2018-05-09 13:31:42 +01:00
3d20bd00a2
Pin lolex at 2.3.2 to avoid bug causing tests to fail
...
See https://github.com/sinonjs/lolex/issues/170
2018-05-09 11:43:02 +01:00
02947063d3
Merge branch 'develop' into matthew/slate
2018-05-05 22:45:44 +01:00
ccd99f4a49
increase max-warnings temporarily
2018-05-05 22:27:54 +01:00
aa370b3b67
Merge pull request #1877 from matrix-org/luke/test-room-list
...
Add tests for RoomList
2018-05-04 13:57:57 +01:00
8fcb530e6f
Install lolex for clock mocking in tests
2018-05-03 15:25:14 +01:00
2475295a24
Up the max warning count :(
2018-05-02 17:42:23 +01:00
bf8612f864
Update eslint-plugin-react
...
Enables jsx-no-bind checking (although we may have to stop erroring
on this as we currently break this rule in a few places)
2018-05-02 17:30:37 +01:00
dded89383a
v0.12.3
2018-04-30 13:37:57 +01:00
68ca2a9461
Bump js-sdk version
2018-04-30 13:33:57 +01:00
a1c4424224
Add tests for GroupView
2018-04-27 14:28:24 +01:00
dafa65823c
v0.12.3-rc.3
2018-04-26 11:19:48 +01:00
78d836e607
v0.12.3-rc.2
2018-04-25 16:33:06 +01:00
9146438683
Add res dir to package.json
2018-04-25 16:07:16 +01:00
a08b055a84
v0.12.3-rc.1
2018-04-25 15:33:05 +01:00
1feb2434ef
js-sdk rc.1
2018-04-25 15:22:00 +01:00
88624c8548
Upgrade to mocha 5.05
...
primarily for use of `describe.only`
2018-04-25 09:45:14 +01:00
75a2be1a8d
WIP (doesn't build yet) replacing draft with slate
2018-04-23 01:13:18 +01:00
0571c596e3
move deps from vector-web to sdk; resolve version mismatches...
2018-04-18 10:53:01 +01:00
7e977d0016
Merge branch 'master' into develop
2018-04-12 12:54:46 +01:00
c06fc31bb2
v0.12.2
2018-04-12 12:50:52 +01:00
f38bb1f2c2
Bump js-sdk
2018-04-12 12:40:33 +01:00
1c6c180908
Merge branch 'master' into develop
2018-04-11 11:55:24 +01:00
1adb82b985
v0.12.1
2018-04-11 11:54:54 +01:00
478c2bab33
Bump js-sdk version to 0.10.0
2018-04-11 11:51:16 +01:00
428cae34eb
Merge branch 'master' into develop
...
(Releasing v0.12.0)
2018-04-11 11:32:05 +01:00
87d0c4b45a
v0.12.0
2018-04-11 11:31:31 +01:00
f2e60b1526
v0.12.0-rc.7
2018-04-10 14:27:38 +01:00
d02dced246
v0.12.0-rc.6
2018-04-09 17:10:03 +01:00
9bab958a97
v0.12.0-rc.5
2018-04-09 15:41:02 +01:00
84635b715c
Bump matrix-js-sdk to rc.2
2018-04-09 15:31:52 +01:00
ce80b82ab3
Bump source-map-loader version to avoid bug /w inline base64 maps
2018-04-09 13:53:02 +01:00
72b9cb0be4
v0.12.0-rc.4
2018-03-22 13:17:48 +00:00
3a8f380113
v0.12.0-rc.3
2018-03-20 17:38:12 +00:00
580b68a1b6
Merge pull request #1652 from pvagner/dialog-a11y
...
Dialog a11y
2018-03-20 11:35:57 +00:00
12e468a314
v0.12.0-rc.2
2018-03-19 14:59:00 +00:00
6fbd4e04fa
v0.12.0-rc.1
2018-03-19 12:16:32 +00:00
2c81588937
bump js-sdk version
2018-03-19 12:11:08 +00:00
100a5ba96a
Merge branch 'master' into develop
2018-02-09 12:34:44 +00:00
4bf5e44b20
v0.11.4
2018-02-09 12:34:00 +00:00
14991afbe5
Merge branch 'develop' into dialog-a11y
2018-02-06 23:04:15 +01:00
00dc077271
Remove react-dnd, revert fa14bc9 as no longer needed
2018-01-19 13:34:56 +00:00
16c13fb079
Replace TagPanel react-dnd with react-beautiful-dnd
...
This new library handles the simple case of an ordered vertical
(or horizontal) list of items that can be reordered.
It provides animations, handles positioning of items mid-drag
and exposes a much simpler API to react-dnd (with a slight loss
of potential function, but we don't need this flexibility here
anyway).
Apart from this, TagOrderStore had to be changed in a highly
coupled way, but arguably for the better. Instead of being
updated incrementally every time an item is dragged over
another and having a separate "commit" action, the
asyncronous action `moveTag` is used to reposition the tag in
the list and both dispatch an optimistic update and carry out
the request as before. (The MatrixActions.accountData is still
used to indicate a successful reordering of tags).
The view is updated instantly, in an animated way, and this
is handled at the layer "above" React by the DND library.
2018-01-15 18:12:27 +00:00
76ce40715d
bump commonmark dep to try to fix https://github.com/vector-im/riot-web/issues/3428 better
2018-01-07 20:32:57 +00:00
a8a650c24a
Move TagTile to separate file, and make it dragable
2017-12-06 11:25:46 +00:00
f9b0243c8e
Merge branch 'develop' into dialog-a11y
2017-12-06 11:10:18 +01:00
4f83f6cf25
Move keyboard focus management back to the BaseDialog rather than
...
leaving it in the Modal manager.
We are using Modal manager to load other components not just BaseDialog
and its subclasses and they might require different keyboard handling.
Also depend on focus-trap-react rather than react-focus-trap for locking
keyboard focus inside the dialog. The experience is much nicer and even
the FocusTrap element it-self no longer gains the focus.
On a side note using the FocusTrap element outside the dialog (on
its parent) stops it from working properly.
2017-12-05 08:50:40 +01:00
1a283f90f5
v0.11.3
2017-12-04 12:24:21 +00:00
50e227f5c0
Bump js-sdk dep. to 0.9.2
2017-12-04 12:15:19 +00:00
5ccbcf02e2
Several changes improving accessibility of the dialogs
...
- Wrapped all the modals inside a react-focus-trap component disabling
keyboard navigation outside the modal dialogs
- Disabled our custom key handling at dialog level. Cancelling on esc
key is now handled via FocusTrap component.
- Removed onEnter prop from the BaseDialog component. Dialogs that
submit data all now embed a form with onSubmit handler. And since
keyboard focus is now managed better via FocusTrap it no longer makes
sense for the other dialog types. Fixes
https://github.com/vector-im/riot-web/issues/5736
- Set aria-hidden on the matrixChat outer node when showing dialogs to
disable navigating outside the modals by using screen reader specific
features.
2017-12-03 21:38:21 +01:00
a088e559d1
v0.11.2
2017-11-28 10:25:04 +00:00
394e450526
v0.11.1
2017-11-17 16:03:50 +00:00
8bd040a443
Released js-sdk
2017-11-17 15:58:05 +00:00
6fd09bc09a
v0.11.0
2017-11-15 11:01:29 +00:00
9df169b500
Bump js-sdk to release 0.9.0
2017-11-15 10:59:06 +00:00
07f4d0c304
v0.11.0-rc.3
2017-11-14 14:17:22 +00:00
21ead6e48e
v0.11.0-rc.2
2017-11-10 16:45:30 +00:00
07b6c55982
v0.11.0-rc.1
2017-11-10 13:40:17 +00:00
b68b60c04c
Bump js-sdk dep
2017-11-10 13:37:12 +00:00
d2070a08d8
Replace 'qs' dep. with 'querystring'
2017-11-10 11:42:56 +00:00
ca1ffdfa9f
Remove unused dep.
2017-11-08 17:39:25 +00:00
96de72ab44
Switch to using existing dep "qs" and record in package.json
2017-11-07 12:45:12 +00:00
6012b35acf
Use querystring lib instead of URLSearchParams
2017-10-31 10:22:58 +00:00
355d69b024
Add querystring dep. already used by things like url_utils.js.
2017-10-31 10:15:30 +00:00
0a7273bf1d
Add URL search paramas polyfill
2017-10-27 16:39:04 +01:00
f4e3e84765
Merge pull request #1338 from matrix-org/rxl881/parallelshell
...
Rxl881/parallelshell
2017-10-20 17:11:03 +01:00
a49eabda4c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into rxl881/parallelshell
2017-10-19 16:26:22 +01:00
8a9de7343c
Add script to prune unused translations
2017-10-19 12:11:21 +01:00
027a70ffe7
Add gen-i18n as a 'binary'
...
and add appropriate shebang
2017-10-19 10:51:54 +01:00
61b05e7ec3
Add i18n script to package.json
2017-10-19 10:19:43 +01:00
9442184d0d
Updated parallelshell dep to ^3.0.2 to match riot-web.
2017-10-19 10:18:31 +01:00
8370c823b6
Script to generate the translations base file
...
Also replaces the translations base file with the output of the
script.
2017-10-17 19:19:01 +01:00
f58d89ef80
v0.10.7
2017-10-16 14:45:14 +01:00
bcb792a412
Released js-sdk
2017-10-16 14:41:23 +01:00
3b515cdebe
v0.10.7-rc.3
2017-10-13 16:31:35 +01:00
b95c2368a6
v0.10.7-rc.2
2017-10-13 15:02:37 +01:00
9036f786e7
v0.10.7-rc.1
2017-10-13 11:10:21 +01:00
289fc230fe
js-sdk rc.1
2017-10-13 11:05:58 +01:00
6b9a2909df
Add rule to enforce spacing in curly brackets in JSX children
...
This required an updated in version of eslint-plugin-react to 7.4.0.
2017-09-28 11:21:06 +01:00
78e806f7f9
Merge branch 'master' into develop
2017-09-21 21:48:08 +01:00
3552f08aad
v0.10.6
2017-09-21 21:47:28 +01:00
daac0ebdc0
js-sdk v0.8.4
2017-09-21 21:43:35 +01:00
c6e4f606f9
Merge branch 'master' into develop
2017-09-21 18:02:16 +01:00
99e4221e61
v0.10.5
2017-09-21 18:01:42 +01:00
a0b4d8a9f8
Clean on prerelease
...
To avoid any further problems where we ship build files with the
wrong capitalisation because npm is dumb
2017-09-21 17:39:34 +01:00
6c5f4983da
v0.10.4
2017-09-20 15:13:20 +01:00
22271ced0d
released js-sdk
2017-09-20 15:09:14 +01:00
620ca5f211
v0.10.4-rc.1
2017-09-19 10:50:34 +01:00
d992d6937e
js-sdk rc.1
2017-09-19 10:47:18 +01:00
609d61d53c
Revert "Implement sticky date separators"
2017-09-06 17:40:58 +01:00
5dfd35f730
Merge branch 'master' into develop
2017-09-06 13:26:34 +01:00
f5cf2aece2
v0.10.3
2017-09-06 13:25:58 +01:00
c75bc42585
v0.10.3-rc.2
2017-09-05 13:13:02 +01:00
c07362d7c1
v0.10.3-rc.1
2017-09-01 16:17:22 +01:00
a29e7da06b
Merge branch 'develop' into luke/feature-sticky-date-separators
2017-08-30 14:06:06 +01:00
d516906b36
Implement sticky date separators
...
Use `react-sticky` to implement sticky date separators. This will pin a date separator to the top of the timeline panel when the separator scrolls out of the top of the view.
A known issue of this is that the spinner, which is in line with event tiles in the timeline, will appear to push the stuck date separator down. In reality the first date separator after the spinner is in line with event tiles and is not stuck because the spinner forces the timeline to be scrolled slightly further down than it would be otherwise. But also, date separators in the timeline (not "stuck") have a greater height.
Ideally the date separator would be suppressed whilst back paginating, but this will cause the stuck separator to flicker on and off. This is why the suppression has been removed.
2017-08-30 13:52:46 +01:00
f39f2e525b
Update parallelshell version.
2017-08-25 09:52:44 +01:00
0e3ae2fa4f
v0.10.2
2017-08-24 14:49:41 +01:00
1b75470597
Released js-sdk
2017-08-24 14:48:22 +01:00
3581f6edaa
v0.10.1
2017-08-23 15:56:09 +01:00
b8e351f489
Released js-sdk
2017-08-23 15:54:06 +01:00
85b609608e
v0.10.1-rc.1
2017-08-22 18:53:11 +01:00
8312cf6ab2
Temporarily bump version
...
so we compare to 0.10.0-rc.2 rather than 0.9.7
2017-08-22 18:50:33 +01:00
3939d948bf
js-sdk v0.10.1-rc.1
2017-08-22 18:43:33 +01:00
222aed896f
js-sdk #develop
2017-08-16 10:06:50 +01:00
8f21ba7f7a
js-sdk 0.8.0
2017-08-16 09:37:10 +01:00
91c96c1c27
Update draft-js-export-* deps to be compatible with draft-js >0.10.0
2017-08-04 15:08:03 +01:00
4f0cf7d6ec
Update npm dep of draft-js to 0.11.0-alpha
2017-08-03 11:16:32 +01:00
1001c39da9
Upgrade draft-js from 0.8.1 to 0.10.1
...
This fixes vector-im/riot-web#4675
Some APIs have become deprecated in this version but are still usable ( see https://draftjs.org/docs/v0-10-api-migration.html )
2017-08-01 16:02:28 +01:00
0118d880ec
Attempt to improve test output to be more readable
...
- Add "logcapture" reporter to capture logs only for failed tests
- Add "spec" reporter to show each test status individually
- Add "summary" reporter to show the total number of successful/failed tests
2017-07-27 14:47:22 +01:00
4d83150855
Transform `async` functions to bluebird promises
...
It turns out that the assertion made in
https://github.com/matrix-org/matrix-react-sdk/pull/1213 about `async`
functions returning bluebird promises was only correct when babel used an
inline version of the `asyncToGenerator` helper; in react-sdk we are using
`babel-transform-runtime` which means that we use a separate
`babel-runtime/helpers/asyncToGenerator`, which returns a native (or core-js)
Promise.
This meant that we were still in the situation where some methods returned
native Promises, and some bluebird ones, which is exactly the situation I
wanted to resolve by switching to bluebird in the first place: in short,
unless/until we get rid of all code which assumes Promises have a `done` method
etc, we need to make sure that everything returns a bluebird promise.
(Aside: there was debate over whether in the long term we should be trying to
wean ourselves off bluebird promises by assuming all promises are native. The
conclusion was that the complexity hit involved in doing so outweighed any
benefit of a potential future migration away from bluebird).
2017-07-13 17:10:08 +01:00
a06bd84213
replace imports of `q` with bluebird
...
update `package.json`
```
find src test -name '*.js' |
xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
find src test -name '*.js' |
xargs perl -i -pe 'if (/import [qQ]/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
2017-07-12 18:05:08 +01:00
3093f2d6fb
Merge pull request #1211 from matrix-org/rav/use_react_test_utils
...
Use matrix-react-test-utils rather than our own impl
2017-07-12 16:44:25 +01:00
928287b8fc
Bump to matrix-react-test-utils 0.1.1
...
... because 0.1.0 was broken
2017-07-12 00:02:52 +01:00
ab61b6b1b6
Use matrix-react-test-utils rather than our own impl
...
waitForRenderedDOMComponentWithTag is now in matrix-react-test-utils.
2017-07-11 23:14:56 +01:00
7473c654d5
use npm scripts arg passing instead of $KARMAFLAGS to make cross-compat
2017-07-11 22:54:18 +01:00
e242e5e714
Merge pull request #1205 from matrix-org/luke/feature-new-emojis
...
Bump the dep on emojione to 2.2.7 to add 🦈 and others
2017-07-11 14:13:13 +01:00
4766447e15
Bump the dep on emojione to 2.2.7 to add 🦈 and others
...
Also, re-run node scripts/emoji-data-strip.js to update emoji meta data in src/stripped-emoji.json
2017-07-11 13:48:15 +01:00
f9ee89b2f4
Merge branch 'develop' into matthew/whitelist-uri-schemes
2017-07-10 15:42:03 +01:00
e0e321783b
Append the scalar_token to the widget URL if the widget URL is a scalar URL ( #1182 )
2017-07-06 09:28:48 +01:00
f69033c907
Use headless chrome instead of phantomjs for tests
2017-07-05 14:39:02 +01:00
30f80b57f2
Instead of making this part of the build process, let the devs generate stripped-emoji.json
...
With the expectation that when the file needs to be regenerated to include other keys, the developer will run this script.
2017-06-28 13:28:48 +01:00
22ddbc63c3
Make lib dir prior to building
...
-p option will not error if lib already exists
2017-06-28 11:54:05 +01:00
2b8da85726
Strip the emoji meta-data for the data we need
...
This is done at build time by parsing emojione/emoji.json, stripping it and then writing to ./lib/stripped-emoji.json.
2017-06-28 11:36:19 +01:00
8ca3b382ed
Use emojione/emoji.json because we don't want two sets of emoji meta
2017-06-28 11:19:16 +01:00
9d339b96bd
Order emojis by standard ordering, add alternate shortnames
...
Also, increase the maximum number of emoji shown to 20.
2017-06-27 20:13:48 +01:00
c0e48c72fc
Remove dep on liblevenstein
...
While we don't actually use it
2017-06-23 18:03:32 +01:00
87609582c6
Merge branch 'develop' into rte-fixes2
...
Conflicts:
package.json
src/autocomplete/CommandProvider.js
src/autocomplete/UserProvider.js
src/components/structures/RoomView.js
src/components/structures/UserSettings.js
src/components/views/rooms/MessageComposerInput.js
2017-06-23 15:30:06 +01:00
f7aad3c422
v0.9.7
2017-06-22 11:57:27 +01:00
6881fdf102
js-sdk 0.7.13
2017-06-22 11:52:13 +01:00
529e014739
v0.9.6
2017-06-20 13:08:06 +01:00
66c3a6d9ca
v0.9.5
2017-06-19 13:09:41 +01:00
faeb40bc0f
Released js-sdk v0.7.12
2017-06-19 12:00:53 +01:00
12ad9a2c58
v0.9.5-rc.2
2017-06-16 13:28:49 +01:00
82436758b2
v0.9.5-rc.1
2017-06-15 17:17:17 +01:00
198d85a673
js-sdk 0.7.12-rc.1
2017-06-15 17:15:26 +01:00
a5aa497287
v0.9.4
2017-06-14 11:17:00 +01:00
aef0a8025c
v0.9.3
2017-06-12 15:50:37 +01:00
29355a610f
js-sdk 0.7.11
2017-06-12 15:19:52 +01:00
336b10daf1
v0.9.3-rc.2
2017-06-09 22:13:54 +01:00
c61942ed5d
We now require flux 2.1 because we use utils
2017-06-09 21:42:34 +01:00
27592728f5
v0.9.3-rc.1
2017-06-09 20:28:09 +01:00
0879d796eb
released js-sdk
2017-06-09 20:26:41 +01:00
53ea41e8a5
Merge branch 'develop' into new-guest-access
2017-06-07 12:08:37 +01:00
31f1e421f2
v0.9.2
2017-06-06 17:40:30 +01:00
619830617a
Merge branch 'develop' into luke/ilag-i18n
...
In order to get ILAG internationalised
Conflicts:
src/components/structures/LoggedInView.js
src/components/structures/MatrixChat.js
src/components/views/dialogs/ChatCreateOrReuseDialog.js
src/components/views/dialogs/SetDisplayNameDialog.js
src/createRoom.js
src/i18n/strings/en_EN.json
2017-06-05 16:08:03 +01:00
0d5ad06ac1
v0.9.1
2017-06-02 22:39:32 +01:00
9e0aca534c
v0.9.0
2017-06-02 14:23:30 +01:00
8add074dbf
v0.9.0-rc.2
2017-06-02 01:14:13 +01:00
7e097d8d74
Merge branch 'release-v0.9.0-rc.1' into develop
2017-06-02 01:07:08 +01:00
73f97b4661
bump js-sdk for webrtc
2017-06-02 01:05:09 +01:00
bceef2db91
v0.9.0-rc.1
2017-06-01 02:15:49 +01:00
b1475cb309
bump js-sdk
2017-06-01 02:04:46 +01:00
5c885922d9
Merge branch 'develop' into new-guest-access
2017-05-28 22:58:18 +01:00
32207bd058
use develop js-sdk
2017-05-26 19:51:47 +01:00
99efbbee5e
Depend on prop-types module
...
So we can start writing code compatible with new React
2017-05-25 12:04:53 +01:00
ec146c7f45
Switch to stock counterpart
...
We no longer need the custom counterpart. The things that were
changed in it and reasosn we no lomger need them are:
1. set separator - this can be done with standard counterpart
2. ES6 port: this was done to allow importing as _t, but is
unnecessary with the _t wrapper function in react-sdk
(although also seems to work fine with
`import _t from 'counterpart';`)
3. Fallback to key name: unnecessary with
`setMissingEntryGenerator` in 0.18, but we've changed to just
using a fallback locale anyway since No code missing en
translations should ever make it to the devbelop branch.
4. Logging on missing translations. Unnecessary with
`onTranslationNotFound`, but now not used anyway because we
let missing translations show up in the UI as
'missing translation'
Bulk changes to imports coming in separate commit for easy reading.
2017-05-25 11:24:17 +01:00
d419c42a4f
Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801
2017-05-23 15:16:31 +01:00
eadd6192e8
v0.8.9
2017-05-22 11:36:56 +01:00
3a0ee385b8
Released js-sdk
2017-05-22 11:35:02 +01:00
1addd6e304
v0.8.9-rc.1
2017-05-19 10:39:14 +01:00
f615bc129f
Released js-sdk
2017-05-19 10:37:33 +01:00
ebfafb3639
Revert "Merge pull request #807 from matrix-org/matthew/quick-search"
...
This reverts commit 0ad1d8caf31189368aab
2017-05-16 16:11:01 +01:00
387529d130
Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2"
...
This reverts commit 3366d3bbaeceb71a4ef6
2017-05-16 14:49:55 +01:00
fdf48def00
make reskindex windows friendly
...
makes #871 windows friendly
2017-05-09 17:13:27 +01:00
fe121126f5
Merge branch 'develop' into rte-fixes
...
Conflicts:
src/UserSettingsStore.js
src/autocomplete/EmojiProvider.js
src/components/views/rooms/MessageComposerInput.js
2017-05-08 17:08:59 +01:00
574c836941
Move chokidar to devDeps
2017-05-08 16:24:13 +01:00
7d1940620d
Add (watching) reskindex to `npm start`
...
also add reskindex in non-watching mode to `npm run build`
2017-05-08 15:07:58 +01:00
2eaaa97451
Give `reskindex.js` a watch mode (-w)
...
`scripts/reskindex.js -w` will run reskindex in watch mode whereby FS events will cause a reskindex to occur.
This depends on `chokidar`
2017-05-08 15:07:05 +01:00
3366d3bbae
Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2
...
Make left panel better for new users (mk II)
2017-05-08 10:37:55 +01:00
f056360f70
merge master post release
2017-05-07 20:01:11 +01:00
David Baker