gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,049 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

5049 Commits

Author SHA1 Message Date
Weblate 9f7823f2df Merge remote-tracking branch 'origin/develop' into develop 2017-09-29 16:23:06 +00:00
Luke Barnard f35289a664 Merge pull request #5140 from vector-im/luke/groups-room-icons 
Create basic icon for the GroupRoomList tab and adding rooms to groups
 2017-09-29 17:23:02 +01:00
Luke Barnard d3b8d8bf9d Create basic icon for the GroupRoomList tab and adding rooms to groups 2017-09-29 17:03:58 +01:00
Weblate 7194f30dc0 Merge remote-tracking branch 'origin/develop' into develop 2017-09-29 10:00:34 +00:00
Kevin Németh f6c28dce4a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2017-09-29 10:00:33 +00:00
Luke Barnard 5544270bc4 Merge pull request #5131 from vector-im/luke/groups-button 
Add button to get to MyGroups
 2017-09-29 11:00:29 +01:00
Luke Barnard 47919bc291 Honour the Groups feature flag 2017-09-29 10:39:49 +01:00
Szimszon 412affefb9 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2017-09-29 05:11:34 +00:00
Weblate e2b7ff3675 Merge remote-tracking branch 'origin/develop' into develop 2017-09-28 10:26:58 +00:00
Luke Barnard bb64e9a18b Merge pull request #5137 from vector-im/luke/fix-header-button-key-prop-warning 
Remove `key` prop pass-thru on HeaderButton
 2017-09-28 11:26:54 +01:00
Luke Barnard f9a92ad15a Lint 2017-09-28 10:02:16 +01:00
Luke Barnard ce13837216 Remove `key` prop pass-thru on HeaderButton 
This is redundant and throws a warning
 2017-09-28 09:46:10 +01:00
Carlos 26ce62250b Translated using Weblate (Portuguese) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt/
 2017-09-28 00:31:27 +00:00
Stefan Parviainen 25cf115533 Update docs with _td() and some other recommendations 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-27 22:01:56 +02:00
Luke Barnard 9c86a655ca Add button to get to MyGroups 2017-09-27 17:46:53 +01:00
Weblate 1d5f2bec65 Merge remote-tracking branch 'origin/develop' into develop 2017-09-27 13:15:32 +00:00
Luke Barnard 1740319b7a Add margin to flair avatars to separate them 2017-09-27 14:15:21 +01:00
Weblate fb344bc606 Merge remote-tracking branch 'origin/develop' into develop 2017-09-27 09:32:13 +00:00
Luke Barnard 2adf08dee0 CSS for GroupView: align "save"/"cancel" buttons in settings 2017-09-27 10:31:35 +01:00
Jeff Huang fcd4a1c7c6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
 2017-09-27 06:30:53 +00:00
Roger Pueyo Centelles 42840c1e3c Translated using Weblate (Catalan) 
Currently translated at 52.9% (118 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2017-09-27 00:09:20 +00:00
Andrey c99299ab6f Translated using Weblate (Russian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2017-09-26 17:22:52 +00:00
Weblate e446f50618 Merge remote-tracking branch 'origin/develop' into develop 2017-09-26 17:16:02 +00:00
David Baker f64f293cdb Merge pull request #5125 from vector-im/luke/groups-add-rooms 
Implement "Add room to group" feature
 2017-09-26 18:15:54 +01:00
Luke Barnard 888e3abc75 Implement "Add room to group" feature 
This step needs to be taken before adding a room to a group summary
 2017-09-26 14:35:38 +01:00
Iru Cai (vimacs) bc659032e6 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.0% (220 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
 2017-09-26 07:47:39 +00:00
Weblate cfc830b294 Merge remote-tracking branch 'origin/develop' into develop 2017-09-25 16:00:06 +00:00
David Baker 94855c0f48 Merge pull request #4967 from vector-im/rob/electron-screensharing 
Add Jitsi screensharing support in electron app
 2017-09-25 17:00:00 +01:00
Weblate 110993cc67 Merge remote-tracking branch 'origin/develop' into develop 2017-09-25 15:37:50 +00:00
David Baker 798558e5cc Merge pull request #5117 from vector-im/luke/refactor-right-panel-header-buttons 
Refactor right panel header buttons
 2017-09-25 16:37:44 +01:00
Robert Swain f79b8e0c71 ElectronPlatform: Import desktopCapturer explicitly 2017-09-25 17:19:04 +02:00
Robert Swain 44c0fb77da Merge branch 'develop' into rob/electron-screensharing 2017-09-25 17:16:21 +02:00
Luke Barnard bfdb92ff6b Nit: Re-order property 2017-09-25 16:13:54 +01:00
Luke Barnard 77f30aacf9 Re-add clickPhase for FilePanel header button 2017-09-25 16:13:13 +01:00
Luke Barnard fd7e81193e Less coupling between HeaderButton and RightPanel 
Use isHighlighted as a prop instead of computing based on phases and currentPhase
 2017-09-25 16:06:46 +01:00
Weblate 7149510c4e Merge remote-tracking branch 'origin/develop' into develop 2017-09-25 13:53:29 +00:00
Kévin C f5e7059c1b Translated using Weblate (French) 
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/fr/
 2017-09-25 13:53:28 +00:00
Jan Kudrik 377740901f Translated using Weblate (Czech) 
Currently translated at 98.6% (219 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-09-25 13:53:28 +00:00
Luke Barnard 75fef3f21a Merge pull request #5104 from vector-im/dbkr/publicity_toggle 
CSS for publicity status & toggle button
 2017-09-25 14:53:23 +01:00
Luke Barnard 28e9fdc873 rebase in progress; onto 7137ba71 2017-09-25 14:42:44 +01:00
Luke Barnard 7137ba7188 Refactor right panel header buttons 
To reduce repetition of code, simplify the process of adding header buttons and remove the need for many handler functions.
 2017-09-25 14:13:02 +01:00
Kévin C 6795ee84e1 Translated using Weblate (French) 
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/fr/
 2017-09-24 10:20:35 +00:00
Bruno Bigras 9413b1537c Translated using Weblate (French) 
Currently translated at 97.7% (217 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2017-09-24 09:20:07 +00:00
Stefan Parviainen b424eea573 Remove unnecessary strings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-23 17:02:26 +02:00
Stefan Parviainen 3cff8c1230 Mark some strings as translatable 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-23 13:46:51 +02:00
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