8757c8cae0
move notif UTs to sdk
2018-04-12 20:24:44 +01:00
e899fece3c
move themes to res to match sdk
2018-04-12 20:21:26 +01:00
659e71e150
Merge remote-tracking branch 'origin/develop' into develop
2018-04-12 12:08:16 +00:00
a70f3fe622
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (221 of 221 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2018-04-12 12:08:15 +00:00
c8a3471135
Merge branch 'master' into develop
2018-04-12 13:07:09 +01:00
740b221769
v0.14.1
2018-04-12 13:02:27 +01:00
e455453bcd
Prepare changelog for v0.14.1
2018-04-12 13:02:26 +01:00
7a2866feb9
v0.14.1
2018-04-12 12:59:27 +01:00
c631858ab3
Bump js-sdk & react-sdk
2018-04-12 12:57:04 +01:00
8dd616462a
Revert "Merge pull request #5286 from turt2live/travis/presence"
...
This reverts commit 3e72d8d969
2018-04-12 12:56:23 +01:00
29ebb5ceea
Merge remote-tracking branch 'origin/develop' into develop
2018-04-12 11:55:26 +00:00
7e977d0016
Merge branch 'master' into develop
2018-04-12 12:54:46 +01:00
c06fc31bb2
v0.12.2
2018-04-12 12:50:52 +01:00
4a1d0fc8ab
Prepare changelog for v0.12.2
2018-04-12 12:50:51 +01:00
f38bb1f2c2
Bump js-sdk
2018-04-12 12:40:33 +01:00
3f069af067
Also remove the setting
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2018-04-12 12:40:07 +01:00
91a41392b4
Remove presence management
...
The feature is incredibly buggy and doesn't work as expected due to server behaviour and client interaction. One of the major problems is the constantly confused presence state - this is caused by the mobile apps conflicting on the state of the web app, causing it to consider the user offline or online (and rarely away) depending on how riot-android/ios is behaving at the time.
This reverts two PRs:
* https://github.com/matrix-org/matrix-react-sdk/pull/1620
* https://github.com/matrix-org/matrix-react-sdk/pull/1482
The changes to the context menu positioning were not reverted as they are useful outside of presence management.
Signed-off-by: Travis Ralston <travpc@gmail.com >
2018-04-12 12:36:51 +01:00
760f21b1d9
Put Tinter loop body in a try/catch
...
So whatever other random ways this process fails in don't cause it
to take out the whole app.
2018-04-12 12:23:33 +01:00
5f2d9b6c54
Null check stylesheet href
...
As commented
Fixes https://github.com/vector-im/riot-web/issues/6489
2018-04-12 12:23:24 +01:00
8a8a37cef0
Merge remote-tracking branch 'origin/develop' into develop
2018-04-12 10:47:27 +00:00
1c7ff85a4c
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 79.8% (807 of 1011 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-04-12 10:47:26 +00:00
d0827586e6
Merge pull request #1676 from turt2live/travis/remove-presence
...
Remove presence management
2018-04-12 11:47:21 +01:00
03ee99281f
Merge remote-tracking branch 'origin/develop' into develop
2018-04-12 10:46:34 +00:00
fa1e383db1
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (221 of 221 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2018-04-12 10:46:33 +00:00
976c818406
Merge pull request #5881 from turt2live/travis/remove-presence
...
Remove presence management
2018-04-12 11:46:26 +01:00
c77807bd22
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
# Conflicts:
# src/i18n/strings/en_EN.json
# src/i18n/strings/eu.json
# src/i18n/strings/fr.json
# src/i18n/strings/lv.json
# src/i18n/strings/ru.json
# src/i18n/strings/zh_Hant.json
2018-04-12 09:48:06 +01:00
8371774d13
move default ringtones over from riot-web
2018-04-12 00:25:36 +01:00
8ce4df7ce3
move non-Riot image resources over from riot-web
2018-04-12 00:25:07 +01:00
848403a0ab
move default fonts over from riot-web
2018-04-12 00:24:51 +01:00
cdb5d489a4
organise themes (even light & dark) in the SDK layer
2018-04-12 00:24:22 +01:00
79d3cca6e9
move components' CSS to be in the same repo as their JS
2018-04-12 00:23:58 +01:00
70f3804227
move room directory logic over from riot-web
2018-04-11 23:58:46 +01:00
178fb647ad
move notifications logic over from riot-web
2018-04-11 23:58:37 +01:00
8ab8f76254
move non-Riot-specific components over from riot-web
2018-04-11 23:58:04 +01:00
3ecbfae371
move everything not explicitly riot (or status) branded into matrix-react-sdk
2018-04-11 23:49:52 +01:00
5845a1ec7a
Merge branch 'develop' into travis/remove-presence
2018-04-11 15:18:30 -06:00
fe2cbc584d
Merge branch 'develop' into travis/remove-presence
2018-04-11 15:17:28 -06:00
a2a7668840
Merge remote-tracking branch 'origin/develop' into develop
2018-04-11 17:40:48 +00:00
979452628f
Merge pull request #1835 from matrix-org/dbkr/fix_firefox_extension_death
...
Null check stylesheet href
2018-04-11 18:40:43 +01:00
dbed29a7cc
Put Tinter loop body in a try/catch
...
So whatever other random ways this process fails in don't cause it
to take out the whole app.
2018-04-11 18:31:54 +01:00
91024007aa
Null check stylesheet href
...
As commented
Fixes https://github.com/vector-im/riot-web/issues/6489
2018-04-11 18:20:40 +01:00
e8e1fd933f
Merge remote-tracking branch 'origin/develop' into develop
2018-04-11 14:47:48 +00:00
ab578a5c0c
Merge pull request #1819 from pvagner/jump_to_first_unread_a11y
...
TopUnreadMessagesBar a11y
2018-04-11 15:47:43 +01:00
edcf516cef
Merge remote-tracking branch 'origin/develop' into develop
2018-04-11 11:05:13 +00:00
8644a5ead9
Merge branch 'master' into develop
2018-04-11 12:04:58 +01:00
eaeb495349
v0.14.0
2018-04-11 12:01:45 +01:00
1b602495b1
Prepare changelog for v0.14.0
2018-04-11 12:01:44 +01:00
b2a0031fe1
v0.14.0
2018-04-11 11:57:33 +01:00
1f7ee7cf2c
Merge remote-tracking branch 'origin/develop' into develop
2018-04-11 10:55:35 +00:00
1c6c180908
Merge branch 'master' into develop
2018-04-11 11:55:24 +01:00
Matthew Hodgson
Weblate
Gergely Bakos
David Baker
Travis Ralston
RainSlide
Matthew Hodgson
Michael Telatynski
David Baker
Luke Barnard
Luke Barnard