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

7152 Commits

Author SHA1 Message Date
J. Ryan Stinnett 0f4757c289 Fix up packaging directories for Windows 2019-02-14 12:54:26 +00:00
J. Ryan Stinnett 755ad22489 Upgrade electron-builder-squirrel-windows 2019-02-14 12:24:25 +00:00
J. Ryan Stinnett 1c1ebfa784 v1.0.0-rc.2 2019-02-14 11:20:03 +00:00
J. Ryan Stinnett d982163911 Prepare changelog for v1.0.0-rc.2 2019-02-14 11:20:03 +00:00
J. Ryan Stinnett 21f11f02a4 v1.0.0-rc.2 2019-02-14 11:19:06 +00:00
J. Ryan Stinnett 39e16a18e2 Update dependencies 2019-02-14 11:18:24 +00:00
J. Ryan Stinnett 32c958e2f2 Merge branch 'develop' into release-v1.0.0 2019-02-14 11:17:18 +00:00
David Baker f6dc8a946e
Merge pull request #8615 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2019-02-14 09:36:50 +00:00
Weblate af4cd46721 Merge remote-tracking branch 'origin/develop' into develop 2019-02-14 09:32:23 +00:00
tleydxdy b3147af553 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 94.7% (18 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
 2019-02-14 09:32:17 +00:00
J. Ryan Stinnett a11dcf0ee7
Merge pull request #8600 from vector-im/nadonomy/favicon-tweak 
Replace favicon assets to ones with transparent backgrounds
 2019-02-13 19:31:58 +00:00
Nad Chishtie bb4bd0cd2d Replace favicons with transparent backgrounds 2019-02-13 19:16:38 +00:00
J. Ryan Stinnett dc9751d5a5
Merge pull request #8594 from vector-im/dbkr/icons2019 
Refreshed icons
 2019-02-13 18:58:52 +00:00
Nad Chishtie db30c24b9f Updated app icons 2019-02-13 17:58:57 +00:00
David Baker bbbb4c7861 run icons script on new icon 2019-02-13 17:28:28 +00:00
David Baker 4f1a18b620
Merge pull request #8566 from vector-im/dbkr/readme_fetch_develop_deps_order_again 
Fix order of fetch-develop-deps / npm install
 2019-02-13 13:42:28 +00:00
David Baker a6edf66109 Fix order of fetch-develop-deps / npm install 
It's possible this git fixed in the CI scripts but not the README.
Running `npm install` undoes the npm linking, so this needs to be
run before fetch-develop-deps.
 2019-02-13 13:09:03 +00:00
J. Ryan Stinnett d0080b4ba8
Merge pull request #8540 from vector-im/jryans/dark-theme-redesign 
Revive building dark theme
 2019-02-13 11:45:37 +00:00
Abel Luck d395fdcc6a
Make scripts/make-icons.sh work on linux 
This commit detects if the macos-only utility `iconutil` is available in
the PATH, if it is, then the icns is built as usual. However if it
isn't (such as on a linux system), then it checks for `png2icns` and
uses it if possible.

Signed-off-by: Abel Luck <abel@guardianproject.info>
 2019-02-13 11:59:36 +01:00
J. Ryan Stinnett 0cb35ad216 Rename dharma theme to light theme 2019-02-13 10:47:51 +00:00
J. Ryan Stinnett 7b9de1dbf2 Remove Status theme 2019-02-13 10:47:51 +00:00
J. Ryan Stinnett 745f43a959 Enable building dark theme 2019-02-13 10:47:51 +00:00
J. Ryan Stinnett 8a5b96313a Remove light theme, mark dharma primary 2019-02-13 10:47:51 +00:00
J. Ryan Stinnett 01f9e48b79 Re-enable theme setting at startup 2019-02-13 10:47:51 +00:00
J. Ryan Stinnett 2f51f6efd6 Mark dharma as the default theme 2019-02-13 10:47:51 +00:00
J. Ryan Stinnett 9a90336238 Remove hack for Status theme 2019-02-13 10:47:51 +00:00
David Baker a64b1c4b51
Merge pull request #8546 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2019-02-13 09:47:57 +00:00
Weblate 8e2529f068 Merge remote-tracking branch 'origin/develop' into develop 2019-02-13 09:39:14 +00:00
csybr 3cec252729 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nn/
 2019-02-13 09:39:10 +00:00
Daniel Løvbrøtte Olsen 9d0a6ef96d Translated using Weblate (Norwegian Bokmål) 
Currently translated at 89.4% (17 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nb_NO/
 2019-02-13 09:39:10 +00:00
Samu Voutilainen a87cc41914 Translated using Weblate (Finnish) 
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/
 2019-02-13 06:56:37 +00:00
J. Ryan Stinnett 76f21abcdc
Merge pull request #8525 from vector-im/jryans/welcome-page-cleanup 
Repair app loading tests after welcome page
 2019-02-12 09:18:27 +00:00
J. Ryan Stinnett 994d4aa63f
Merge pull request #8528 from jryans/config-branding 
Support configurable welcome background and logo
 2019-02-11 17:09:26 +00:00
J. Ryan Stinnett 678904dcfb Allow configuring auth header logo 2019-02-11 16:29:50 +00:00
J. Ryan Stinnett 18d898cc1f Convert VectorAuthHeaderLogo to modern code style 2019-02-11 16:15:04 +00:00
J. Ryan Stinnett 86ced4cdad Allow configuring welcome background image 2019-02-11 16:15:04 +00:00
J. Ryan Stinnett aea2b1ebc9 Convert VectorAuthPage to modern code style 2019-02-11 16:15:03 +00:00
Osoitz 52d1f3baa6 Translated using Weblate (Basque) 
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
 2019-02-11 16:10:33 +00:00
J. Ryan Stinnett 585d28692d Fix loading tests for welcome page 2019-02-11 15:18:29 +00:00
J. Ryan Stinnett 6aff7460fe Map welcome page in Karma for less 404s 2019-02-11 11:17:40 +00:00
David Baker 1ec9763566
Merge pull request #8518 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2019-02-11 10:28:04 +00:00
Weblate 07b6cf9309 Merge remote-tracking branch 'origin/develop' into develop 2019-02-11 10:25:30 +00:00
sergio 39e80fb404 Translated using Weblate (Russian) 
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2019-02-11 10:25:27 +00:00
Karol Kosek 029d85c39b Translated using Weblate (Polish) 
Currently translated at 84.2% (16 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
 2019-02-11 10:25:26 +00:00
csybr 9d4f3a96ee Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nn/
 2019-02-11 10:25:26 +00:00
David Baker 0f6e614223
Merge pull request #8514 from jryans/doc-embedded-pages 
Document `embeddedPages` configuration
 2019-02-11 10:07:27 +00:00
J. Ryan Stinnett 50baa09f5e Revert "Disable even more tests" 
This was only done because CI was missing
matrix-org/matrix-react-sdk@5977859dd9.

This reverts commit e55ceef905.
 2019-02-11 10:06:44 +00:00
J. Ryan Stinnett 4c877f118d Document `embeddedPages` configuration 2019-02-11 09:29:17 +00:00
Matthew Hodgson a50db80510
Merge pull request #8502 from jjerphan/develop 
README.md : Syntax Coloring
 2019-02-10 09:29:48 +00:00
Julien Jerphanion dd01a398b6 Syntax Coloring 
Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
 2019-02-10 10:15:28 +01:00