nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
62,959 Commits 258 Branches 582 Tags
f52d7a8e207301ac62497ca7cd25bf64b6834d81
Commit Graph

62959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
07b6e215a1 CSS for group invite tiles 2017-08-18 11:24:52 +01:00
David Baker
ee6e36cd90 Allow extra tiles to be put into room sub lists 
So we can put in tiles for group invites & other stuff
 2017-08-18 11:23:55 +01:00
David Baker
55998028b4 Show group invites in 'invites' section 2017-08-18 11:22:50 +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
Weblate
fe6857c6c2 Merge remote-tracking branch 'origin/develop' into develop 2017-08-17 22:55:31 +00:00
Jan Kudrik
fd7966b25e Translated using Weblate (Czech) 
Currently translated at 24.6% (51 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-08-17 22:55:30 +00:00
Matthew Hodgson
3664a86722 center apps 2017-08-17 23:55:24 +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
Weblate
93848fab53 Merge remote-tracking branch 'origin/develop' into develop 2017-08-17 18:06:12 +00:00
Jan Kudrik
59d2b4d819 Translated using Weblate (Czech) 
Currently translated at 7.2% (15 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-08-17 18:06:12 +00:00
Matthew Hodgson
4981723cea expand auxPanel when showing apps 2017-08-17 19:06:05 +01:00
Weblate
cc3d772f69 Merge remote-tracking branch 'origin/develop' into develop 2017-08-17 17:45:17 +00:00
Balaji Ravichandran
7114216394 Translated using Weblate (Tamil) 
Currently translated at 14.4% (30 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ta/
 2017-08-17 17:45:17 +00:00
joe moe
7023e7e096 Translated using Weblate (German) 
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-08-17 17:45:16 +00:00
Jan Kudrik
e0d292ace5 Translated using Weblate (Czech) 
Currently translated at 2.8% (6 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-08-17 17:45:16 +00:00
Richard Lewis
24e463116b Merge pull request #4774 from vector-im/rxl881/appFixes 
Show / Hide apps icons
 2017-08-17 18:45:12 +01:00
Richard Lewis
1bd9590c53 Kick travis 2017-08-17 18:26:38 +01:00
Richard Lewis
95d1c3746e Kick travis 2017-08-17 18:22:52 +01:00
Jan Kudrik
b0d088dfd0 Added translation using Weblate (Czech) 2017-08-17 17:11:38 +00:00
Richard Lewis
120a4f4f44 Check for valid roomId before renering manageIntegsButton. 2017-08-17 18:10:50 +01:00
František Šindelář
849097a7a0 Translated using Weblate (Czech) 
Currently translated at 0.9% (2 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-08-17 17:01:38 +00:00
Jan Kudrik
b738fc4319 Translated using Weblate (Czech) 
Currently translated at 0.4% (1 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-08-17 16:59:38 +00: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
Richard Lewis
48b3075e44 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/appFixes 2017-08-17 17:20:21 +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
3dc347fbb8 Kick travis 2017-08-17 15:25:48 +01:00
Michael Telatynski
bdb2d6b475 Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings 
# Conflicts:
#	src/components/structures/MatrixChat.js
 2017-08-17 13:39:19 +01:00
Michael Telatynski
ca5e26744f Make dialog more specific and hide options behind advanced spoiler 2017-08-17 13:33:07 +01:00
Michael Telatynski
befc9b7a66 Merge branch 'develop' of github.com:vector-im/riot-web into set_default_federate_by_settings 2017-08-17 13:31:31 +01:00
Michael Telatynski
f0967d4f18 split css out as the modal is no longer generic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-17 13:31:09 +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