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

4538 Commits

Author SHA1 Message Date
Sri Lakshmi 370268bba8 Translated using Weblate (Telugu) 
Currently translated at 60.3% (125 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
 2017-08-09 15:11:14 +00:00
Sri Lakshmi 8906aeb766 Translated using Weblate (Telugu) 
Currently translated at 60.3% (125 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
 2017-08-09 14:45:33 +00:00
Richard Lewis d9ebb11ba9 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/appFixes 2017-08-09 14:08:13 +01:00
Weblate 906ed3c78f Merge remote-tracking branch 'origin/develop' into develop 2017-08-09 08:30:53 +00:00
Luke Barnard ee2fb17945 Merge pull request #4765 from vector-im/rav/karma-bits 
Karma tweaks for riot-web
 2017-08-09 09:30:49 +01:00
Richard van der Hoff 06ef674597 Enable fancy karma reporters 
cargo-cult luke's stuff from react-sdk
 2017-08-08 19:05:58 +01:00
Richard van der Hoff df33d40285 Enable karma-sourcemap-loader 
This turns (some) stacktraces back into something useful, so that unpicking
test failures is vaguely tractable
 2017-08-08 19:05:49 +01:00
Weblate b3108e4dff Merge remote-tracking branch 'origin/develop' into develop 2017-08-08 17:23:49 +00:00
Richard van der Hoff 0b2120e423 Merge pull request #4764 from MTRNord/patch-5 
Fix typo with scripts/fetch-develop-deps.sh in Building From Source
 2017-08-08 18:23:44 +01:00
Marcel a3525f411d Fix typo with scripts/fetch-develop-deps.sh in Building From Source 
scripts/fetch-develop-deps.sh vs scripts/fetch-develop.deps.sh
 2017-08-08 19:22:07 +02:00
Weblate f7c38992cc Merge remote-tracking branch 'origin/develop' into develop 2017-08-08 13:01:34 +00:00
David Baker 3e96892a91 Merge pull request #4757 from vector-im/luke/css-feature-pills-hide-avatar-setting 
Adjust CSS for optional avatars in pills
 2017-08-08 14:01:29 +01:00
Luke Barnard 274fc34868 Adjust CSS for optional avatars in pills 
codep matrix-org/matrix-react-sdk#1277
 2017-08-08 11:14:52 +01:00
Weblate 6cb979fc6f Merge remote-tracking branch 'origin/develop' into develop 2017-08-08 09:13:10 +00:00
Richard van der Hoff 10ee9f4de4 Merge pull request #4754 from vector-im/rav/fix_crypto_build 
Fix crypto on develop
 2017-08-08 10:13:06 +01:00
Richard van der Hoff c31f66aed5 Jenkins.sh: only fetch head of dependency branches 2017-08-08 09:50:49 +01:00
Richard van der Hoff 7b024751d1 fetch-develop-deps: avoid breaking js-sdk 
do `npm i` in react-sdk *before* symlinking js-sdk, to avoid moving a load of
deps from js-sdk to react-sdk and hence breaking the build.
 2017-08-08 09:50:49 +01:00
Richard van der Hoff 9c3c1b7608 Make webpack exit non-zero on error 
Pass `--bail` to webpack, so that if we can't find a module, we bail out rather
than deploy a broken version to /develop.

https://github.com/webpack/webpack/issues/708 is somewhat relevant.
 2017-08-08 09:50:49 +01:00
Weblate a8ddf528a8 Merge remote-tracking branch 'origin/develop' into develop 2017-08-06 19:11:38 +00:00
Matthew Hodgson 9f3c33758c Merge pull request #4464 from vsund/patch-1 
Fix signing key url in readme
 2017-08-06 20:11:32 +01:00
Weblate ed9a4a3933 Merge remote-tracking branch 'origin/develop' into develop 2017-08-06 19:11:06 +00:00
Matthew Hodgson bf38fead18 Merge pull request #4749 from jfmherokiller/gitignore-update 
update gitignore to allow .idea directory to exist in subdirs
 2017-08-06 20:11:00 +01:00
Weblate b75402e772 Merge remote-tracking branch 'origin/develop' into develop 2017-08-06 19:10:34 +00:00
Matthew Hodgson a98c734eb5 Merge pull request #4665 from uhoreg/compact 
tweak compact theme
 2017-08-06 20:10:27 +01:00
Jordan Moran Meyers fb69ac33a0
update gitignore to allow .idea directory to exist in subdirs 2017-08-05 15:50:47 -05:00
Richard Lewis 25d1d785ba Updated icons 2017-08-05 00:23:55 +01:00
Richard Lewis 41afbb117d Add show and hide icons 2017-08-04 23:44:52 +01:00
Weblate 8b1650c382 Merge remote-tracking branch 'origin/develop' into develop 2017-08-03 14:56:03 +00:00
David Baker 4b5febadb7 Merge pull request #4740 from vector-im/luke/upgrade-dep-draft-js-0.11.0-alpha 
Update draft-js from 0.10.1 to 0.11.0-alpha
 2017-08-03 15:55:57 +01:00
Luke Barnard 8ca2af0fe7 Update draft-js from 0.10.1 to 0.11.0-alpha (see https://github.com/matrix-org/matrix-react-sdk/pull/1269) 2017-08-03 15:22:52 +01:00
Weblate 03228d945d Merge remote-tracking branch 'origin/develop' into develop 2017-08-03 14:21:40 +00:00
yuurii 3e845bc37c Translated using Weblate (Japanese) 
Currently translated at 28.5% (59 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
 2017-08-03 14:21:39 +00:00
Osoitz 531f1e52eb Translated using Weblate (Basque) 
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/eu/
 2017-08-03 14:21:38 +00:00
David Baker f5e5bb8720 Merge pull request #4739 from vector-im/t3chguy/mouse_forward_back-windows 
electron support for mouse forward/back buttons in Windows
 2017-08-03 15:21:33 +01:00
Michael Telatynski a6d5158830
electron support for mouse forward/back buttons in Windows 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-03 15:03:50 +01:00
daniel tygel dfa1ce8d77 Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2017-08-03 13:46:44 +00:00
Jeff Huang 3ba4823fd7 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2017-08-03 00:43:45 +00:00
yuurii b9ff6c873c Added translation using Weblate (Japanese) 2017-08-02 13:32:57 +00:00
Weblate 6653ccf9a1 Merge remote-tracking branch 'origin/develop' into develop 2017-08-02 12:06:35 +00:00
Luke Barnard 4b8764c070 Merge pull request #4730 from vector-im/luke/update-dep-draft-js 
Update draft-js from 0.8.1 to 0.10.1
 2017-08-02 13:06:31 +01:00
Luke Barnard 2f99a4883f Update draft-js from 0.8.1 to 0.10.1 
Hopefully to fix #4675 and friends
 2017-08-02 11:52:47 +01:00
Weblate 73e5cc9721 Merge remote-tracking branch 'origin/develop' into develop 2017-08-01 16:30:35 +00:00
Walter b12741464e Translated using Weblate (Russian) 
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/ru/
 2017-08-01 16:30:34 +00:00
Richard Lewis af85f18eae Styling tweaks 2017-08-01 17:30:22 +01:00
Osoitz 2551a945b8 Translated using Weblate (Basque) 
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/eu/
 2017-08-01 15:29:26 +00:00
Osoitz 6bab8295d7 Added translation using Weblate (Basque) 2017-08-01 14:02:02 +00:00
Michael Telatynski 5b6dbfb701
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/i18n_analytics 2017-07-28 21:02:48 +01:00
Weblate 8b26d5b7fb Merge remote-tracking branch 'origin/develop' into develop 2017-07-28 14:34:13 +00:00
David Baker 384727a553 Merge pull request #4693 from vector-im/luke/css-sending-event-tile 
Make pills, emoji translucent when sending
 2017-07-28 15:34:09 +01:00
Luke Barnard 397523f4ac Make pills, emoji translucent when sending 
also fix header colours, which now inherit the font colour of the event tile (so all headers have the correct colour when sending or when the event tile is highlighted for a mention)
 2017-07-28 15:13:36 +01:00