Commit Graph

6607 Commits

Author SHA1 Message Date
David Baker 813615610f CSS for publicity status & toggle button 2017-09-22 19:27:36 +01:00
Weblate d2334fcd96 Merge remote-tracking branch 'origin/develop' into develop 2017-09-22 15:32:50 +00:00
Luke Barnard ae6b705d7b Merge pull request #5103 from vector-im/luke/groups-remove-featured-rooms-and-users
CSS for "X" in top right of features users/rooms
2017-09-22 16:32:46 +01:00
Luke Barnard 1b67e7d606 CSS for "X" in top right of features users/rooms 2017-09-22 15:58:36 +01:00
Walter 87470a690f Translated using Weblate (Ukrainian)
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
2017-09-22 13:31:51 +00:00
Weblate 8434a71cf8 Merge remote-tracking branch 'origin/develop' into develop 2017-09-22 09:19:56 +00:00
Walter 90f7cecec6 Translated using Weblate (Ukrainian)
Currently translated at 95.9% (213 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
2017-09-22 09:19:56 +00:00
Paul Tötterman 7d472a3bdb Translated using Weblate (Swedish)
Currently translated at 95.9% (213 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/
2017-09-22 09:19:56 +00:00
David Baker 39c7bf633d Merge pull request #5051 from vector-im/dbkr/add_finnish
Include Finnish translation
2017-09-22 10:19:50 +01:00
David Baker 133e17c1db Merge remote-tracking branch 'origin/develop' into dbkr/add_finnish 2017-09-22 09:50:56 +01:00
Paul Tötterman e1f008e0b3 Translated using Weblate (Finnish)
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/
2017-09-22 07:15:28 +00:00
Weblate b7b9330086 Merge remote-tracking branch 'origin/develop' into develop 2017-09-21 20:57:11 +00:00
David Baker ef503cca11 Merge branch 'master' into develop 2017-09-21 21:56:58 +01:00
David Baker 2b7ee756f8 v0.12.6 2017-09-21 21:53:09 +01:00
David Baker b25075974c Prepare changelog for v0.12.6 2017-09-21 21:53:09 +01:00
David Baker af3feccc2d v0.12.6 2017-09-21 21:50:48 +01:00
David Baker aaff9133c7 Newer js-sdk & react-sdk for js-sdk build fix 2017-09-21 21:49:43 +01:00
Weblate 6e7ee7ef34 Merge remote-tracking branch 'origin/develop' into develop 2017-09-21 17:12:15 +00:00
David Baker 50e6536195 Merge branch 'master' into develop 2017-09-21 18:11:46 +01:00
David Baker fbccf22e00 v0.12.5 2017-09-21 18:08:17 +01:00
David Baker e8c347a755 Prepare changelog for v0.12.5 2017-09-21 18:08:17 +01:00
Weblate 4f8660870a Merge remote-tracking branch 'origin/develop' into develop 2017-09-21 17:06:45 +00:00
David Baker dbd4cf8756 Clean on prepublish (#5097)
Otherwise you can make broken releases on case insensitive file
systems
2017-09-21 18:06:41 +01:00
David Baker f450ce422e v0.12.5 2017-09-21 18:06:03 +01:00
David Baker 874e88c4a8 react-sdk v0.10.5 2017-09-21 18:05:22 +01:00
Weblate 7e87964e82 Merge remote-tracking branch 'origin/develop' into develop 2017-09-21 16:49:59 +00:00
Luke Barnard 0eefae031f Merge pull request #5096 from vector-im/luke/groups-membership-section-redesign
Redesign membership section of GroupView
2017-09-21 17:49:55 +01:00
Weblate 406f36a2d1 Merge remote-tracking branch 'origin/develop' into develop 2017-09-21 16:31:14 +00:00
Luke Barnard 96b9570465 Update comment 2017-09-21 17:31:06 +01:00
Carlos 22580b5fd3 Translated using Weblate (Portuguese)
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt/
2017-09-21 16:12:50 +00:00
Luke Barnard 96bb804eb8 Redesign membership section of GroupView 2017-09-21 15:11:57 +01:00
Weblate e968de12dd Merge remote-tracking branch 'origin/develop' into develop 2017-09-21 09:26:37 +00:00
David Baker 1cca4c2133 Fix debug message to be clearer 2017-09-21 10:26:07 +01:00
Weblate fcb705d79b Merge remote-tracking branch 'origin/develop' into develop 2017-09-21 09:01:09 +00:00
David Baker 26ec25b2f7 Merge pull request #5090 from vector-im/dbkr/deploy_config_glob
Make --config accept globs
2017-09-21 10:01:05 +01:00
Weblate 88551afef3 Merge remote-tracking branch 'origin/develop' into develop 2017-09-21 08:55:19 +00:00
David Baker 9b9073f0ed Merge pull request #5093 from vector-im/luke/groups-add-featured-rooms-and-users
CSS for GroupView: Add a User
2017-09-21 09:55:14 +01:00
David Baker b4ea938be3 This is the default 2017-09-20 18:17:06 +01:00
David Baker 6ec26932af This is the default anyway 2017-09-20 17:54:52 +01:00
David Baker 21d233b5af oops, leftover debug 2017-09-20 17:48:47 +01:00
Krombel a8a9f5ec6b Translated using Weblate (German)
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-09-20 16:24:04 +00:00
David Baker b9b4ac3166 Rename symlink to 'include' & add to redeploy
Because redeploy.py already has a 'symlink' option that does
something else.
2017-09-20 17:22:47 +01:00
Luke Barnard 0d4b3b41f9 CSS for GroupView: Add a User
codep matrix-org/matrix-react-sdk#1402
2017-09-20 17:07:32 +01:00
David Baker 6ff91789b2 Rename 'config' option to 'symlink'
because that's really all it's doing and we can use it for other
things
2017-09-20 17:04:31 +01:00
Weblate 9b988f1a19 Merge remote-tracking branch 'origin/develop' into develop 2017-09-20 14:24:22 +00:00
David Baker 8d9f06cc47 Merge branch 'master' into develop 2017-09-20 15:24:11 +01:00
David Baker 2ea9fc3f9a v0.12.4 2017-09-20 15:19:10 +01:00
David Baker d96759b8ad Prepare changelog for v0.12.4 2017-09-20 15:19:10 +01:00
David Baker e814eb4555 v0.12.4 2017-09-20 15:18:17 +01:00
David Baker d957f0cdd7 released js-sdk & react-sdk 2017-09-20 15:16:42 +01:00