Commit Graph

2919 Commits

Author SHA1 Message Date
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 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
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
Weblate ca388b8c7c Merge remote-tracking branch 'origin/develop' into develop 2017-07-28 13:15:45 +00:00
Richard Lewis ca5fdff72f Merge pull request #4690 from vector-im/rxl881/widgetPermissions
Widget permissions styling and icon
2017-07-28 14:15:41 +01:00
Richard Lewis 317ff8c6af Beta tag styling 2017-07-27 23:02:19 +01:00
Richard Lewis 50f5abf535 Permissions button cursor. 2017-07-27 20:19:08 +01:00
Richard Lewis c1fe3533c4 Add red cancel icon and styling. 2017-07-27 18:10:56 +01:00
Michael Telatynski 93a3c896a4
un-i18n Modal Analytics
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-27 17:45:02 +01:00
Richard Lewis 0bee03e86f Fix App body height.
App warning colours.
App loading styling.
2017-07-27 16:40:33 +01:00
LuPa 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
Weblate a5771c48ba Merge remote-tracking branch 'origin/develop' into develop 2017-07-26 15:58:35 +00:00
Sri Lakshmi 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
Bamstam 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
Travis Ralston 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
Richard Lewis ff2554c8a6 App permission component styling. 2017-07-26 16:48:24 +01:00
Luke Barnard 35c239aae8 CSS required for composer autoscroll
for https://github.com/matrix-org/matrix-react-sdk/pull/1248
2017-07-26 16:45:00 +01:00
Weblate c2e1b6c613 Merge remote-tracking branch 'origin/develop' into develop 2017-07-25 09:21:55 +00:00
David Baker ec6efd2488 Merge pull request #4608 from vector-im/dbkr/groupview_edit
CSS for group edit UI
2017-07-25 10:21:51 +01:00
Weblate 1a09fc60f0 Merge remote-tracking branch 'origin/develop' into develop 2017-07-25 08:55:42 +00:00
Matthew Hodgson bcedc206e1 seems folk prefer darker pills 2017-07-25 09:55:34 +01:00
Weblate 77582e0a17 Merge remote-tracking branch 'origin/develop' into develop 2017-07-24 21:13:38 +00:00
Kevin Németh be0cb667c8 Translated using Weblate (Hungarian)
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/hu/
2017-07-24 21:13:37 +00:00
Matthew Hodgson dbeeacf11c tweak pill colours some more 2017-07-24 22:13:29 +01:00
Weblate d0344fef8b Merge remote-tracking branch 'origin/develop' into develop 2017-07-24 20:22:49 +00:00
Richard van der Hoff bc2f639aae Fix a couple of minor errors in the room list
bluebird promises don't support .fail, so some operations didn't work quite
right. We should use .catch instead.
2017-07-24 17:19:46 +01:00
Weblate 8445eb0959 Merge remote-tracking branch 'origin/develop' into develop 2017-07-24 13:49:52 +00:00
Lauris Mierkalns de04cba41f Translated using Weblate (Latvian)
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/lv/
2017-07-24 13:49:52 +00:00
Luke Barnard e923847dac Make user mentions more pill-like
By adding subtle background-colors
2017-07-24 14:49:43 +01:00
Hubert Chathi efa156b53a tweak compact theme
- add some comments
- decrease size of info events and MELS (#4363.2)
- reduce spacing between paragraphs, lists, etc (#4363.3 & 4)

Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
2017-07-23 23:02:29 -04:00
David Baker d2f02e8e99 Swap classes instead of using 0 height elements 2017-07-21 14:14:27 +01:00
David Baker 5ba3453dcc cursor: pointer on avatar picker 2017-07-21 11:12:46 +01:00
Lauris Mierkalns 9d8215e49f Added translation using Weblate (Latvian) 2017-07-20 23:24:17 +00:00
Weblate 2cc153c796 Merge remote-tracking branch 'origin/develop' into develop 2017-07-20 13:05:10 +00:00
Richard Lewis 55084d3aca Merge pull request #4584 from vector-im/rxl881/beta
Styling for beta testing icon.
2017-07-20 14:05:06 +01:00
Weblate 98e3746a1e Merge remote-tracking branch 'origin/develop' into develop 2017-07-20 10:16:40 +00:00
Luke Barnard ccf5d6fc90 Adjust pill CSS
-Remove space after mentions without pill background colour
-Increase space between pill avatar and first letter of the pill by 1px
2017-07-20 11:14:54 +01:00
Bamstam 4b67900225 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-19 20:52:22 +00:00
Weblate fb10357dd5 Merge remote-tracking branch 'origin/develop' into develop 2017-07-19 16:26:16 +00:00
Luke Barnard f7d282fc8e Merge pull request #4597 from vector-im/luke/css-matrixto-timeline-pills
Make some adjustments to mx_UserPill and mx_RoomPill
2017-07-19 17:26:13 +01:00
Weblate 11ae3dd46c Merge remote-tracking branch 'origin/develop' into develop 2017-07-19 16:16:06 +00:00
Luke Barnard 3544c2b0c8 Merge pull request #4639 from vector-im/luke/css-rte-pre
Apply CSS to <pre> tags to distinguish them from each other
2017-07-19 17:16:02 +01:00
Weblate edfa3c1980 Merge remote-tracking branch 'origin/develop' into develop 2017-07-19 13:27:40 +00:00
Bhuvan Krishna 620f39c6a2 Translated using Weblate (Telugu)
Currently translated at 1.4% (3 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
2017-07-19 13:27:40 +00:00
Luke Barnard 53ae42ed68 Use `catch` instead of `fail` to handle room tag error
Because bluebird doesn't support fail
2017-07-19 14:11:22 +01:00
Luke Barnard 871c9e6d3e Add bing mention pill CSS
Useful with https://github.com/matrix-org/matrix-react-sdk/pull/1234
2017-07-19 11:02:51 +01:00
Luke Barnard ccc30fb52e Apply CSS to <pre> tags to distinguish them from each other 2017-07-19 09:25:53 +01:00
Weblate 745b803d28 Merge remote-tracking branch 'origin/develop' into develop 2017-07-18 16:45:25 +00:00
Matthew Hodgson bd693768cc deliberately de-theme pre tags 2017-07-18 17:45:17 +01:00
Weblate 6e1c40ea0f Merge remote-tracking branch 'origin/develop' into develop 2017-07-18 14:50:34 +00:00
Matthew Hodgson b45108d80d ooooops, fix dark theme code blocks correctly 2017-07-18 15:50:28 +01:00
Weblate ec68c54644 Merge remote-tracking branch 'origin/develop' into develop 2017-07-18 14:33:48 +00:00
erciccione 4e5e5dd6b3 Translated using Weblate (Italian)
Currently translated at 96.1% (199 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
2017-07-18 14:33:48 +00:00
Matthew Hodgson e7ba618bbe fix text in code blocks on dark theme 2017-07-18 15:33:41 +01:00
David Baker fc470cd20d Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit 2017-07-18 11:14:27 +01:00
David Baker 65b9086f18 Add group header button css 2017-07-17 17:20:11 +01:00
Luke Barnard 0e71ea7a5a Make some adjustments to mx_UserPill and mx_RoomPill
So that they can appear correctly in the body of a text message.
2017-07-17 14:52:08 +01:00
František Šindelář faa9fa8db9 Added translation using Weblate (Czech) 2017-07-15 13:26:27 +00:00
Richard Lewis f272961fbd Styling for beta testing icon. 2017-07-14 23:30:47 +01:00
Weblate ac0d29dc06 Merge remote-tracking branch 'origin/develop' into develop 2017-07-14 17:04:10 +00:00
Luke Barnard cb4f57eb4a Merge pull request #4583 from vector-im/luke/feature-rte-pills
CSS for decorated matrix.to links in the composer
2017-07-14 18:04:05 +01:00
Luke Barnard a1b4b9992e Use $accent-fg-color instead of #fff 2017-07-14 17:59:53 +01:00
Luke Barnard 18a6ee5a52 white -> #fff 2017-07-14 17:52:11 +01:00
Luke Barnard de0fd588b6 Add $rte-room-pill-color: #aaa 2017-07-14 17:51:25 +01:00
David Baker 54f44af494 Make editing prettier 2017-07-14 17:23:44 +01:00
Luke Barnard 38899c6011 CSS for decorated matrix.to links in the composer 2017-07-14 17:23:16 +01:00
David Baker 8c9afc2dfd Make GroupView more consistent with RoomView 2017-07-14 15:39:46 +01:00
Weblate bd06a1c393 Merge remote-tracking branch 'origin/develop' into develop 2017-07-14 14:05:12 +00:00
Kegsay 40a47f8c7a Allow Riot to load up different configs depending on the domain (#4575)
Initially try to load `config.$domain.json` and only if that fails, load
`config.json`. Configs are not muxxed in any way, it either entirely uses
the domain config, or entirely uses `config.json`.
2017-07-14 15:05:07 +01:00
Tong Hui f6f461c571 Translated using Weblate (Chinese (Simplified))
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_Hans/
2017-07-14 12:22:30 +00:00
Brendan Abolivier e1e7492f17 Translated using Weblate (French)
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/fr/
2017-07-14 12:15:20 +00:00
Weblate ea85a3c3d9 Merge remote-tracking branch 'origin/develop' into develop 2017-07-13 17:46:57 +00:00
Richard Lewis c0830b48d0 Merge pull request #4567 from vector-im/rxl881/widgetButtons
Improve AppTile menu bar button styling.
2017-07-13 18:46:53 +01:00
David Baker e60bf48134 CSS for start of group edit support 2017-07-13 18:42:14 +01:00
Weblate 76f6a19733 Merge remote-tracking branch 'origin/develop' into develop 2017-07-13 11:20:13 +00:00
Richard van der Hoff 76181f4771 Merge remote-tracking branch 'origin/develop' into rav/bluebird 2017-07-13 12:04:54 +01:00
Weblate acbcde85ce Merge remote-tracking branch 'origin/develop' into develop 2017-07-13 10:33:32 +00:00
Luke Barnard ba1166d0d0 Merge pull request #4568 from vector-im/luke/remove-old-composer
Remove CSS for the MessageComposerInputOld
2017-07-13 11:33:28 +01:00
Richard van der Hoff 7238c4dfac Fix overlooked `q` 2017-07-13 11:33:25 +01:00
Luke Barnard d901515059 rethemedex 2017-07-13 10:16:23 +01:00
Luke Barnard f5c4d903e6 Remove CSS for TabComplete 2017-07-13 10:11:58 +01:00
Richard Lewis e15c8e473f AppTile menu bar button styling. 2017-07-13 09:44:19 +01:00
Richard van der Hoff 1d2d086a58 Replace q.allSettled()
Bluebird doesn't have an `allSettled` method, so instead catch the exceptions and
use `all`.
2017-07-13 00:50:01 +01:00
Richard van der Hoff 4c5b5ca0ba replace `q.Promise` with `new Promise` 2017-07-13 00:50:01 +01:00
Richard van der Hoff d5b550f89a replace q method calls with bluebird ones
```
find src test -name '*.js' |
    xargs perl -i -pe 's/q\.(all|defer|reject|delay|try|isFulfilled)\(/Promise.$1(/'
```
2017-07-13 00:50:01 +01:00
Richard van der Hoff b29b4a959b q(...) -> Promise.resolve
```
find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/'
```
2017-07-13 00:50:01 +01:00
Richard van der Hoff 10decf95f6 replace imports of `q` with bluebird
update `package.json`

```
find src test -name '*.js' |
    xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'

find src test -name '*.js' |
    xargs perl -i -pe 'if (/import [qQ] /) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
2017-07-13 00:48:31 +01:00
Weblate 668199e219 Merge remote-tracking branch 'origin/develop' into develop 2017-07-12 17:29:15 +00:00
Andrey 498feeed21 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-07-12 17:29:15 +00:00
erciccione 4040c1d931 Translated using Weblate (Italian)
Currently translated at 58.9% (122 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
2017-07-12 17:29:14 +00:00
Bamstam e774e807c6 Translated using Weblate (German)
Currently translated at 99.5% (206 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-07-12 17:29:14 +00:00
Rami Taibah f80629db44 Translated using Weblate (Arabic)
Currently translated at 14.9% (31 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ar/
2017-07-12 17:29:14 +00:00
Luke Barnard 188a58e5c7 RateLimitedFunc -> rate_limited_func 2017-07-12 18:18:13 +01:00
Luke Barnard 3e1a909b1d Just use the onKeyDown of the <input> 2017-07-12 17:46:27 +01:00
Luke Barnard 41cd238e02 Update to reflect previous implementation
Which was a74bbb424c
2017-07-12 17:10:43 +01:00
Luke Barnard 4fe4e10abb Implement the focus_room_filter action
This is for ctrl+k room filtering and switching
2017-07-12 13:49:57 +01:00
Andrey 659ac2e8c7 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-07-12 11:02:09 +00:00
strix aluco 71396e062d Translated using Weblate (Ukrainian)
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/uk/
2017-07-12 02:38:52 +00:00
Szimszon 2ba1a84b0c Translated using Weblate (Hungarian)
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/hu/
2017-07-11 16:40:51 +00:00
Weblate b5ef34b0a0 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 16:36:15 +00:00
Richard van der Hoff 898725082a Remove spurious comma
I am messing this up - fix to 0bbce1c
2017-07-11 17:35:25 +01:00
Weblate a00781b733 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 16:04:20 +00:00
Luke Barnard a619001533 Merge pull request #4530 from vector-im/dbkr/groups_better_groupview
CSS for Rooms in Group View
2017-07-11 17:04:16 +01:00
Weblate 2c65bd097b Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 16:01:08 +00:00
Richard van der Hoff 0bbce1c140 Add missing i18n string
This should have been part of
https://github.com/vector-im/riot-web/pull/4557/files
2017-07-11 17:00:04 +01:00
Weblate b3abf7c592 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 15:46:47 +00:00
Richard van der Hoff bc60fa81af more HomePage tweaks
* Don't log errors with no context
* i18nify the "Couldn't load home page" message
2017-07-11 14:29:47 +01:00
Weblate c465f40179 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 13:27:41 +00:00
Richard van der Hoff d755903fdb typo 2017-07-11 14:10:18 +01:00
Richard van der Hoff 8ac26dd19f Give HomePage an unmounted guard
Also add missing return in error-handling path
2017-07-11 14:08:16 +01:00
David Baker cefc3e6da9 Make CSS more generic 2017-07-10 19:32:25 +01:00
Travis Ralston bc88585026 Translated using Weblate (English (United States))
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/en_US/
2017-07-10 15:03:57 +00:00
David Baker 7a1494fc46 Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-10 14:35:51 +01:00
Weblate ab95905472 Merge remote-tracking branch 'origin/develop' into develop 2017-07-10 12:56:07 +00:00
Sri Lakshmi 61e5fd759a Translated using Weblate (Telugu)
Currently translated at 0.9% (2 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
2017-07-10 12:56:07 +00:00
Luke Barnard c1b8879b6b Merge pull request #4500 from vector-im/luke/feature-enable-RTE
Take RTE out of labs
2017-07-10 13:56:02 +01:00
Weblate f033234abe Merge remote-tracking branch 'origin/develop' into develop 2017-07-10 08:37:37 +00:00
LuPa f133409207 Translated using Weblate (Spanish)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
2017-07-10 08:37:37 +00:00
നിദര്‍ശ് a1681f8576 Translated using Weblate (Malayalam)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-10 08:37:36 +00:00
Bamstam d7d61ab01d Translated using Weblate (German)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-07-10 08:37:36 +00:00
Ross Schulman 3175387c73 Translated using Weblate (Esperanto)
Currently translated at 98.0% (202 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2017-07-10 08:37:36 +00:00
Kelvin c2c6c14ec5 Translated using Weblate (Malayalam)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-07 19:25:22 +00:00
നിദര്‍ശ് e77b1ea87b Translated using Weblate (Malayalam)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-07 19:11:43 +00:00
Pirate Praveen Arimbrathodiyil 3930720127 Translated using Weblate (Malayalam)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-07 19:11:30 +00:00
നിദര്‍ശ് ae2f1ff382 Translated using Weblate (Malayalam)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-07 19:11:09 +00:00
Pirate Praveen Arimbrathodiyil 5ce3d5dc36 Translated using Weblate (Malayalam)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-07 19:09:49 +00:00
David Baker 5f5a802b44 Add CSS from react-sdk PR feedback 2017-07-07 18:34:57 +01:00
David Baker 052f9effc1 Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-07 12:02:38 +01:00
David Baker b4602fd2b1 Comment 2017-07-07 10:49:19 +01:00
David Baker 43bdc04637 Merge remote-tracking branch 'origin/develop' into dbkr/my_groups 2017-07-07 10:47:41 +01:00
Weblate 700672b6ec Merge remote-tracking branch 'origin/develop' into develop 2017-07-06 21:04:36 +00:00
Luke Barnard e36899c30f Merge pull request #4442 from vector-im/erikj/group_server
CSS for GroupView
2017-07-06 22:04:30 +01:00
David Baker e04f34a202 More CSS for group view 2017-07-06 19:14:12 +01:00
Weblate d34164ec49 Merge remote-tracking branch 'origin/develop' into develop 2017-07-06 13:08:42 +00:00
Michael Telatynski a8d5f7d5eb
remove unused class
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-06 13:53:17 +01:00
Weblate efa0184034 Merge remote-tracking branch 'origin/develop' into develop 2017-07-06 09:27:31 +00:00
Luke Barnard 0796b304cc Merge pull request #4466 from vector-im/luke/css-rte-improvements
Fix long words causing MessageComposer to widen
2017-07-06 10:27:25 +01:00
Weblate 3d167d8a27 Merge remote-tracking branch 'origin/develop' into develop 2017-07-05 17:22:13 +00:00
Luke Barnard 07e8d4ef69 Add visual bell animation for RTE 2017-07-05 18:13:23 +01:00
Weblate e8c8a0a2c8 Merge remote-tracking branch 'origin/develop' into develop 2017-07-05 13:00:08 +00:00
Luke Barnard 65a160f24a Merge branch 'develop' into luke/fix-rte-autocomplete-truncate 2017-07-05 13:45:06 +01:00
Weblate e128434acd Merge remote-tracking branch 'origin/develop' into develop 2017-07-05 09:55:03 +00:00