Commit Graph

186 Commits (b7fce70ce50acc0cb4d1afd9768570e43082639f)

Author SHA1 Message Date
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