OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
6,249 Commits
209 Branches
549 Tags
652 MiB
Commit Graph

337 Commits (f39f2e525b0cee79d9ddfb07d43b6e05a9c65fe5)

Author SHA1 Message Date
Richard Lewis f39f2e525b Update parallelshell version. 2017-08-25 09:52:44 +01:00
David Baker 0e3ae2fa4f v0.10.2 2017-08-24 14:49:41 +01:00
David Baker 1b75470597 Released js-sdk 2017-08-24 14:48:22 +01:00
David Baker 3581f6edaa v0.10.1 2017-08-23 15:56:09 +01:00
David Baker b8e351f489 Released js-sdk 2017-08-23 15:54:06 +01:00
David Baker 85b609608e v0.10.1-rc.1 2017-08-22 18:53:11 +01:00
David Baker 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
David Baker 3939d948bf js-sdk v0.10.1-rc.1 2017-08-22 18:43:33 +01:00
Luke Barnard 222aed896f js-sdk #develop 2017-08-16 10:06:50 +01:00
Luke Barnard 8f21ba7f7a js-sdk 0.8.0 2017-08-16 09:37:10 +01:00
Luke Barnard 91c96c1c27 Update draft-js-export-* deps to be compatible with draft-js >0.10.0 2017-08-04 15:08:03 +01:00
Luke Barnard 4f0cf7d6ec Update npm dep of draft-js to 0.11.0-alpha 2017-08-03 11:16:32 +01:00
Luke Barnard 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
Luke Barnard 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
Richard van der Hoff 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
Richard van der Hoff 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
David Baker 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
Richard van der Hoff 928287b8fc Bump to matrix-react-test-utils 0.1.1 
... because 0.1.0 was broken
 2017-07-12 00:02:52 +01:00
Richard van der Hoff 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
Michael Telatynski 7473c654d5
use npm scripts arg passing instead of $KARMAFLAGS to make cross-compat 2017-07-11 22:54:18 +01:00
David Baker 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
Luke Barnard 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
Luke Barnard f9ee89b2f4 Merge branch 'develop' into matthew/whitelist-uri-schemes 2017-07-10 15:42:03 +01:00
Kegsay 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
Richard van der Hoff f69033c907 Use headless chrome instead of phantomjs for tests 2017-07-05 14:39:02 +01:00
Luke Barnard 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
Luke Barnard 22ddbc63c3 Make lib dir prior to building 
-p option will not error if lib already exists
 2017-06-28 11:54:05 +01:00
Luke Barnard 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
Luke Barnard 8ca3b382ed Use emojione/emoji.json because we don't want two sets of emoji meta 2017-06-28 11:19:16 +01:00
Luke Barnard 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
David Baker c0e48c72fc Remove dep on liblevenstein 
While we don't actually use it
 2017-06-23 18:03:32 +01:00
Luke Barnard 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
David Baker f7aad3c422 v0.9.7 2017-06-22 11:57:27 +01:00
David Baker 6881fdf102 js-sdk 0.7.13 2017-06-22 11:52:13 +01:00
David Baker 529e014739 v0.9.6 2017-06-20 13:08:06 +01:00
David Baker 66c3a6d9ca v0.9.5 2017-06-19 13:09:41 +01:00
David Baker faeb40bc0f Released js-sdk v0.7.12 2017-06-19 12:00:53 +01:00
David Baker 12ad9a2c58 v0.9.5-rc.2 2017-06-16 13:28:49 +01:00
David Baker 82436758b2 v0.9.5-rc.1 2017-06-15 17:17:17 +01:00
David Baker 198d85a673 js-sdk 0.7.12-rc.1 2017-06-15 17:15:26 +01:00
David Baker a5aa497287 v0.9.4 2017-06-14 11:17:00 +01:00
David Baker aef0a8025c v0.9.3 2017-06-12 15:50:37 +01:00
David Baker 29355a610f js-sdk 0.7.11 2017-06-12 15:19:52 +01:00
David Baker 336b10daf1 v0.9.3-rc.2 2017-06-09 22:13:54 +01:00
David Baker c61942ed5d We now require flux 2.1 because we use utils 2017-06-09 21:42:34 +01:00
David Baker 27592728f5 v0.9.3-rc.1 2017-06-09 20:28:09 +01:00
David Baker 0879d796eb released js-sdk 2017-06-09 20:26:41 +01:00
Luke Barnard 53ea41e8a5 Merge branch 'develop' into new-guest-access 2017-06-07 12:08:37 +01:00
David Baker 31f1e421f2 v0.9.2 2017-06-06 17:40:30 +01:00
Luke Barnard 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