68ddf35db4
Use then, catch, done and display any errors that occur during search
2017-06-07 17:33:15 +01:00
4a60dc5a20
Translated using Weblate (German)
...
Currently translated at 100.0% (197 of 197 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-06-07 16:30:54 +00:00
bfa095184d
Merge pull request #1046 from matrix-org/t3chguy/piwik_fixes_1
...
Various Analytics changes/fixes/improvements
2017-06-07 17:17:47 +01:00
a2081f7d2a
Translated using Weblate (German)
...
Currently translated at 83.7% (165 of 197 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-06-07 16:14:48 +00:00
a7c0c805d4
Translated using Weblate (German)
...
Currently translated at 83.7% (165 of 197 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-06-07 16:14:37 +00:00
87996b3a8a
Update CSS for ChatInviteDialog
...
for https://github.com/matrix-org/matrix-react-sdk/pull/1050
- Remove address selector header
- Adjust dialog content so that the error message ("No results" or otherwise) doesn't cause a change in height
2017-06-07 17:14:36 +01:00
a2400baf59
Translated using Weblate (German)
...
Currently translated at 83.7% (165 of 197 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-06-07 16:13:44 +00:00
41df1e676d
Translated using Weblate (German)
...
Currently translated at 83.2% (164 of 197 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-06-07 16:13:22 +00:00
0e6c25122b
Translated using Weblate (German)
...
Currently translated at 82.7% (163 of 197 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-06-07 16:13:10 +00:00
305d510c6e
Merge remote-tracking branch 'origin/develop' into develop
2017-06-07 15:58:04 +00:00
e9a66625b2
Merge pull request #1051 from matrix-org/luke/fix-room-list-undefined-this
...
Use an arrow function to allow `this`
2017-06-07 16:26:30 +01:00
6f296aca75
[WEBLATE] merge Develop
2017-06-07 15:17:18 +00:00
49b22fb6c6
Use an arrow function to allow this
...
This was causing `TypeError: Cannot read property '_getEmptyContent' of undefined` for those with custom tags.
2017-06-07 16:13:40 +01:00
3b6599dcdc
Use user_directory endpoint to populate ChatInviteDialog
...
Also attempt to slightly improve the feedback given when searching. There is still room for improvement - it's not totally obvious whether to display a spinner because it's quite jarring were it to replace the dd. This does mean that "No results" will flash awkardly between two queries, neither of which return any results.
2017-06-07 16:05:36 +01:00
b2d011f0cb
Merge remote-tracking branch 'origin/develop' into develop
2017-06-07 14:59:43 +00:00
fc7e20ab62
Translated using Weblate (Russian)
...
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/
2017-06-07 14:57:16 +00:00
5a94cecc62
Translated using Weblate (German)
...
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-06-07 14:57:15 +00:00
7fc41957d7
Translated using Weblate (Russian)
...
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-07 14:57:14 +00:00
f7783cac2a
Translated using Weblate (German)
...
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-07 14:57:13 +00:00
27e5098e00
Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests
2017-06-07 15:44:33 +01:00
a09001933a
git status
2017-06-07 15:39:27 +01:00
c1151fd31c
Merge branch 'develop' into rav/handle_received_room_key_requests
2017-06-07 15:37:38 +01:00
272d36995b
Fix active styling
2017-06-07 15:28:58 +01:00
53bc78429d
Merge pull request #4212 from vector-im/t3chguy/package_json_fix
...
change electron -> electron_app which was previously missed
2017-06-07 14:46:54 +01:00
a158549a4c
Merge pull request #4039 from vector-im/new-guest-access
...
New guest access
2017-06-07 13:40:00 +01:00
d4041777f9
Merge pull request #937 from matrix-org/new-guest-access
...
New guest access
2017-06-07 13:39:57 +01:00
bd76251fb5
Merge remote-tracking branch 'origin/develop' into experimental
2017-06-07 13:28:30 +01:00
53ea41e8a5
Merge branch 'develop' into new-guest-access
2017-06-07 12:08:37 +01:00
d59b0e1595
Merge pull request #1048 from matrix-org/kegan/translation-gibbon
...
Translate src/components/structures
2017-06-07 12:01:52 +01:00
ccaa55d2c8
Merge pull request #1049 from matrix-org/dbkr/ilag_cancel_join_on_login
...
Cancel 'join room' action if 'log in' is clicked
2017-06-07 11:59:45 +01:00
1dbdbc163b
Cancel 'join room' action if 'log in' is clicked
...
or 'choose different server'
We canceled the deferred action in the MatrixChat SetMxId dialog
but not the one in roomview.
Fixes https://github.com/vector-im/riot-web/issues/4217
2017-06-07 11:55:24 +01:00
558f67cb14
Translated using Weblate (Russian)
...
Currently translated at 100.0% (828 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-07 10:51:18 +00:00
4127e7121c
Translate src/components/structures
...
Includes some pluralisation! Tested them manually to make sure they work.
2017-06-07 11:40:46 +01:00
80d912bb2c
Merge pull request #4219 from vector-im/luke/css-fix-timestamp-align
...
Align message timestamp centrally about the avatar mid-point
2017-06-07 11:37:26 +01:00
65185a5fd0
Merge remote-tracking branch 'origin/new-guest-access' into experimental
2017-06-07 11:28:03 +01:00
37625faeb7
Merge pull request #4221 from vector-im/dbkr/ilag_home_url
...
Remove '/' from homepage URL
2017-06-07 11:27:39 +01:00
0a2a782d63
track the action of opt-out
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-07 11:26:52 +01:00
bd948ef915
for riot.im instances, track location.pathname
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-07 11:25:27 +01:00
090a7c5761
Remove '/' from homepage URL
...
As we are not always at the root of the web server.
2017-06-07 11:20:41 +01:00
56df54f946
hardcode logged url to riot.im/app so piwik has a base to work with, it gets confused when a CustomURL isn't actually a URL (like it wasn't after the latest redaction fixes.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-07 11:17:57 +01:00
fb358d8fd6
Merge remote-tracking branch 'origin/develop' into experimental
2017-06-07 10:59:01 +01:00
c552f7f336
App icon styling
2017-06-07 10:55:49 +01:00
9302c60b47
App icon styling
2017-06-07 10:55:35 +01:00
5c51797420
Merge remote-tracking branch 'origin/new-guest-access' into experimental
2017-06-07 10:51:25 +01:00
332a5b49a5
Merge remote-tracking branch 'origin/develop' into experimental
2017-06-07 10:51:18 +01:00
9a6e0440f9
Merge pull request #4220 from vector-im/dbkr/right_branch_chop_origin
...
Chop off 'origin/'
2017-06-07 10:50:27 +01:00
9c94f2ac14
Use bash magic instead of sed
2017-06-07 10:39:46 +01:00
b0486e333d
Chop off 'origin/'
...
when figuring out what branch we're on
2017-06-07 10:35:08 +01:00
784e52f249
Align message timestamp centrally about the avatar mid-point
...
Tested visually against any unintended changes to the alignment of e2e icons, with timestamps on 12h and 24h mode.
2017-06-07 10:19:58 +01:00
012c02ff7d
Merge remote-tracking branch 'origin/develop' into develop
2017-06-07 09:01:10 +00:00
Luke Barnard
Krombel
David Baker
Bamstam
RiotTranslate
Luke Barnard
Stanislav N
Richard van der Hoff
Richard Lewis
David Baker
Kegan Dougal
Michael Telatynski