PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
6208 commits 1 branch 0 tags 338 MiB
Commit graph

6208 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Lewis
4b5cdac032 Don't show widget security warning to the person who added it to the room. 2017-08-18 11:41:27 +01:00
Luke Barnard
0adc043884 Merge branch 'luke/feature-app-tile-ux' of github.com:matrix-org/matrix-react-sdk into luke/feature-app-tile-ux 2017-08-18 11:01:02 +01:00
Luke Barnard
57505c3a61 Add behaviour to toggle app draw on app tile header click 2017-08-18 10:56:35 +01:00
Luke Barnard
9382689675 Merge branch 'develop' into luke/feature-widget-timeline-events 2017-08-18 10:47:25 +01:00
Luke Barnard
20a0ec35af Use short form to get event URL 2017-08-18 10:45:43 +01:00
Luke Barnard
f2172a1a86 Merge branch 'luke/feature-widget-timeline-events' of github.com:matrix-org/matrix-react-sdk into luke/feature-widget-timeline-events 2017-08-18 10:44:25 +01:00
Luke Barnard
acc54b97f1 Implement TextualEvent tiles for im.vector.modular.widgets 
E.g. "Bob added a Acme widget", "Susan removed a Giraffe widget"

The name is calculated by taking the `name` in the event content, falling back on the `type`, falling back on the previous content `type`. This is then capitalised.
 2017-08-18 10:35:33 +01:00
Matthew Hodgson
ee383e0570 Merge pull request #1311 from krombel/string_cleanup_translation_change 
remove unused strings introduced by string change
 2017-08-17 20:02:19 +01:00
Krombel
42d9e3bc8a remove unused strings introduced by string change in bb084595 2017-08-17 20:26:34 +02:00
Matthew Hodgson
bb0845954d improve wording for directory listings 2017-08-17 19:10:45 +01:00
Matthew Hodgson
7c04a6671d expand auxPanel when showing apps 2017-08-17 19:06:19 +01:00
Richard Lewis
95d1c3746e Kick travis 2017-08-17 18:22:52 +01:00
Richard Lewis
120a4f4f44 Check for valid roomId before renering manageIntegsButton. 2017-08-17 18:10:50 +01:00
Richard Lewis
0907fff080 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes 2017-08-17 17:47:46 +01:00
David Baker
91fe308f06 Merge pull request #1310 from matrix-org/t3chguy/hotfix1 
hotfix bad fn signature regression
 2017-08-17 17:31:55 +01:00
Michael Telatynski
766c188a1e
hotfix bad fn signature regression 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-17 17:15:18 +01:00
Richard Lewis
02edadbd15 Don't bubble cancel click to room header. 2017-08-17 12:21:44 +01:00
Richard Lewis
d1ee257b5a Pass roomId rather than whole room object. 2017-08-17 12:15:01 +01:00
Richard Lewis
eb77dcc8e3 Camel case variable name 2017-08-17 11:24:25 +01:00
Richard Lewis
2c25639a61 Fix copyright header 2017-08-17 11:22:42 +01:00
Richard Lewis
9111cb421e Merge pull request #1291 from matrix-org/rxl881/maxWidgets 
Show a dialog if the maximum number of widgets allowed has been reached.
 2017-08-17 10:03:42 +01:00
Matthew Hodgson
e80ddc2513 Merge pull request #1309 from MTRNord/fixRobotTranslation 
Fix Robot translation
 2017-08-17 00:03:12 +01:00
MTRNord
59815359f8 Add misiing _tJsx import 2017-08-16 23:55:43 +02:00
MTRNord
fceccfc503 Add missing Robot string to translation 2017-08-16 23:54:36 +02:00
Luke Barnard
38f45bc40d [WIP] app tile click to hide app bodies 2017-08-16 18:19:12 +01:00
Luke Barnard
7c336cd00a Implement TextualEvent tiles for im.vector.modular.widgets 
E.g. "Bob added a Acme widget", "Susan removed a Giraffe widget"
 2017-08-16 17:46:20 +01:00
Luke Barnard
0935f26cf3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-08-16 16:04:47 +01:00
Luke Barnard
0844beac79 Enable matrix-apps by default 2017-08-16 16:04:39 +01:00
David Baker
252ab208e4 Merge pull request #1300 from matrix-org/dbkr/userpicker 
Refactor ChatInviteDialog to be UserPickerDialog
 2017-08-16 14:29:07 +01:00
Michael Telatynski
14903274c0
Change OOO so that MELS generation will continue over hidden events 
this fixes the scenario of N Member events, then an invisible event
e.g. (m.room.aliases) then more Member events. Pre hide-join-parts
this is how it worked.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-16 13:20:32 +01:00
Luke Barnard
b5f959cbdc Merge pull request #1302 from krombel/krombel-patch-translation-link 
Update Link to Translation status
 2017-08-16 11:56:58 +01:00
Luke Barnard
222aed896f js-sdk #develop 2017-08-16 10:06:50 +01:00
Luke Barnard
8f21ba7f7a js-sdk 0.8.0 2017-08-16 09:37:10 +01:00
Luke Barnard
a379f04ca8 Merge pull request #1306 from matrix-org/luke/fix-te-i18n-variables 
Fix i18n variable names and `)s` syntax for TE.json (Tegulu)
 2017-08-15 18:18:54 +01:00
Luke Barnard
eae5a45ec2 Fix variable case 2017-08-15 18:02:46 +01:00
Luke Barnard
063cbcfc73 Merge pull request #1303 from matrix-org/luke/fix-autocomplete-by-mxid 
Allow autocompletion when typing user IDs
 2017-08-15 17:32:03 +01:00
Luke Barnard
036fa0e944 Merge pull request #1305 from matrix-org/t3chguy/fix_async_modal 
fix async modal create fn signature
 2017-08-15 17:31:45 +01:00
Luke Barnard
9818007022 Fix i18n variable names and )s syntax for TE.json (Tegulu) 2017-08-15 17:29:55 +01:00
Luke Barnard
60c2532616 Merge pull request #1304 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-08-15 16:27:42 +01:00
Michael Telatynski
72a412589d
Fix vector-im/riot-web#4799 regression by fixing fn signature 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-15 15:52:38 +01:00
Luke Barnard
454a848e47 Remove erroneous line 2017-08-15 15:10:23 +01:00
Luke Barnard
b40cc111bd Remove incidental diff syntax 2017-08-15 15:03:25 +01:00
Weblate
d443368aa3 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 
Conflicts:
	src/i18n/strings/en_EN.json
	src/i18n/strings/fr.json
	src/i18n/strings/ru.json
 2017-08-15 14:00:35 +00:00
strix aluco
97ee9d72db Translated using Weblate (Ukrainian) 
Currently translated at 19.1% (175 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2017-08-15 13:39:11 +00:00
Pitchaya Boonsarngsuk
df898e1c45 Translated using Weblate (Thai) 
Currently translated at 70.4% (645 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/
 2017-08-15 13:39:10 +00:00
Sri Lakshmi
5112134345 Translated using Weblate (Telugu) 
Currently translated at 36.7% (337 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/te/
 2017-08-15 13:39:10 +00:00
Max Sandholm
29b5a03e02 Translated using Weblate (Swedish) 
Currently translated at 56.8% (521 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2017-08-15 13:39:10 +00:00
Simó Albert i Beltran
4da6c811e9 Translated using Weblate (Spanish) 
Currently translated at 69.9% (641 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-08-15 13:39:10 +00:00
Alexey Murz Korepov
7bc754618e Translated using Weblate (Russian) 
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/ru/
 2017-08-15 13:39:10 +00:00
daniel tygel
2f373de574 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.7% (914 of 916 strings)

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