gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,311 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

7311 Commits

Author SHA1 Message Date
David Baker 05a2cb1020 Merge branch 'master' into develop 2019-05-15 14:40:16 +01:00
David Baker 5aa88abacc v1.1.2 2019-05-15 14:36:52 +01:00
David Baker e749420196 Prepare changelog for v1.1.2 2019-05-15 14:36:51 +01:00
David Baker 8ac5957186 v1.1.2 2019-05-15 14:34:59 +01:00
David Baker d0def4a80f react-sdk 1.1.2 2019-05-15 14:34:13 +01:00
J. Ryan Stinnett 5a6be9a665 Add message editing to sample also 2019-05-15 11:12:12 +01:00
Bruno Windels 734221cc3f
Merge pull request #9728 from vector-im/bwindels/message-edit-editor 
add description of new labs feature for message editing
 2019-05-15 09:23:34 +00:00
Bruno Windels f5e7dd5164 add description of new labs feature for message editing 2019-05-15 10:02:50 +01:00
David Baker da9cde6d18 Merge branch 'master' into develop 2019-05-14 14:04:34 +01:00
David Baker 5aa8326dfc v1.1.1 2019-05-14 14:01:01 +01:00
David Baker e4ed0994ce Prepare changelog for v1.1.1 2019-05-14 14:01:01 +01:00
David Baker 875d1b209a v1.1.1 2019-05-14 13:53:31 +01:00
David Baker 8ed44e6b64 matrix-react-sdk v1.1.1 2019-05-14 13:52:05 +01:00
David Baker 814b5297ad Merge branch 'master' into develop 2019-05-07 16:05:58 +01:00
David Baker 2ab8db3c0c v1.1.0 2019-05-07 15:55:56 +01:00
David Baker 94979f7ff5 Prepare changelog for v1.1.0 2019-05-07 15:55:55 +01:00
David Baker 5c46bd37e8 v1.1.0 2019-05-07 15:54:38 +01:00
David Baker c81b9bab79 Released react-sdk and js-sdk 2019-05-07 15:52:50 +01:00
J. Ryan Stinnett 818bab9fa4
Merge pull request #9632 from vector-im/travis/dockerfile-release 
Add Dockerfile
 2019-05-07 10:07:08 +01:00
Matthew Hodgson ee0b7e9c82 use right android app id 2019-05-04 10:50:14 -06:00
Matthew Hodgson 03b2766ca8 use right android app id 2019-05-04 17:28:02 +01:00
Travis Ralston eee2468a01 Merge branch 'travis/dockerfile-continued' into travis/dockerfile-release 2019-05-03 11:45:20 -06:00
David Baker 9cd4ac1df4
Merge pull request #9628 from vector-im/dbkr/thanks_you_junit_but_its_not_2005_anymore 
Remove karma junit output
 2019-05-03 12:43:04 +01:00
David Baker c612633402 Merge remote-tracking branch 'origin/develop' into dbkr/thanks_you_junit_but_its_not_2005_anymore 2019-05-03 12:37:28 +01:00
David Baker 0c36849c0f
Merge pull request #9626 from vector-im/dbkr/yarn_upgrade_may19 
yarn upgrade
 2019-05-03 12:36:26 +01:00
David Baker 1a1f2254e5 Remove karma junit output 
See https://github.com/matrix-org/matrix-react-sdk/pull/2944
 2019-05-03 11:40:53 +01:00
David Baker 908a72e00e yarn upgrade 
ALL THE UPDATES!

(so many updates)
 2019-05-03 11:13:04 +01:00
David Baker 2fe6b5074d
Merge pull request #9617 from vector-im/dbkr/arghbuildkite 
Respond quickly to buildkite pokes
 2019-05-02 18:13:38 +01:00
David Baker a7756fc876 Respond quickly to buildkite pokes 
Otherwise it thinks they have failed, as per comment.
 2019-05-02 18:05:11 +01:00
J. Ryan Stinnett 8cb7eeecd2
Merge pull request #9616 from vector-im/jryans/delay-favicon 
Delay creating the `Favico` instance
 2019-05-02 13:51:46 +01:00
J. Ryan Stinnett d4de7f5df3 Delay creating the `Favico` instance 
This avoids a canvas permission prompt from appearing on page load for users in
Firefox's resist fingerprinting mode. The prompt will still happen once you log
in and receive a notification, but at least this prevents it from happening
during the initial app experience.

Fixes https://github.com/vector-im/riot-web/issues/9605
 2019-05-02 13:29:25 +01:00
J. Ryan Stinnett 989b75502c
Merge pull request #9598 from jryans/primary-reactions 
Add reactions feature to config sample
 2019-05-01 20:26:12 +01:00
J. Ryan Stinnett bb675fde0c Tweak redundant title 2019-05-01 19:16:21 +01:00
J. Ryan Stinnett 6df5c35b4e Move to labs doc 2019-05-01 19:16:21 +01:00
Travis Ralston 9957149115
Merge pull request #9426 from vector-im/travis/dockerfile-continued 
Add Dockerfile (part 2)
 2019-05-01 10:42:21 -06:00
David Baker f98870db1f
Merge pull request #9601 from vector-im/dbkr/add_scalar_staging_vector_im 
Add new scalar staging url
 2019-05-01 11:51:08 +01:00
David Baker 7c5e39e170 Add new scalar staging url 2019-05-01 11:45:11 +01:00
J. Ryan Stinnett ebe2ab504b Add reactions feature description 2019-05-01 10:30:57 +01:00
David Baker e4f997113d v1.1.0-rc.1 2019-04-30 12:49:40 +01:00
David Baker cb155769d5 Prepare changelog for v1.1.0-rc.1 2019-04-30 12:49:39 +01:00
David Baker 49efece6c6 v1.1.0-rc.1 2019-04-30 12:48:52 +01:00
David Baker 846797be76 add new babel plugins to deps 2019-04-30 12:48:18 +01:00
David Baker d6d4d95b20 Fix .babelrc to be the same as react-sdk 
it was missing some plugins which firstly means we're using inconsistent
js between projects, but also causes builds to fail due to our unique
build system.
 2019-04-30 12:42:04 +01:00
David Baker cc8eaea5a7 js-sdk & react-sdk rc.1, electron 4.1.5 2019-04-30 12:10:06 +01:00
David Baker 269a995a01 We are now releases@riot.im 2019-04-30 11:49:49 +01:00
David Baker 77dff119db Fix variable scope in redeployer 2019-04-26 16:26:48 +01:00
David Baker 0718d438b8 Fix more typos in redeployer 2019-04-26 16:19:49 +01:00
David Baker 3a2541d3bf more logging for auto-deployer 2019-04-26 16:16:14 +01:00
David Baker 00d33599f0
Merge pull request #9577 from vector-im/dbkr/convert_redeploy_server_to_buildkite 
Convert redeploy.py to buildkite
 2019-04-26 16:04:04 +01:00
David Baker f49732b036 Link to buildkite webhook docs 2019-04-26 15:41:20 +01:00