f7c38992cc
Merge remote-tracking branch 'origin/develop' into develop
2017-08-08 13:01:34 +00:00
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
274fc34868
Adjust CSS for optional avatars in pills
...
codep matrix-org/matrix-react-sdk#1277
2017-08-08 11:14:52 +01:00
6cb979fc6f
Merge remote-tracking branch 'origin/develop' into develop
2017-08-08 09:13:10 +00:00
10ee9f4de4
Merge pull request #4754 from vector-im/rav/fix_crypto_build
...
Fix crypto on develop
2017-08-08 10:13:06 +01:00
c31f66aed5
Jenkins.sh: only fetch head of dependency branches
2017-08-08 09:50:49 +01:00
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
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
a8ddf528a8
Merge remote-tracking branch 'origin/develop' into develop
2017-08-06 19:11:38 +00:00
9f3c33758c
Merge pull request #4464 from vsund/patch-1
...
Fix signing key url in readme
2017-08-06 20:11:32 +01:00
ed9a4a3933
Merge remote-tracking branch 'origin/develop' into develop
2017-08-06 19:11:06 +00:00
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
b75402e772
Merge remote-tracking branch 'origin/develop' into develop
2017-08-06 19:10:34 +00:00
a98c734eb5
Merge pull request #4665 from uhoreg/compact
...
tweak compact theme
2017-08-06 20:10:27 +01:00
fb69ac33a0
update gitignore to allow .idea directory to exist in subdirs
2017-08-05 15:50:47 -05:00
8b1650c382
Merge remote-tracking branch 'origin/develop' into develop
2017-08-03 14:56:03 +00:00
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
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
03228d945d
Merge remote-tracking branch 'origin/develop' into develop
2017-08-03 14:21:40 +00:00
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
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
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
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
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
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
b9ff6c873c
Added translation using Weblate (Japanese)
2017-08-02 13:32:57 +00:00
6653ccf9a1
Merge remote-tracking branch 'origin/develop' into develop
2017-08-02 12:06:35 +00:00
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
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
73e5cc9721
Merge remote-tracking branch 'origin/develop' into develop
2017-08-01 16:30:35 +00:00
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
af85f18eae
Styling tweaks
2017-08-01 17:30:22 +01:00
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
6bab8295d7
Added translation using Weblate (Basque)
2017-08-01 14:02:02 +00:00
8b26d5b7fb
Merge remote-tracking branch 'origin/develop' into develop
2017-07-28 14:34:13 +00:00
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
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
ca388b8c7c
Merge remote-tracking branch 'origin/develop' into develop
2017-07-28 13:15:45 +00:00
ca5fdff72f
Merge pull request #4690 from vector-im/rxl881/widgetPermissions
...
Widget permissions styling and icon
2017-07-28 14:15:41 +01:00
317ff8c6af
Beta tag styling
2017-07-27 23:02:19 +01:00
50f5abf535
Permissions button cursor.
2017-07-27 20:19:08 +01:00
c1fe3533c4
Add red cancel icon and styling.
2017-07-27 18:10:56 +01:00
0bee03e86f
Fix App body height.
...
App warning colours.
App loading styling.
2017-07-27 16:40:33 +01:00
de5db26214
Translated using Weblate (Spanish)
...
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/es/
2017-07-26 18:20:02 +00:00
a5771c48ba
Merge remote-tracking branch 'origin/develop' into develop
2017-07-26 15:58:35 +00:00
5b3fb36ac7
Translated using Weblate (Telugu)
...
Currently translated at 6.2% (13 of 207 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
2017-07-26 15:58:35 +00:00
c8a39e361d
Translated using Weblate (German)
...
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/de/
2017-07-26 15:58:35 +00:00
068a2b869e
Merge pull request #4682 from vector-im/luke/css-fix-rte-auto-scroll
...
CSS required for composer autoscroll
2017-07-26 16:58:32 +01:00
e7c3563358
Translated using Weblate (English (United States))
...
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/en_US/
2017-07-26 15:51:27 +00:00
ff2554c8a6
App permission component styling.
2017-07-26 16:48:24 +01:00
Weblate