Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,299 Commits 3 Branches 492 Tags 100 MiB
488eadc63e
Commit Graph

6299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Hodgson
488eadc63e Merge branch 'develop' into matthew/dharma 2018-08-03 17:15:14 -07:00
Bruno Windels
dcaea6d78f
Merge pull request #7139 from vector-im/dopr.sh 
CSS for user limit error
 2018-08-03 17:39:01 +02:00
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
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
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
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
Matthew Hodgson
3bcd8529fa Merge branch 'develop' into matthew/dharma 2018-07-29 16:50:50 +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
David Baker
c08f31aa76 Merge branch 'master' into develop 2018-06-29 12:05:20 +01:00
David Baker
768e206c4a v0.15.6 2018-06-29 12:02:51 +01:00
David Baker
84fbee085d v0.15.6 2018-06-29 12:01:17 +01:00
David Baker
3126bf6561 Prepare changelog for v0.15.6 2018-06-29 12:00:28 +01:00
David Baker
e193b65bc7 Released js-sdk & react-sdk 2018-06-29 11:54:01 +01:00
David Baker
fb43e49954 v0.15.6-rc.2 2018-06-22 18:15:34 +01:00
David Baker
41575382ce Prepare changelog for v0.15.6-rc.2 2018-06-22 18:15:33 +01:00
David Baker
62653d39b3 v0.15.6-rc.2 2018-06-22 18:13:00 +01:00