mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-01 11:03:18 +03:00
Code Issues Projects Releases Packages Wiki Activity
8009 commits 217 branches 561 tags 443 MiB
Commit graph

386 commits

Author SHA1 Message Date
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
David Baker
9cbe401866 Back to js-sdk develop 2016-12-22 14:13:48 +00:00
David Baker
9bf98161a2 v0.8.3 2016-12-22 14:09:42 +00:00
David Baker
57412b3315 released matrix-js-sdk 2016-12-22 14:06:42 +00:00
David Baker
70c7facb6f matrix-js-sdk dev 2016-12-16 17:30:43 +00:00
David Baker
29a05dda20 v0.8.2 2016-12-16 17:26:13 +00:00
David Baker
03d9d28205 matrix-js-sdk 0.7.2 2016-12-16 17:24:17 +00:00
David Baker
1fbc938f87 js-sdk develop 2016-12-09 19:57:44 +00:00
David Baker
57c56992f1 v0.8.1 2016-12-09 19:53:27 +00:00
David Baker
fc39b35369 One more, one more try 2016-12-09 19:52:40 +00:00
David Baker
8ea299bcea v0.8.1 2016-12-09 19:51:27 +00:00
David Baker
15f556406f One more try... 2016-12-09 19:50:02 +00:00
David Baker
fb95b71f7b v0.8.1 2016-12-09 19:48:27 +00:00
David Baker
3ddeece619 Back to rc temporarily 2016-12-09 19:47:28 +00:00
David Baker
56d51687f9 v0.8.1 2016-12-09 19:34:21 +00:00
David Baker
d0850d67cd js-sdk 0.7.1 2016-12-09 19:32:27 +00:00
David Baker
a297015d27 v0.8.1-rc.2 2016-12-06 16:04:05 +00:00
David Baker
66f72e674b v0.8.1-rc.1 2016-12-05 17:51:04 +00:00
David Baker
6693817cdb released js-sdk 2016-12-05 17:47:54 +00:00
Mark Haines
3aa1e0dd9e Update browser-encrypt-attachment to v0.3.0 (#570) 2016-12-01 13:12:22 +00:00
Johannes Löthberg
4d2926485b Replace marked with commonmark 
Marked has some annoying bugs, and the author is inactive, so replace it
with commonmark.js, which is the reference JavaScript implementation of
CommonMark.  CommonMark is also preferable since it has a specification,
and a conformance test suite to make sure that parsers are correct.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2016-11-29 23:14:04 +01:00
Richard van der Hoff
6842544cd7 Unpin js-sdk 2016-11-22 22:12:50 +00:00
Mark Haines
b67fcf8109 Bump browser-encrypt-attachment to v0.2.0 2016-11-22 18:18:16 +00:00
Matthew Hodgson
09105608ab v0.8.0 2016-11-19 02:01:43 +02:00
Richard van der Hoff
d3c9792126 Remove pin on react 15.3 and bump draft-js-export-html instead 
draft-js-export-html have fixed the incompatibility with react 15.4, so we can
now update.
 2016-11-17 10:15:10 +00:00
Kegan Dougal
3ef0a08493 Pin to 15.3.2 because 15.4.0 is broken and fails with missing CSSProperty file 2016-11-16 17:58:43 +00:00
Mark Haines
13f28e53e1 Generate thumbnails when sending m.image and m.video messages. (#555) 
* Send a thumbnail when sending a m.image

* Use the 'thumbnail_file' when displaying encrypted images

* Whitespace

* Generate thumbnails for m.video

* Fix docstring, remove unused vars, use const

* Don't change the upload promise behaviour

* Polyfill for Canvas.toBlob to support older browsers

* Lowercase for integer types in jsdoc
 2016-11-15 11:22:39 +00:00
David Baker
062cb7a52e Add isomorphic fetch 
because the attachment crypto uses it
 2016-11-11 17:22:44 +00:00
Mark Haines
0bfcb38879 Add dependency on browser-encrypted-attachment 2016-11-11 14:42:33 +00:00
Mark Haines
23e764604c Merge remote-tracking branch 'origin/master' into develop 2016-11-11 12:00:53 +00:00
Mark Haines
61921327c2 Merge remote-tracking branch 'origin/master' into develop 2016-11-11 12:00:30 +00:00
David Baker
1e163eabf0 Revert "Encrypt attachments in encrypted rooms," 2016-11-11 11:59:08 +00:00
David Baker
3e9414b21e Merge pull request #533 from matrix-org/markjh/encrypted-attachments 
Encrypt attachments in encrypted rooms,
 2016-11-09 09:45:01 +00:00
David Baker
c973dbf1c4 0.7.5 has been released 2016-11-04 13:02:12 +00:00
David Baker
1368d90e66 v0.7.5 2016-11-04 10:09:11 +00:00
David Baker
fa967da2a9 matrix-js-sdk 0.6.4 2016-11-04 10:07:50 +00:00
David Baker
46301727c3 Actually add isomorphic-fetch 2016-11-03 15:53:52 +00:00
Mark Haines
e0cea74c7e Encrypt attachments in encrypted rooms, decrypt image attachments when displaying them 2016-11-02 16:26:10 +00:00
David Baker
f433f9ca32 Move platform-specific functionality into Platform 
Platform classes are provided by the application via
PlatformPeg.set().
 2016-11-02 15:10:21 +00:00
David Baker
f2e59f1bd3 matrix-js-sdk dep back to develop 2016-11-02 11:10:20 +00:00
David Baker
a8a6a9d73d v0.7.5-rc.1 2016-11-02 11:08:02 +00:00
David Baker
2cb9e606be Use released js-sdk 2016-11-02 11:03:52 +00:00
David Baker
3e8fcac303 Explicitly list file sin package.json 
To avoid publishing whatever happens to be in the working copy.

Equivalent of https://github.com/vector-im/vector-web/pull/2516
for react-sdk.
 2016-11-01 15:15:31 +00:00
David Baker
2faf5702c9 Add plugin that makes babel 6 not break everything 
Also transform-runtime here because we seem to need it here too
 2016-10-17 16:24:19 +01:00
David Baker
f9ef6ba871 Replace stage & es2017 with the specific plugins 2016-10-17 16:24:19 +01:00
David Baker
0931f746d8 Move scripts into scripts/ 2016-10-17 16:23:27 +01:00
David Baker
c0973940de Remove accidentally comitted babel updgrade hack 
Was trying to force it to upgrade babel to the stub babel 6
package rather than leaving the babel 5 ones, but it's too hacky.

Also remove the outdated comment.
 2016-10-17 16:23:26 +01:00
David Baker
eb9f884b53 Stage 0 is a little much 2016-10-17 16:23:26 +01:00
David Baker
9434feb009 Add a script to check the version of babel cli 
Because the package has changed so npm can't just auto-upgrade,
so this at least tells people how to fix it when the upgrade
breaks it for everybody.
 2016-10-17 16:23:26 +01:00
Aviral Dasgupta
022eb575d9 Upgrade to babel6 and enable some presets. 2016-10-17 16:23:25 +01:00
David Baker
5b4b81f7dc Revert "Switch to babel 6" 2016-10-14 18:49:52 +01:00
David Baker
8a0f6a0c6e Revert 09d2b2a36c 
as babel 6 appears to break sending messages with the non RTE
editor
 2016-10-14 18:48:41 +01:00
David Baker
09d2b2a36c Try adding transform-runtime in react-sdk 
as it seems the runtime is undefined on the /develop, even though
it works just fine for me locally.
 2016-10-14 18:32:52 +01:00
David Baker
4f261a0e96 Replace stage & es2017 with the specific plugins 2016-10-14 18:02:26 +01:00
David Baker
89ca18b556 Move scripts into scripts/ 2016-10-13 09:45:07 +01:00
David Baker
445230526f Remove accidentally comitted babel updgrade hack 
Was trying to force it to upgrade babel to the stub babel 6
package rather than leaving the babel 5 ones, but it's too hacky.

Also remove the outdated comment.
 2016-10-13 09:39:12 +01:00
David Baker
5801bf60aa Stage 0 is a little much 2016-10-12 17:26:43 +01:00
David Baker
4bea0c0818 Add a script to check the version of babel cli 
Because the package has changed so npm can't just auto-upgrade,
so this at least tells people how to fix it when the upgrade
breaks it for everybody.
 2016-10-12 16:53:07 +01:00
David Baker
eadb55c6b0 Merge branch 'babelrc' of https://github.com/aviraldg/matrix-react-sdk into aviraldg-babelrc 2016-10-12 14:03:21 +01:00
David Baker
b186c8db6b js-sdk develop 2016-10-12 11:48:15 +01:00
David Baker
ff806c3bc3 0.7.4 2016-10-12 11:47:22 +01:00
David Baker
a62f565bb9 js-sdk 0.6.3 2016-10-12 11:45:59 +01:00
David Baker
79011886a8 Set js-sdk dep back to develop 2016-10-05 16:53:26 +01:00
David Baker
b5cd540e27 0.7.3 2016-10-05 16:51:15 +01:00
David Baker
17a57b13a9 Bump js-sdk to released 2016-10-05 16:49:54 +01:00
David Baker
7785797be0 Update to linkify 2.1.3 
To pull in https://github.com/SoapBox/linkifyjs/pull/166
 2016-10-04 11:29:13 +01:00
Aviral Dasgupta
2d173d83b9 Upgrade to babel6 and enable some presets. 2016-10-02 17:27:45 +05:30
David Baker
898d792336 Update to linkifyjs 2.1.1 2016-09-23 14:05:31 +01:00
David Baker
77c4cd337e Merge branch 'develop' into dbkr/irc_links 2016-09-22 09:50:18 +01:00
David Baker
fedc0f2ec6 Back to develop 2016-09-21 17:32:54 +01:00
David Baker
be232bc1da 0.7.2 2016-09-21 17:28:08 +01:00
David Baker
58de14a4c6 Pin to released js-sdk 2016-09-21 17:26:15 +01:00
David Baker
59117f1905 Fix linkifying rooms with underscores, try 2 
Fixes https://github.com/vector-im/vector-web/issues/500
 2016-09-21 14:11:43 +01:00
David Baker
765ae3a715 Move back to js-sdk develop 2016-09-21 12:00:37 +01:00
David Baker
041b10539a 0.7.1 2016-09-21 11:57:51 +01:00
David Baker
681b45230e Pin to js-sdk 0.6.0 2016-09-21 11:50:17 +01:00
David Baker
c34108eab5 0.7.0 2016-09-21 11:43:15 +01:00
Matthew Hodgson
eadcc5e2b9 repin linkify 2016-09-13 19:02:44 +01:00
Matthew Hodgson
91b90aa1fd Merge pull request #460 from aviraldg/fix-linkify 
Fix linkification and bump linkifyjs dep
 2016-09-13 19:01:56 +01:00