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

6410 Commits

Author SHA1 Message Date
David Baker b0a3bd6591
Merge pull request #6017 from vector-im/t3chguy/rich_quoting_linear 
Linear Rich Quoting
 2018-01-24 18:53:33 +01:00
d1d4c 8b7a941a6e Translated using Weblate (Catalan) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2018-01-24 08:55:16 +00:00
Luke Barnard 394d4cf856
Merge pull request #5995 from vector-im/t3chguy/highlight_things 
Highlight ViewSource and Devtools ViewSource
 2018-01-24 08:55:12 +00:00
Michael Telatynski 22b7298542 add comments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-23 20:28:39 +00:00
Michael Telatynski 9d1a3c9011 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things 2018-01-23 20:19:27 +00:00
Michael Telatynski c2aa8137bb sort components scss 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-23 20:02:47 +00:00
d1d4c 4d0b02c683 Translated using Weblate (Catalan) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2018-01-23 19:46:06 +00:00
Michael Telatynski c7146e62a0
Merge pull request #6022 from 4nd3r/README_cross_origin_renderer_url 
Update README.md with correct example use of config.cross_origin_renderer_url
 2018-01-23 11:00:45 +00:00
Ander Punnar d9409232f9 default url, not domain 
https://github.com/matrix-org/matrix-react-sdk/blob/master/src/components/views/messages/MFileBody.js#L116

Signed-off-by: Ander Punnar <ander@kvlt.ee>
 2018-01-23 12:15:08 +02:00
Peter Vágner 0df6f85843 Translated using Weblate (Slovak) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
 2018-01-22 22:21:55 +00:00
A.G 13dd8e2c76 Translated using Weblate (Italian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2018-01-22 22:21:55 +00:00
Luke Barnard 9d387c32a5
Merge pull request #5929 from vector-im/t3chguy/num_members_tooltip 
T3chguy/num members tooltip
 2018-01-22 22:21:50 +00:00
Michael Telatynski f5fc86258f s/Highlight/SyntaxHighlight/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 18:59:18 +00:00
Michael Telatynski 321f16d8a3 rename variable as it was horrible to read camelCased 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 18:54:22 +00:00
Michael Telatynski d57a10e0b2
Merge branches 'develop' and 't3chguy/rich_quoting_linear' of github.com:vector-im/riot-web into t3chguy/rich_quoting_linear 2018-01-22 16:53:51 +00:00
Michael Telatynski 202f0e2163
Add EventTile_quote styling for less margin-right when in QuotePreview 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 16:42:08 +00:00
pincopallopino 77d8fe3ef1 Translated using Weblate (Italian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2018-01-20 23:00:26 +00:00
A.G 3e5833e9f2 Translated using Weblate (Italian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2018-01-20 22:59:29 +00:00
pincopallopino 2b26be73f6 Translated using Weblate (Italian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2018-01-20 22:59:22 +00:00
A.G ce6338b853 Translated using Weblate (Italian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2018-01-20 22:59:12 +00:00
vricci 52c5293a12 Translated using Weblate (Italian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2018-01-20 22:59:04 +00:00
A.G 568e1f4f90 Translated using Weblate (Italian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2018-01-20 22:58:48 +00:00
vricci 29f05c09d6 Translated using Weblate (Italian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2018-01-20 22:58:18 +00:00
A.G 888a77b4bb Translated using Weblate (Italian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2018-01-20 22:57:00 +00:00
pebles 4eeb7989f6 Translated using Weblate (Spanish) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2018-01-20 16:34:07 +00:00
Michael Telatynski 3764a5d4b7 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things 2018-01-20 13:55:52 +00:00
Michael Telatynski 1f3321fb37 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools-118247 2018-01-20 13:55:31 +00:00
Peter Vágner 189b7236af Translated using Weblate (Slovak) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
 2018-01-20 11:54:14 +00:00
Matthew Hodgson 37b5de2251 update triaging a bit 2018-01-19 16:52:55 +00:00
Matthew Hodgson 8855cc294e converge on 'noisy' to mean noisy notifs 2018-01-19 16:52:54 +00:00
Weblate 935b85afe7 Merge remote-tracking branch 'origin/develop' into develop 2018-01-19 14:49:58 +00:00
Luke Barnard a819add7b0
Merge pull request #6008 from vector-im/luke/roomlist-beautiful-dnd 
Swap RoomList to react-beautiful-dnd
 2018-01-19 14:49:53 +00:00
lukebarnard 883ee4ec75 Remove react-dnd 2018-01-19 13:35:11 +00:00
lukebarnard 4504ff954a Add `sudo: required` to travis config 2018-01-19 10:10:13 +00:00
Марко М. Костић 68f19f9558 Translated using Weblate (Serbian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
 2018-01-18 21:05:10 +00:00
lukebarnard d55d3658f0 Use classNames instead of inline `style` 
Theres no benefit to using inline styles
 2018-01-18 18:08:18 +00:00
lukebarnard 3481283af8 Swap RoomList to react-beautiful-dnd 
Includes themeing

See matrix-org/matrix-react-sdk#1711
 2018-01-18 17:54:39 +00:00
Richard Lewis 738b59fd42 Call for update on window resize. 2018-01-18 12:01:29 +00:00
Richard Lewis c340032bd1 Move sticker related CSS to its own file. 2018-01-17 15:49:03 +00:00
Richard Lewis de597d4f5d Make background lighter. 2018-01-17 15:13:29 +00:00
Richard Lewis 854b537695 Update sticker toggle icons. 2018-01-17 11:27:57 +00:00
Richard Lewis f4816b99ff Add stickerpack manage integration link styling. 2018-01-17 00:05:16 +00:00
Richard Lewis 56ae96fc75 Sticker content styling 2018-01-16 21:46:50 +00:00
Richard Lewis f8643e9a96 Add styling and image for stickerpack placeholder. 2018-01-16 18:35:04 +00:00
Richard Lewis a7f0b11002 Add generic element context menu / popover. 2018-01-16 18:15:17 +00:00
Michael Telatynski 5586a02b34 Merge branches 'develop' and 't3chguy/devtools-118247' of github.com:vector-im/riot-web into t3chguy/devtools-118247 2018-01-16 18:05:15 +00:00
Michael Telatynski 670f02acf8 Merge branches 'develop' and 't3chguy/highlight_things' of github.com:vector-im/riot-web into t3chguy/highlight_things 2018-01-16 18:04:08 +00:00
Weblate ff70af3f34 Merge remote-tracking branch 'origin/develop' into develop 2018-01-16 13:05:37 +00:00
Xose M 6f47a9b8c3 Translated using Weblate (Galician) 
Currently translated at 99.5% (219 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
 2018-01-16 13:05:36 +00:00
Luke Barnard a94208e230
Merge pull request #5992 from vector-im/luke/tag-panel-beautiful-dnd 
CSS required as part of moving TagPanel from react-dnd to react-beautiful-dnd
 2018-01-16 13:05:31 +00:00