mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 18:21:38 +03:00
Code Issues Projects Releases Packages Wiki Activity
3533 commits 219 branches 562 tags 474 MiB
Commit graph

3533 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Hodgson
1e1a43c78f support iframes for RTS urls 2017-05-30 21:52:43 +01:00
Matthew Hodgson
64a67583e0 Merge pull request #4038 from vector-im/tom-welcome-page 
Tom welcome page
 2017-05-30 21:36:21 +01:00
Matthew Hodgson
d264426ece Merge branch 'develop' into new-guest-access 2017-05-30 21:06:45 +01:00
Matthew Hodgson
4493994dd5 Merge pull request #4092 from turt2live/travis/12hrtime-hotfix 
Show 12hr time on hover too
 2017-05-30 20:15:00 +01:00
RiotTranslate
e79df6a947 Update from Weblate. (#4091) 
* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 99.1% (119 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-05-30 20:14:23 +01:00
Matthew Hodgson
386fcb96fd Merge pull request #4087 from vector-im/kegan/translation-ape 
Translate src/notifications
 2017-05-30 20:14:10 +01:00
turt2live
676bd6196f Show 12hr time on hover too 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-05-30 13:07:49 -06:00
RiotTranslate
045c32bd2e Update from Weblate. (#4089) 
* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 99.1% (119 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-05-30 18:48:06 +01:00
Matthew Hodgson
f4c7aaf138 Merge pull request #4084 from vector-im/kegan/translation-monkey 
Translate src/components/structures
 2017-05-30 18:13:36 +01:00
RiotTranslate
88edd1620c Update from Weblate. (#4083) 
* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 99.1% (119 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-05-30 18:09:39 +01:00
Kegan Dougal
2a122a25fa Translate notification strings 2017-05-30 17:39:41 +01:00
Matthew Hodgson
485d080f85 Merge pull request #4085 from turt2live/travis/12h-ts-collision 
Smaller font size on timestamp to better fit in the available space
 2017-05-30 17:23:39 +01:00
turt2live
3f04a42229 Smaller font size on timestamp to better fit in the available space 
Part of addressing vector-im/riot-web#4046

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-05-30 09:32:27 -06:00
Kegan Dougal
1b4444cc73 Add missing translations 2017-05-30 16:30:56 +01:00
Kegan Dougal
7e21e00c99 Translate src/components/structures 2017-05-30 16:27:48 +01:00
Richard van der Hoff
469bb8fbc6 Merge pull request #4079 from vector-im/rav/node_versions 
Make travis run the build with several versions of node
 2017-05-30 16:06:48 +01:00
Matthew Hodgson
60a56d0617 Merge pull request #4056 from vector-im/t3chguy/piwik 
Piwik Analytics
 2017-05-30 15:59:08 +01:00
Richard van der Hoff
33b95d4965 Standardise on node v6/v7 2017-05-30 15:53:21 +01:00
Matthew Hodgson
e358ef5bf7 Merge pull request #4076 from vector-im/luke/fix-tests-that-expect-directory 
Fix some tests that expect Directory (they should expect HomePage)
 2017-05-30 15:24:46 +01:00
Matthew Hodgson
e405d3f179 Merge pull request #4077 from RiotTranslate/weblate-riot-web-riot-web 
Update from Weblate.
 2017-05-30 15:09:18 +01:00
RiotTranslate
d96c3656a6 Merge remote-tracking branch 'origin/develop' into develop 2017-05-30 14:01:24 +00:00
Matthew Hodgson
8e1dea7bd1 Merge pull request #4078 from vector-im/t3chguy/pl_redact_fix 
managed to eat the eventStatus check, can't redact a local-echo etc
 2017-05-30 14:21:41 +01:00
Michael Telatynski
6a57742343 managed to eat the eventStatus check, can't redact a local-echo etc 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 14:19:33 +01:00
RiotTranslate
a61b7af17a Merge remote-tracking branch 'origin/develop' into develop 2017-05-30 13:14:29 +00:00
RiotTranslate
e15d070e8f [WEBLATE] fix issues. 2017-05-30 13:11:04 +00:00
Bhuvan Krishna
83926eefce Added translation using Weblate (Telugu) 2017-05-30 12:22:01 +00:00
Luke Barnard
6cc7fa3a36 Expect a HomePage now instead of a directory, because one is now shown by default 2017-05-30 12:55:50 +01:00
Matthew Hodgson
37b51b8a2a translate login button 2017-05-30 12:25:27 +01:00
Luke Barnard
543f4efc37 Merge pull request #3925 from vector-im/t3chguy/show_redact_if_can 
show redact in context menu only if has PL to/sent message
 2017-05-30 10:13:20 +01:00
RiotTranslate
b3426a1268 Update from Weblate. (#4064) 
* Added translation using Weblate (Ukrainian)

* Translated using Weblate (German)

Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-05-30 04:00:36 +01:00
Matthew Hodgson
1f4f86b5f8 rework tom's welcome page to fit in slightly better with riot's UI/UX 
* moves login button to top-left
* switches from iframe to a request() to load the welcome page to inherit CSS (probably breaks RTS :/)
* namespace CSS
* change the layout a bit.
 2017-05-30 03:58:45 +01:00
Michael Telatynski
17c4e7a748 check PL on change as well as on comp load, that way it'll show remove button if PL increases later. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 23:49:56 +01:00
Michael Telatynski
d3f9304598 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/show_redact_if_can 2017-05-29 23:17:44 +01:00
Michael Telatynski
b9ec25b32f add flow annotation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 20:03:21 +01:00
Michael Telatynski
e991461e8d add new BasePlatform method, Analytics fun on the Webpack train 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 19:51:28 +01:00
Michael Telatynski
8a59acb5c3 explicit protocol in configs, otherwise breaks in Electron 
when it tries file://

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 19:32:44 +01:00
Michael Telatynski
dda73cecf9 make eslint happy about MatrixToolbar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 19:12:04 +01:00
Matthew Hodgson
1af86405bd Merge branch 'new-guest-access' into tom-welcome-page 2017-05-29 18:38:57 +01:00
Matthew Hodgson
823fbafe85 WIP improvements on welcome page; fix indentation, some verbiage and some CSS 2017-05-29 18:37:35 +01:00
Matthew Hodgson
8ef7dda7bd fixing missing OK button on TextInputDialog 2017-05-29 16:43:28 +01:00
Bamstam
7674a43e7f Translated using Weblate (German) 
Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-05-29 15:07:11 +00:00
Michael Telatynski
3e7b738b11 move all piwik init stuff to MatrixChat/Analytics 
as it now relies on SDKConfig

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 14:22:57 +01:00
Michael Telatynski
3e7ef112f0 opt out based on analyticsOptOut localSetting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 13:17:12 +01:00
Tom Lant
3ea3630c3b static images for the various rooms (there's no initial for the plain-background rooms yet, though this would likely be more flexible to do in css) 2017-05-29 11:36:05 +01:00
Tom Lant
8083f2d934 fixing up the link to the translation room 2017-05-29 11:35:13 +01:00
Strix Aluco
00cf1da758 Added translation using Weblate (Ukrainian) 2017-05-29 06:57:55 +00:00
Matthew Hodgson
f085d2db39 make flags less muddy - fixes https://github.com/vector-im/riot-web/issues/3974 2017-05-29 00:10:08 +01:00
Matthew Hodgson
a92d96347b Merge branch 'develop' into new-guest-access 2017-05-28 22:50:53 +01:00
Matthew Hodgson
fabae2f19f Merge pull request #3722 from turt2live/travis/redact-to-remove 
Change redact -> remove to improve clarity
 2017-05-28 22:41:52 +01:00
Matthew Hodgson
da7c6ca856 Merge branch 'develop' into travis/redact-to-remove 2017-05-28 22:41:38 +01:00