Commit Graph

62585 Commits

Author SHA1 Message Date
Luke Barnard
495465e865 Put invite accept/decline buttons in correct div to align them to the right 2017-10-17 11:59:16 +01:00
Luke Barnard
2effdfb840 CSS: GroupView headershould be at least 70px in height 2017-10-17 11:56:51 +01:00
Weblate
68c02cad33 Merge remote-tracking branch 'origin/develop' into develop 2017-10-17 10:33:45 +00:00
Bamstam
ba160ffbd0 Translated using Weblate (German)
Currently translated at 99.8% (924 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-17 10:33:44 +00:00
Luke Barnard
24c4c1edc7 Merge pull request #1489 from matrix-org/luke/groups-invited-users-hide-if-empty
Only show invited section if there are invited group members
2017-10-17 12:33:39 +02:00
Luke Barnard
85d99d429d Use correct logic operator 2017-10-17 09:49:39 +01:00
Szimszon
55b14d5d5d Translated using Weblate (Hungarian)
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2017-10-16 20:19:05 +00:00
Szimszon
5686d8204a Translated using Weblate (Hungarian)
Currently translated at 100.0% (925 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-10-16 20:16:58 +00:00
Krombel
09070a7747 Translated using Weblate (German)
Currently translated at 99.8% (924 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-16 19:05:05 +00:00
Stefan Parviainen
8083dccfa5 De-partify SenderProfile
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>

Also, text does not need to be EmojiText
2017-10-16 20:53:43 +02:00
Andrey
b7644a9595 Translated using Weblate (Russian)
Currently translated at 100.0% (925 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-16 17:28:06 +00:00
Luke Barnard
14eee9a37a Only show invited section if there are invited group members 2017-10-16 17:59:53 +01:00
Luke Barnard
0c34e943fb Merge branch 'develop' into luke/groups-are-communities 2017-10-16 17:34:06 +01:00
Luke Barnard
f24fd61ae0 Merge pull request #5303 from vector-im/luke/groups-invited-users
CSS for invited group members section
2017-10-16 18:32:56 +02:00
Weblate
8921eb903f Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 16:29:19 +00:00
Luke Barnard
760b3cc60a Merge pull request #1488 from matrix-org/luke/groups-invited-users
Show "Invited" section in the user list
2017-10-16 18:29:15 +02:00
Luke Barnard
85307ffd23 CSS for invited group members section 2017-10-16 17:21:40 +01:00
Luke Barnard
9b08f4d11f Separate fetching indicator state 2017-10-16 17:21:05 +01:00
David Baker
e85f205e8f Merge pull request #5302 from vector-im/luke/fix-overflow-entity-tile
Handle long names in EntityTiles by overflowing correctly
2017-10-16 16:42:44 +01:00
Weblate
88cc53f770 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 15:42:28 +00:00
David Baker
9d2f5b0a8a Merge pull request #1487 from matrix-org/luke/fix-overflow-entity-tile
Refactor class names for an entity tile being hovered over
2017-10-16 16:42:23 +01:00
Luke Barnard
008e8d4f54 Show "Invited" section in the user list 2017-10-16 16:38:32 +01:00
Luke Barnard
fdf07f6d89 Handle long names in EntityTiles by overflowing correctly 2017-10-16 16:32:09 +01:00
Luke Barnard
47ac0988ba Refactor class names for an entity tile being hovered over 2017-10-16 16:31:13 +01:00
Luke Barnard
027b751bbc Merge pull request #5296 from vector-im/dbkr/electron_disable_labs
Disable labs in electron
2017-10-16 16:36:06 +02:00
David Baker
8716f93a6d Disable labs in electron
as we now disable labs in release Riot
2017-10-16 15:22:17 +01:00
David Baker
2401f21336 Merge branch 'master' into develop 2017-10-16 15:00:55 +01:00
David Baker
bf56a00d60 v0.12.7 v0.12.7 2017-10-16 14:56:52 +01:00
David Baker
66de8756b7 Prepare changelog for v0.12.7 2017-10-16 14:56:52 +01:00
David Baker
2ca0d6621c v0.12.7 2017-10-16 14:55:33 +01:00
David Baker
bfae8e98a1 Released js-sdk & react-sdk 2017-10-16 14:52:00 +01:00
Weblate
598a9a6cf3 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 13:46:40 +00:00
Stefan Parviainen
9edcd0a9e5 Translated using Weblate (Finnish)
Currently translated at 78.8% (729 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2017-10-16 13:46:39 +00:00
David Baker
bbf3550865 Merge branch 'master' into develop 2017-10-16 14:46:11 +01:00
David Baker
f58d89ef80 v0.10.7 2017-10-16 14:45:14 +01:00
David Baker
bb623ca0a7 Prepare changelog for v0.10.7 2017-10-16 14:45:13 +01:00
David Baker
bcb792a412 Released js-sdk 2017-10-16 14:41:23 +01:00
Luke Barnard
eaa5dd5f22 Groups -> Communities in the UI
Translation files still need updating, and this would be much simpler with a script that could automate the tedium
2017-10-16 13:18:39 +01:00
Luke Barnard
102651332a Merge pull request #5295 from vector-im/luke/groups-room-directory-esque
CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475
2017-10-16 13:52:38 +02:00
Luke Barnard
12ebe91f83 "Add room..." -> "Add rooms..." 2017-10-16 11:53:35 +01:00
Luke Barnard
0807a2a26d rethemendex.sh 2017-10-16 11:47:34 +01:00
Luke Barnard
2cefa58d5d CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475 2017-10-16 11:44:38 +01:00
Weblate
09b381bc82 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 09:17:50 +00:00
André Breda
b8aa9e8bc1 Translated using Weblate (Portuguese)
Currently translated at 94.3% (872 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
2017-10-16 09:17:50 +00:00
Bamstam
62897457fa Translated using Weblate (German)
Currently translated at 99.8% (923 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-16 09:17:50 +00:00
David Baker
e4a3309752 Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque
Modify GroupView UI
2017-10-16 10:17:44 +01:00
Travis Ralston
18faa2d8ba CSS for new pinned events indicator
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-15 21:18:39 -06:00
Travis Ralston
4f6cd6b23a Add a small indicator for when a new event is pinned
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-15 21:17:43 -06:00
Travis Ralston
ef5fc7347a Don't update presence status if the user is clicks twice
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-15 20:20:43 -06:00
Krombel
b230bb02b3 Translated using Weblate (German)
Currently translated at 99.8% (923 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 21:08:30 +00:00