1312ba537a
Update scripts and docs to use `yarn` where appropriate
...
Most `npm` operations are replaced with `yarn`, which generally has better
behavior. However, steps like publish that write to the NPM registry are left to
`npm`, which currently handles these tasks best.
2019-03-12 11:06:57 +00:00
13aca0716a
Add yarn lock file for Electron app
...
We did not previously commit lock files for the Electron app, so there is no
correct copy to import from. For this directory, I created a fresh yarn lock
file using yarn install.
2019-03-11 15:33:00 +00:00
a5b8d6381f
Convert from npm to yarn lock file
...
The npm lock file was imported into yarn. A yarn install pass was then run to
double-check the lock file for sanity.
2019-03-11 14:35:03 +00:00
acacc61f1c
Merge pull request #9104 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate
2019-03-11 10:02:11 +00:00
837abe3bb8
Merge branch 'origin/develop' into Weblate.
2019-03-11 10:00:55 +00:00
eb40efefd1
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (19 of 19 strings)
Translation: Riot Web/riot-web
Translate-URL: http://translate.riot.im/projects/riot-web/riot-web/tr/
2019-03-11 10:00:49 +00:00
e7625d48f6
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (19 of 19 strings)
Translation: Riot Web/riot-web
Translate-URL: http://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2019-03-11 10:00:49 +00:00
b3aeb53763
Merge pull request #9075 from vector-im/dbkr/no_32_bit_linux
...
Don't copy the 32 bit linux deb
2019-03-07 11:54:55 +00:00
12a56e37ba
Don't copy the 32 bit linux deb
...
As per comment
2019-03-07 11:12:43 +00:00
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
34d875ca57
remove empty section
2019-03-06 16:51:58 +00:00
7b684aee0c
Also makes this unnecessary
2019-03-06 16:48:58 +00:00
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
acb8afaeb7
Merge branch 'master' into develop
2019-03-06 16:07:05 +00:00
fbce9c0ecf
Merge branch 'release-v1.0.3'
2019-03-06 16:06:45 +00:00
2bb134e7f5
v1.0.3
2019-03-06 15:58:00 +00:00
547ed4c672
Prepare changelog for v1.0.3
2019-03-06 15:57:59 +00:00
8e9d73fb5b
v1.0.3
2019-03-06 15:55:40 +00:00
052adc10b5
react-sdk v1.0.3
2019-03-06 15:48:57 +00:00
b2d417d7ef
Merge branch 'master' into develop
2019-03-06 11:38:17 +00:00
8543c7b9ff
Merge branch 'release-v1.0.2'
2019-03-06 11:36:41 +00:00
b6930415ce
v1.0.2
2019-03-06 11:33:14 +00:00
ebf6deeed2
Prepare changelog for v1.0.2
2019-03-06 11:33:13 +00:00
ea86359c41
v1.0.2
2019-03-06 11:31:02 +00:00
72014c59be
Released matrix-sdk & js-sdk
2019-03-06 11:29:55 +00:00
2b709c6973
v1.0.2-rc.3
2019-03-05 19:22:13 +00:00
3ee0789ef7
Prepare changelog for v1.0.2-rc.3
2019-03-05 19:22:12 +00:00
b7d2159d60
v1.0.2-rc.3
2019-03-05 19:20:57 +00:00
95c979de98
react-sdk & js-sdk rcs
2019-03-05 19:20:21 +00:00
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
5474a5e0c7
utm_campaign is now added automatically
2019-03-05 18:27:22 +00:00
9235b5a861
Add modular.im hosting link to electron app config
2019-03-05 18:27:15 +00:00
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
116f1d7d92
utm_campaign is now added automatically
2019-03-05 16:45:46 +00:00
3c123a064b
Add modular.im hosting link to electron app config
2019-03-05 16:18:04 +00:00
d4f29805c3
v1.0.2-rc.2
2019-03-01 17:42:19 +00:00
0d6d755788
Prepare changelog for v1.0.2-rc.2
2019-03-01 17:42:18 +00:00
29ff95cccc
v1.0.2-rc.2
2019-03-01 17:39:57 +00:00
20c437277c
react-sdk rc.3
2019-03-01 17:38:31 +00:00
ea959d5994
v1.0.2-rc.1
2019-03-01 12:22:19 +00:00
813fdf4aad
Prepare changelog for v1.0.2-rc.1
2019-03-01 12:22:18 +00:00
ab1ceff242
v1.0.2-rc.1
2019-03-01 12:20:32 +00:00
2e3d0e50ec
react-sdk rc.2
2019-03-01 12:19:28 +00:00
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
bf1ab7f420
Use $webapp rather than Webapp
2019-03-01 12:03:19 +00:00
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
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
01becf00f5
Try and improve README
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-03-01 08:01:26 +00:00
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
6206b1d073
js-sdk & react-sdk rc.1
2019-02-28 14:51:51 +00:00
J. Ryan Stinnett