OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,096 Commits
211 Branches
549 Tags
664 MiB
Commit Graph

364 Commits (f2e12c9edf165cdd88d9231d13cef53adbe13c62)

Author SHA1 Message Date
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
Matthew Hodgson 0d5ad06ac1 v0.9.1 2017-06-02 22:39:32 +01:00
David Baker 9e0aca534c v0.9.0 2017-06-02 14:23:30 +01:00
Matthew Hodgson 8add074dbf v0.9.0-rc.2 2017-06-02 01:14:13 +01:00
Matthew Hodgson 7e097d8d74 Merge branch 'release-v0.9.0-rc.1' into develop 2017-06-02 01:07:08 +01:00
Matthew Hodgson 73f97b4661 bump js-sdk for webrtc 2017-06-02 01:05:09 +01:00
Matthew Hodgson bceef2db91 v0.9.0-rc.1 2017-06-01 02:15:49 +01:00
Matthew Hodgson b1475cb309 bump js-sdk 2017-06-01 02:04:46 +01:00
Matthew Hodgson 5c885922d9 Merge branch 'develop' into new-guest-access 2017-05-28 22:58:18 +01:00
Matthew Hodgson 32207bd058 use develop js-sdk 2017-05-26 19:51:47 +01:00
David Baker 99efbbee5e Depend on prop-types module 
So we can start writing code compatible with new React
 2017-05-25 12:04:53 +01:00
David Baker 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
David Baker d419c42a4f Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801 2017-05-23 15:16:31 +01:00
David Baker eadd6192e8 v0.8.9 2017-05-22 11:36:56 +01:00
David Baker 3a0ee385b8 Released js-sdk 2017-05-22 11:35:02 +01:00
David Baker 1addd6e304 v0.8.9-rc.1 2017-05-19 10:39:14 +01:00
David Baker f615bc129f Released js-sdk 2017-05-19 10:37:33 +01:00
David Baker ebfafb3639 Revert "Merge pull request #807 from matrix-org/matthew/quick-search" 
This reverts commit 0ad1d8caf3, reversing
changes made to 1189368aab.
 2017-05-16 16:11:01 +01:00
David Baker 387529d130 Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2" 
This reverts commit 3366d3bbae, reversing
changes made to ceb71a4ef6.
 2017-05-16 14:49:55 +01:00
Michael Telatynski fdf48def00 make reskindex windows friendly 
makes #871 windows friendly
 2017-05-09 17:13:27 +01:00
Luke Barnard 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
Luke Barnard 574c836941 Move chokidar to devDeps 2017-05-08 16:24:13 +01:00
Luke Barnard 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
Luke Barnard 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
David Baker 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
Matthew Hodgson f056360f70 merge master post release 2017-05-07 20:01:11 +01:00
David Baker 396b38512c Remove babelcheck 
Nobody is likley to be upgrading from babel 5 any more, so this
can go away now.
 2017-05-04 16:50:47 +01:00
David Baker 909cdb6e9a Depend on prop-types module 
So we can start writing code compatible with new React
 2017-05-04 16:22:06 +01:00
Michael Telatynski c8fb18dc93 Pin filesize ver to fix break upstream 
https://travis-ci.org/vector-im/riot-web/builds/227340622
https://github.com/avoidwork/filesize.js/issues/87
3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us
 2017-04-30 13:00:47 +01:00
David Baker d81adb234a v0.8.8 2017-04-25 10:53:59 +01:00
David Baker 74dabb2087 Released js-sdk 2017-04-25 10:52:44 +01:00
David Baker e569144d6f v0.8.8-rc.2 2017-04-24 18:24:29 +01:00
David Baker a55eb00dad v0.8.8-rc.1 2017-04-21 18:22:39 +01:00
David Baker 665f507537 Update js-sdk dependency 2017-04-21 18:18:35 +01:00
Matthew Hodgson 8da07740d1 bump react-gemini-scrollbar 2017-04-19 23:34:29 +01:00
Luke Barnard ec2a5cce74 Merge branch 'develop' into matthew/whitelist-uri-schemes 2017-04-13 14:08:19 +01:00
David Baker 1d836c7d02 Back to js-sdk develop 2017-04-12 10:04:25 +01:00
David Baker 1ff4439566 v0.8.7 2017-04-12 10:02:21 +01:00
David Baker 73888ea616 js-sdk 0.7.6 2017-04-12 10:00:35 +01:00
David Baker 25665a81ae v0.8.7-rc.4 2017-04-11 18:47:45 +01:00
David Baker 46b362b20c v0.8.7-rc.3 2017-04-10 16:52:30 +01:00
David Baker a77fdd0383 js-sdk rc.2 2017-04-10 16:47:45 +01:00
David Baker 966dc3a071 v0.8.7-rc.2 2017-04-10 16:46:14 +01:00
David Baker 440307bd39 v0.8.7-rc.1 2017-04-07 17:04:03 +01:00
David Baker 2285239428 js-sdk prerelease 2017-04-07 17:02:47 +01:00
Aviral Dasgupta 78641a80dd
autocomplete: replace Fuse.js with liblevenshtein 2017-03-07 04:09:25 +05:30
Aviral Dasgupta f4c0baaa2f
refactor MessageComposerInput: bind -> class props 2017-03-07 04:09:25 +05:30
Matthew Hodgson 2db53c2284 whitelist data & mxc URIs on img tags: readds PR #333 now that punkave/sanitize-html#137 has landed 2017-02-19 03:04:42 +02:00
Aviral Dasgupta 0e66b370d4
fix eslint's no-invalid-this rule for class properties 2017-02-16 16:49:00 +05:30
Richard van der Hoff 6d8dcd97af Merge branch 'master' into develop 
(Keep js-sdk on develop)
 2017-02-04 10:42:31 +00:00
Richard van der Hoff a9cd1bfd4b v0.8.6 2017-02-04 10:30:16 +00:00
Richard van der Hoff 39488f294b bump to js-sdk 0.7.5 2017-02-04 10:23:56 +00:00
Richard van der Hoff 19b0f956d2 v0.8.6-rc.3 2017-02-03 15:32:37 +00:00
Richard van der Hoff c52ae8ff01 Bump to js-sdk 0.7.5-rc.3 2017-02-03 15:28:03 +00:00
Richard van der Hoff fd0a66ab99 Unpin js-sdk 2017-02-03 14:37:58 +00:00
David Baker 41936a957f v0.8.6-rc.2 2017-02-03 13:07:11 +00:00
David Baker 66e22d1d26 Bump js-sdk 2017-02-03 13:04:42 +00:00
David Baker bded0a7e8e v0.8.6-rc.1 2017-02-03 12:13:42 +00:00
David Baker 25876837f5 released js-sdk 2017-02-03 12:11:24 +00:00
Richard van der Hoff e23deac1bb Implement e2e export 2017-01-24 21:50:24 +00:00
David Baker 1e77b2eba3 Bundle eslint config 2017-01-23 16:19:29 +00:00
David Baker 4ba224aac3 Use eslint config from the js sdk 
Extend the js sdk's eslint config to give as consistent a code
style as possible. Add react/jsx/flow stuff that we use here.
 2017-01-20 14:08:14 +00:00
Richard van der Hoff bb7d589287 Merge pull request #617 from matrix-org/rav/megolm_backup 
Megolm session import and export
 2017-01-19 16:14:18 +00:00
Richard van der Hoff 31df78f946 Use text-encoding-utf-8 as a TextEncoder polyfill 
Somebody else seems to have done a good job of polyfilling TextEncoder, so
let's use that.
 2017-01-18 11:39:44 +00:00
Kegsay fcb1d7a664 Merge pull request #575 from kyrias/commonmark 
Replace marked with commonmark
 2017-01-17 11:57:08 +00:00
David Baker 1d5112db5d Back to develop js-sdk 2017-01-16 13:22:57 +00:00
David Baker a9256b0ab1 v0.8.5 2017-01-16 13:21:34 +00:00
David Baker 3679e47002 js-sdk 0.7.4 2017-01-16 13:19:24 +00:00
David Baker 3ac9ed7f8f v0.8.5-rc.1 2017-01-13 11:14:26 +00:00
David Baker 57652c06e3 released js-sdk 2017-01-13 11:13:17 +00:00
Matthew Hodgson 97514cf80e Merge branch 'master' into develop 2016-12-24 19:03:42 +00:00
Matthew Hodgson 45bfb93f17 v0.8.4 2016-12-24 19:03:08 +00:00
Matthew Hodgson 223caae842 Merge branch 'master' into develop 2016-12-24 18:54:00 +00:00
Matthew Hodgson 1976bb70bd v0.8.3-electron 2016-12-24 18:53:24 +00:00