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

7582 Commits

Author SHA1 Message Date
David Baker 12a56e37ba Don't copy the 32 bit linux deb 
As per comment
 2019-03-07 11:12:43 +00:00
David Baker 1b6da01734
Merge pull request #9068 from vector-im/dbkr/olm_isnt_optional 
Change olm dependency to normal dep
 2019-03-06 17:26:04 +00:00
David Baker 34d875ca57 remove empty section 2019-03-06 16:51:58 +00:00
David Baker 7b684aee0c Also makes this unnecessary 2019-03-06 16:48:58 +00:00
David Baker 4078443265 Change olm dependency to normal dep 
It would be nice if it were actually an optional dependency and you
could just not install olm and get a Riot without olm, but you can't:
what you get is a broken Riot, so having it as an optional dep isn't
helping anyone.

Also whatever other package-lock changes npm has decided are
necessary today.
 2019-03-06 16:44:36 +00:00
David Baker acb8afaeb7 Merge branch 'master' into develop 2019-03-06 16:07:05 +00:00
David Baker fbce9c0ecf Merge branch 'release-v1.0.3' 2019-03-06 16:06:45 +00:00
David Baker 2bb134e7f5 v1.0.3 2019-03-06 15:58:00 +00:00
David Baker 547ed4c672 Prepare changelog for v1.0.3 2019-03-06 15:57:59 +00:00
David Baker 8e9d73fb5b v1.0.3 2019-03-06 15:55:40 +00:00
David Baker 052adc10b5 react-sdk v1.0.3 2019-03-06 15:48:57 +00:00
David Baker b2d417d7ef Merge branch 'master' into develop 2019-03-06 11:38:17 +00:00
David Baker 8543c7b9ff Merge branch 'release-v1.0.2' 2019-03-06 11:36:41 +00:00
David Baker b6930415ce v1.0.2 2019-03-06 11:33:14 +00:00
David Baker ebf6deeed2 Prepare changelog for v1.0.2 2019-03-06 11:33:13 +00:00
David Baker ea86359c41 v1.0.2 2019-03-06 11:31:02 +00:00
David Baker 72014c59be Released matrix-sdk & js-sdk 2019-03-06 11:29:55 +00:00
David Baker 2b709c6973 v1.0.2-rc.3 2019-03-05 19:22:13 +00:00
David Baker 3ee0789ef7 Prepare changelog for v1.0.2-rc.3 2019-03-05 19:22:12 +00:00
David Baker b7d2159d60 v1.0.2-rc.3 2019-03-05 19:20:57 +00:00
David Baker 95c979de98 react-sdk & js-sdk rcs 2019-03-05 19:20:21 +00:00
David Baker 164de5faa5
Merge pull request #9051 from vector-im/dbkr/hosting_link_2 
Add modular.im hosting link to electron app config
 2019-03-05 18:28:03 +00:00
David Baker 5474a5e0c7 utm_campaign is now added automatically 2019-03-05 18:27:22 +00:00
David Baker 9235b5a861 Add modular.im hosting link to electron app config 2019-03-05 18:27:15 +00:00
David Baker 3a77b8ee64
Merge pull request #9047 from vector-im/dbkr/hosting_link 
Add modular.im hosting link to electron app config
 2019-03-05 18:21:55 +00:00
David Baker 116f1d7d92 utm_campaign is now added automatically 2019-03-05 16:45:46 +00:00
David Baker 3c123a064b Add modular.im hosting link to electron app config 2019-03-05 16:18:04 +00:00
Andrew Morgan fa72152a96 Merge branch 'develop' into anoa/jitsi_ptt 
* develop: (30 commits)
  [matrix] -> Matrix
  Nudge karma to 3.1.2
  set chrome path for travis CI explicitly
  Updated install spinner referenced in #8913
  Add support for localConfig at $appData/config.json. Move electron-config to $appData/electron-config.json
  Translated using Weblate (Hungarian)
  Update to electron 4.0.6
  Translated using Weblate (Spanish)
  Translated using Weblate (Norwegian Bokmål)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Hindi)
  Translated using Weblate (Greek)
  Translated using Weblate (German)
  Translated using Weblate (Finnish)
  Translated using Weblate (Arabic)
  Translated using Weblate (Portuguese (Brazil))
  Translated using Weblate (Czech)
  Translated using Weblate (Swedish)
  Translated using Weblate (Swedish)
  Allow disabling update mechanism
  ...
 2019-03-03 00:33:02 +00:00
David Baker d4f29805c3 v1.0.2-rc.2 2019-03-01 17:42:19 +00:00
David Baker 0d6d755788 Prepare changelog for v1.0.2-rc.2 2019-03-01 17:42:18 +00:00
David Baker 29ff95cccc v1.0.2-rc.2 2019-03-01 17:39:57 +00:00
David Baker 20c437277c react-sdk rc.3 2019-03-01 17:38:31 +00:00
David Baker ea959d5994 v1.0.2-rc.1 2019-03-01 12:22:19 +00:00
David Baker 813fdf4aad Prepare changelog for v1.0.2-rc.1 2019-03-01 12:22:18 +00:00
David Baker ab1ceff242 v1.0.2-rc.1 2019-03-01 12:20:32 +00:00
David Baker 2e3d0e50ec react-sdk rc.2 2019-03-01 12:19:28 +00:00
David Baker 4a5a73597c
Merge pull request #9014 from vector-im/dbkr/langs_file_resolve_alias 
Set a require alias for the webapp directory
 2019-03-01 12:13:28 +00:00
David Baker bf1ab7f420 Use $webapp rather than Webapp 2019-03-01 12:03:19 +00:00
David Baker 53e25ff247 Set a resuire alias for the webapp directory 
So languagehandler can pull the languages json from there
 2019-03-01 11:32:37 +00:00
J. Ryan Stinnett 48015aa36d
Merge pull request #8991 from vector-im/jryans/nudge-karma 
Nudge karma to 3.1.2
 2019-03-01 09:37:07 +00:00
Michael Telatynski 01becf00f5 Try and improve README 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-03-01 08:01:26 +00:00
Michael Telatynski baa034230f
Merge pull request #8983 from vector-im/t3chguy/local-config 
Add support for localConfig at $appData/config.json.
 2019-03-01 07:54:49 +00:00
David Baker 6206b1d073 js-sdk & react-sdk rc.1 2019-02-28 14:51:51 +00:00
David Baker 4f58deac1f
Merge pull request #8973 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2019-02-28 14:12:15 +00:00
Weblate 97a60834a1 Merge branch 'origin/develop' into Weblate. 2019-02-28 14:10:48 +00:00
Weblate 0e2938d7b3 [matrix] -> Matrix 2019-02-28 14:10:31 +00:00
Bruno Windels b0bbe48220
Merge pull request #8987 from vector-im/bwindels/cichromelocation 
set chrome path for travis CI explicitly
 2019-02-28 15:02:08 +01:00
J. Ryan Stinnett 8b25d4f710 Nudge karma to 3.1.2 
This includes a fix for detecting the version of Chrome used to run tests.
 2019-02-28 13:52:34 +00:00
Weblate 34eb6322c0 Merge branch 'origin/develop' into Weblate. 2019-02-28 13:40:41 +00:00
Bruno Windels 45d1ec8825 set chrome path for travis CI explicitly 
karma seems to be giving priority to a location where an old version is installed.
 2019-02-28 13:18:21 +01:00