OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
6,845 Commits
219 Branches
563 Tags
450 MiB
Commit Graph

6845 Commits (7176185dc26859d7f1d33f4dfbb7eaf902cdcd94)

Author SHA1 Message Date
kaiyou e427df4133 Translated using Weblate (French) 
Currently translated at 98.6% (958 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-08-22 17:09:28 +00:00
Weblate 729d3f7608 Merge remote-tracking branch 'origin/develop' into develop 2017-08-22 16:47:01 +00:00
strix aluco eeadf63b6f Translated using Weblate (Ukrainian) 
Currently translated at 20.7% (200 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2017-08-22 16:46:58 +00:00
lazz0 9f762db59f Translated using Weblate (Spanish) 
Currently translated at 75.7% (729 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-08-22 16:46:58 +00:00
kaiyou 3c34c141c2 Translated using Weblate (French) 
Currently translated at 99.5% (959 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-08-22 16:46:58 +00:00
Jan Kudrik 630c405728 Translated using Weblate (Czech) 
Currently translated at 5.5% (53 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2017-08-22 16:46:57 +00:00
Richard Lewis 502a0480a0 Merge pull request #1327 from matrix-org/matthew/multiple-widgets 
Matthew/multiple widgets
 2017-08-22 10:53:51 +01:00
David Baker b50ce2daa0 Empty commit: retest please 2017-08-22 10:35:03 +01:00
David Baker e72bdffd62 Remove unused import 2017-08-22 10:22:51 +01:00
David Baker 5f816666e1 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-22 10:08:02 +01:00
Richard Lewis a69cc9169f lint fix. 2017-08-22 10:04:57 +01:00
Richard Lewis 74ab7c9bb3 Fix encoding 2017-08-22 09:59:27 +01:00
Szimszon 5648a7488a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (963 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-08-21 19:55:31 +00:00
David Baker ac64e9b705 Lint 2017-08-21 19:34:07 +01:00
David Baker b898d15580 Specify default number of members to load 2017-08-21 19:30:28 +01:00
David Baker e77ea352e4 Support full group membership cycle 
Apart from knocking, ie. Invite / accept / reject / leave
 2017-08-21 19:18:32 +01:00
David Baker a0fe3d1cb0 Merge pull request #1326 from matrix-org/rav/userpicker_proptypes 
Fix proptypes on UserPickerDialog
 2017-08-21 16:43:15 +01:00
Richard van der Hoff 764d5891ad Fix proptypes on UserPickerDialog 
... so that it doesn't log an error
 2017-08-21 16:30:49 +01:00
Richard Lewis b7569a9831 Revert auxPanel changes (this should already have been fixed in a separate PR). 2017-08-21 15:29:11 +01:00
Robert Swain bfb6f8f273 Merge pull request #1325 from matrix-org/rob/appdrawer-bind 
AppsDrawer: Remove unnecessary bind
 2017-08-21 15:59:47 +02:00
Robert Swain 385205471b AppsDrawer: Remove unnecessary bind 2017-08-21 15:34:13 +02:00
Richard Lewis c0f0425907 Merge pull request #1322 from matrix-org/rxl881/styling 
Position add app widget link
 2017-08-21 14:03:27 +01:00
Richard Lewis e8e3117099 Merge pull request #1323 from matrix-org/rxl881/beta 
Remove app tile beta tag.
 2017-08-21 14:03:15 +01:00
Richard Lewis 97485366bc Merge pull request #1324 from matrix-org/rxl881/strings 
Add missing translation.
 2017-08-21 12:16:08 +01:00
Richard Lewis 866f6f1dd3 Add missing translation. 2017-08-21 12:11:21 +01:00
Richard Lewis 6c8391e3ea Remove beta tag. 2017-08-21 11:39:06 +01:00
Richard Lewis e93a1fac3d Position add app widget link 2017-08-21 11:29:42 +01:00
Robert Swain fde6314e0f Merge pull request #1319 from matrix-org/rob/apps-not-e2ee 
Note that apps are not E2EE
 2017-08-21 11:45:47 +02:00
Richard Lewis 38720e6216 Add internationlisation. 2017-08-21 10:05:16 +01:00
Robert Swain 2eac869e27 Merge branch 'develop' into rob/apps-not-e2ee 2017-08-21 10:30:38 +02:00
Robert Swain 70824960ee AppPermission: Make strings translatable 2017-08-21 10:23:55 +02:00
Jean c6a48cbda6 Translated using Weblate (French) 
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-08-19 11:03:09 +00:00
kaiyou 345903514a Translated using Weblate (French) 
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-08-19 11:03:04 +00:00
Richard Lewis 388d8141ae Merge pull request #1321 from matrix-org/rxl881/warnings 
Only render appTile body (including warnings) if drawer shown.
 2017-08-18 18:43:21 +01:00
Matthew Hodgson d7f5295949 untested WIP for supporting multiple widgets properly 2017-08-18 18:40:00 +01:00
Richard Lewis 1862057695 Only render appTile body (including warnings) if drawer shown. 2017-08-18 18:33:56 +01:00
Richard Lewis e32c499298 Merge pull request #1320 from matrix-org/rxl881/timeline 
Timeline improvements
 2017-08-18 18:11:47 +01:00
Richard Lewis 7395f96b77 Rearrange timeline update wording for better internationalisation. Fix widget name values. 2017-08-18 18:02:50 +01:00
Luke Barnard b678c2cf0f Don't bind Pill function, React does this for us 2017-08-18 17:15:27 +01:00
Krombel 45e7f1c401 Translated using Weblate (German) 
Currently translated at 100.0% (963 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-08-18 15:56:09 +00:00
Robert Swain 2e00968bcd AppPermission: Note that apps are not E2E encrypted in E2E rooms 2017-08-18 17:44:33 +02:00
Bamstam 4a1106de2f Translated using Weblate (German) 
Currently translated at 94.9% (914 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-08-18 15:32:53 +00:00
Luke Barnard 273abd9327 Merge pull request #1318 from matrix-org/luke/fix-widget-event-name 
Add a space between widget name and "widget" in widget event tiles
 2017-08-18 16:09:20 +01:00
Richard Lewis 942656d947 Merge pull request #1286 from matrix-org/rxl881/appFixes 
Move manage integrations button from settings page to room header as a stand-alone component
 2017-08-18 16:09:08 +01:00
Richard Lewis 1c36e47403 Fix add widget link 2017-08-18 15:59:12 +01:00
Luke Barnard 7a277bff3a Add a space between widget name and "widget" in widget event tiles 2017-08-18 15:45:02 +01:00
Richard Lewis b7d46d91ed Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes 2017-08-18 15:35:01 +01:00
Luke Barnard bf07333915 Merge pull request #1316 from matrix-org/luke/fix-app-name-case 
Don't apply case logic to app names
 2017-08-18 15:08:40 +01:00
Luke Barnard 3c7eec711b Merge pull request #1315 from matrix-org/luke/fix-apps-auto-integs 
Stop integ manager opening on every room switch
 2017-08-18 15:07:35 +01:00
Luke Barnard 5e0a7212d9 Don't apply case logic to app names 
As they should have the Correct Case in integrations land now
 2017-08-18 14:57:28 +01:00