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

6134 Commits

Author SHA1 Message Date
Michael Telatynski 77e2ceba9e
switch to new ES6 DateUtils imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 21:50:32 +00:00
Richard Lewis 50271b7123 Remove padding on last component of MessageComposer (sticker toggle icons) 2018-01-10 20:48:22 +00:00
Richard Lewis 409bb5ff4d Improved icons. 2018-01-09 16:01:33 +00:00
Richard Lewis fa1059e202 Show / hide stickers icon styling 2018-01-09 15:59:28 +00:00
Richard Lewis f8e00e43e3 Show / hide sitckers icons 2018-01-09 15:59:04 +00:00
Weblate 89c5be39d1 Merge remote-tracking branch 'origin/develop' into develop 2018-01-08 21:33:27 +00:00
Matthew Hodgson c8e87cb5a2
Merge pull request #5950 from vector-im/t3chguy-patch-1 
Change author
 2018-01-08 21:33:22 +00:00
Michael Telatynski 627ebb848d
Change author 2018-01-08 21:32:25 +00:00
Weblate 54cafec57a Merge remote-tracking branch 'origin/develop' into develop 2018-01-08 15:18:08 +00:00
David Baker 1405859d2c
Merge pull request #5944 from vector-im/revert-3046-patch-1 
Revert "Add a &nbsp; after timestamp"
 2018-01-08 15:18:03 +00:00
David Baker 24e16e5c18
Revert "Add a &nbsp; after timestamp" 2018-01-08 15:17:05 +00:00
Weblate 9c7783b439 Merge remote-tracking branch 'origin/develop' into develop 2018-01-08 15:00:51 +00:00
David Baker a21bbd15c5
Merge pull request #3046 from rubo77/patch-1 
Add a &nbsp; after timestamp
 2018-01-08 15:00:45 +00:00
David Baker b6c002b587
Fix merge 2018-01-08 14:35:39 +00:00
David Baker 9c3e4a1202
Merge branch 'develop' into patch-1 2018-01-08 14:31:21 +00:00
Iru Cai (vimacs) 97cc7f88ef Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
 2018-01-08 02:02:11 +00:00
Weblate 5a5b0568f2 Merge remote-tracking branch 'origin/develop' into develop 2018-01-07 20:34:24 +00:00
Matthew Hodgson bddab533a3
Merge pull request #5938 from osoitz/master 
Corrected language name
 2018-01-07 20:34:19 +00:00
osoitz 5106809394
Update copy-res.js 
Corrected Basque name
 2018-01-07 20:39:24 +01:00
Michael Telatynski 290bf54d4f pluralise properly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 23:55:32 +00:00
Michael Telatynski c68c54618f delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 23:19:43 +00:00
Michael Telatynski 3788fde711 Add a tooltip to members button and badge with actual count 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 23:16:21 +00:00
Weblate 9289d1a57d Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 14:30:51 +00:00
David Baker d6942a455d Merge branch 'rubo77-hide-options-cp' into develop 2018-01-05 14:30:36 +00:00
David Baker c8af65fff4 Merge branch 'hide-options-cp' of https://github.com/rubo77/vector-web into rubo77-hide-options-cp 2018-01-05 14:30:21 +00:00
Weblate 94aa5b5f1b Merge remote-tracking branch 'origin/develop' into develop 2018-01-03 16:15:57 +00:00
David Baker 38e0b26153 Merge branch 'master' into develop 2018-01-03 16:15:46 +00:00
David Baker 5635614549 v0.13.4 2018-01-03 16:13:24 +00:00
David Baker 1bb861f6cf Prepare changelog for v0.13.4 2018-01-03 16:13:24 +00:00
David Baker 2eb433157a v0.13.4 2018-01-03 16:08:38 +00:00
Michael Telatynski d71af40967 add missing config.json entry such that scalar-staging widgets work 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-03 16:06:58 +00:00
Weblate d2a676cad2 Merge remote-tracking branch 'origin/develop' into develop 2018-01-03 15:48:44 +00:00
Sejo 33cf966f34 Translated using Weblate (Spanish) 
Currently translated at 99.0% (217 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2018-01-03 15:48:44 +00:00
Peter Vágner 760b961e19 Translated using Weblate (Slovak) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
 2018-01-03 15:48:44 +00:00
Joachim Nielandt 2660e70e00 Translated using Weblate (Dutch) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
 2018-01-03 15:48:43 +00:00
Milan Korecký f3f608b35f Translated using Weblate (Czech) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2018-01-03 15:48:42 +00:00
Osoitz 34a3ef7e1d Translated using Weblate (Basque) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
 2018-01-03 15:48:42 +00:00
Luke Barnard 604d4e0a51
Merge pull request #5900 from Nostradamos/fix_4821 
Fix for `If riot is narrow enough, such that 'Send a message (unecrypted)' wraps to a second line, the timeline doesn't fit the window.`
 2018-01-03 15:48:38 +00:00
nostradamos 762f6aaf0f Merge remote-tracking branch 'upstream/develop' into fix_4821 2018-01-02 12:58:30 +01:00
Nostradamos 3600d1c667 moved max-height/min-height/overflow attributes to higher level to also include DraftEditorPlaceholder. Could fix https://github.com/vector-im/riot-web/issues/4821 2018-01-02 12:14:54 +01:00
Travis Ralston 504a575feb Revert "Merge pull request #5286 from turt2live/travis/presence" 
This reverts commit 3e72d8d969.
 2017-12-25 14:29:50 -07:00
Nathan van Beelen ec5c960ebb Translated using Weblate (Dutch) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
 2017-12-22 19:01:48 +00:00
Joachim Nielandt 1f26a17b29 Translated using Weblate (Dutch) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
 2017-12-22 07:52:44 +00:00
Michael Telatynski 8a7477f50c
Highlight ViewSource and Devtools ViewSource 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-20 20:40:41 +00:00
Xose M 17e0d3f8a0 Translated using Weblate (Galician) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
 2017-12-20 06:27:56 +00:00
Weblate 97116bb268 Merge remote-tracking branch 'origin/develop' into develop 2017-12-19 17:04:51 +00:00
Richard Lewis cf47b919d5
Merge pull request #5849 from vector-im/rxl881/snapshot 
Screenshot UI
 2017-12-19 17:04:46 +00:00
Weblate 7dd85533e8 Merge remote-tracking branch 'origin/develop' into develop 2017-12-19 13:23:21 +00:00
Richard Lewis af99ac3293
Merge pull request #5855 from vector-im/t3chguy/nvl/fix_electron_config 
add missing config.json entry such that scalar-staging widgets work
 2017-12-19 13:23:15 +00:00
Michael Telatynski 843505f6a9
add missing config.json entry such that scalar-staging widgets work 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-19 12:03:48 +00:00