PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
6463 commits 1 branch 0 tags 338 MiB
Commit graph

6463 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
65e690bad7 CSS for user limit error 
See https://github.com/matrix-org/matrix-react-sdk/pull/2108
 2018-08-03 15:02:25 +01:00
Weblate
9ea31042db Merge remote-tracking branch 'origin/develop' into develop 2018-08-02 15:52:35 +00:00
Bruno Windels
675d617dbc
Merge pull request #7132 from vector-im/dbkr/unpin_sanitize_html 
Unpin sanitize-html
 2018-08-02 17:52:29 +02:00
David Baker
a79e9b4fd6 Unpin sanitize-html 
1.18.4 is now out which makes it work with webpack again
 2018-08-02 16:22:07 +01:00
Weblate
f39e3f385c Merge remote-tracking branch 'origin/develop' into develop 2018-08-02 10:57:47 +00:00
kR
ad9f786646 Translated using Weblate (Polish) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
 2018-08-02 10:57:46 +00:00
Bruno Windels
8f6226d410
Merge pull request #7129 from vector-im/dbkr/pin_sanitize_html 
Pin sanitize-html to 0.18.2
 2018-08-02 12:57:41 +02:00
David Baker
8a18488b1e Pin sanitize-html to 0.18.2 
Because 0.18.3 is broken (https://github.com/punkave/sanitize-html/issues/241
 / https://github.com/punkave/sanitize-html/issues/242
 2018-08-02 11:00:35 +01:00
David Baker
53b179b22b
Merge pull request #7128 from vector-im/revert-7115-dbkr/remove_package_lock 
Revert "Remove package-lock.json for now"
 2018-08-02 10:02:57 +01:00
David Baker
dcde74bc09
Revert "Remove package-lock.json for now" 2018-08-02 10:02:09 +01:00
Bruno Windels
86a6f1e932
Merge pull request #7115 from vector-im/dbkr/remove_package_lock 
Remove package-lock.json for now
 2018-08-01 16:27:08 +02:00
David Baker
10ed13acc0 Add package-lock to .gitignore 2018-08-01 15:08:12 +01:00
David Baker
ccf52d3bff Remove package-lock.json for now 
As per https://github.com/vector-im/riot-web/issues/7083

The package-lock file is currently not bringing any of the benefits
it's supposed to bring because we don't do the neccessary things to
massage it during the release process. Remove it until we actually
manage it correctly.
 2018-07-31 11:07:24 +01:00
pebles
b05a8b6dd3 Translated using Weblate (Spanish) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2018-07-30 17:25:03 +00:00
Weblate
1b32e9a475 Merge remote-tracking branch 'origin/develop' into develop 2018-07-30 11:23:54 +00:00
Kyf Lee
d3f94a4847 Translated using Weblate (Korean) 
Currently translated at 94.5% (35 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
 2018-07-30 11:23:53 +00:00
David Baker
764797e211 v0.16.0 2018-07-30 12:19:27 +01:00
David Baker
31c4cf968b Prepare changelog for v0.16.0 2018-07-30 12:19:27 +01:00
David Baker
6e0aeeea83 v0.16.0 2018-07-30 12:14:55 +01:00
David Baker
88745a9f36 Released js-sdk & react-sdk 2018-07-30 12:13:29 +01:00
David Baker
8bd832b449 v0.16.0-rc.2 2018-07-24 19:42:11 +01:00
David Baker
5d2bf37ac9 Prepare changelog for v0.16.0-rc.2 2018-07-24 19:42:10 +01:00
David Baker
f248da3e08 v0.16.0-rc.2 2018-07-24 19:40:52 +01:00
David Baker
8e5b67d7c9 react-sdk rc.2 2018-07-24 19:40:31 +01:00
David Baker
f5a257ca79 v0.16.0-rc.1 2018-07-24 18:35:02 +01:00
David Baker
ed90c491e2 Prepare changelog for v0.16.0-rc.1 2018-07-24 18:35:01 +01:00
David Baker
ea00df0466 v0.16.0-rc.1 2018-07-24 18:33:53 +01:00
David Baker
96b624e941 js-sdk & react-sdk rc.1 2018-07-24 18:33:04 +01:00
David Baker
25c0656106 Update to electron 2.0.5 2018-07-24 18:28:48 +01:00
David Baker
b361241c29
Merge pull request #7082 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2018-07-24 18:16:45 +01:00
Weblate
d8c126f320 Merge remote-tracking branch 'origin/develop' into develop 2018-07-20 14:01:39 +00:00
Kyf Lee
6cd979d8d3 Translated using Weblate (Korean) 
Currently translated at 94.5% (35 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
 2018-07-20 14:01:38 +00:00
Hugues De Keyzer
c6c2a77c3a Translated using Weblate (French) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2018-07-20 14:01:38 +00:00
David Baker
0458aec320
Merge pull request #7055 from vector-im/dbkr/use_configured_integ_url 
Sample config for jitsi integration URL
 2018-07-20 15:01:34 +01:00
David Baker
b2ae1926a6 Sample cionfig for jitsi integration URL 2018-07-18 12:06:07 +01:00
David Baker
1ee4a7ec63 Merge branch 'master' into develop 2018-07-09 13:23:58 +01:00
David Baker
7e03b25030 v0.15.7 2018-07-09 13:20:29 +01:00
David Baker
c68623ddb0 Prepare changelog for v0.15.7 2018-07-09 13:20:28 +01:00
David Baker
847df2f75b v0.15.7 2018-07-09 13:19:14 +01:00
David Baker
73be5005c2 Released react-sdk & js-sdk 2018-07-09 13:16:42 +01:00
David Baker
c36b42af71 v0.15.7-rc.2 2018-07-06 16:01:42 +01:00
David Baker
db3ffd29da Prepare changelog for v0.15.7-rc.2 2018-07-06 16:01:42 +01:00
David Baker
d7ebd88804 v0.15.7-rc.2 2018-07-06 15:59:20 +01:00
David Baker
75e9489db5 js-sdk rc.1 & react-sdk rc.2 2018-07-06 15:58:39 +01:00
David Baker
a94f5dd692 Update package-lock.json 2018-07-04 11:34:55 +01:00
David Baker
0de36d331f v0.15.7-rc.1 2018-07-04 11:28:19 +01:00
David Baker
de713c564f Prepare changelog for v0.15.7-rc.1 2018-07-04 11:28:19 +01:00
David Baker
7e3cb3ba31 v0.15.7-rc.1 2018-07-04 11:27:21 +01:00
David Baker
6ada5e5b26 react-sdk rc.1 2018-07-04 11:26:33 +01:00
David Baker
aee6b28469 Bump electron version 2018-07-04 11:18:30 +01:00