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

5127 commits

Author SHA1 Message Date
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
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
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
Luke Barnard
36fffa1696 Stop integ manager opening on every room switch 
This was caused by a broken assumption which was AppsDrawer component mounting === clicking on apps draw toggle.

This was introduced in matrix-org/matrix-react-sdk#1312.

Known issue with this fix: deleting the last app doesn't hide the app drawer.
 2017-08-18 14:48:58 +01:00
Richard Lewis
857a8c9519 Remove empty defaultProps. 2017-08-18 13:28:47 +01:00
Luke Barnard
3a7aa926c3 Merge pull request #1313 from matrix-org/luke/feature-app-tile-ux 
Add behaviour to toggle app draw on app tile header click
 2017-08-18 13:08:57 +01:00
Luke Barnard
caff761df7 Merge pull request #1308 from matrix-org/t3chguy/mels_fix 
Change OOO so that MELS generation will continue over hidden events
 2017-08-18 13:08:35 +01:00
Richard Lewis
84f5e5aad2 REmove unused onCancelClick 2017-08-18 12:21:48 +01:00
Luke Barnard
1a1a80b633 Merge branch 'develop' into luke/feature-app-tile-ux 2017-08-18 12:12:00 +01:00
Luke Barnard
cab3123bd8 Merge pull request #1312 from matrix-org/luke/feature-widget-timeline-events 
Implement TextualEvent tiles for im.vector.modular.widgets
 2017-08-18 12:10:22 +01:00
Luke Barnard
1bba1f0fa6 Add comment 2017-08-18 12:04:34 +01:00
Luke Barnard
6c37a9a3af Simplify getting of content, prev content for widget event 2017-08-18 12:03:29 +01:00
Michael Telatynski
615d96a065
catch hidden event being RM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-18 11:53:52 +01:00
Richard Lewis
96900e76a0 Move error logging to where it is first caught. 2017-08-18 11:51:32 +01:00
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
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
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
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
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
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
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
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
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