Commit Graph

62531 Commits

Author SHA1 Message Date
David Baker f38bb1f2c2 Bump js-sdk 2018-04-12 12:40:33 +01:00
Travis Ralston 3f069af067 Also remove the setting
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-04-12 12:40:07 +01:00
Travis Ralston 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
David Baker 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
David Baker 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
Weblate 8a8a37cef0 Merge remote-tracking branch 'origin/develop' into develop 2018-04-12 10:47:27 +00:00
RainSlide 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
Matthew Hodgson d0827586e6 Merge pull request #1676 from turt2live/travis/remove-presence
Remove presence management
2018-04-12 11:47:21 +01:00
Weblate 03ee99281f Merge remote-tracking branch 'origin/develop' into develop 2018-04-12 10:46:34 +00:00
RainSlide 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
Matthew Hodgson 976c818406 Merge pull request #5881 from turt2live/travis/remove-presence
Remove presence management
2018-04-12 11:46:26 +01:00
Michael Telatynski 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
Matthew Hodgson 8371774d13 move default ringtones over from riot-web 2018-04-12 00:25:36 +01:00
Matthew Hodgson 8ce4df7ce3 move non-Riot image resources over from riot-web 2018-04-12 00:25:07 +01:00
Matthew Hodgson 848403a0ab move default fonts over from riot-web 2018-04-12 00:24:51 +01:00
Matthew Hodgson cdb5d489a4 organise themes (even light & dark) in the SDK layer 2018-04-12 00:24:22 +01:00
Matthew Hodgson 79d3cca6e9 move components' CSS to be in the same repo as their JS 2018-04-12 00:23:58 +01:00
Matthew Hodgson 70f3804227 move room directory logic over from riot-web 2018-04-11 23:58:46 +01:00
Matthew Hodgson 178fb647ad move notifications logic over from riot-web 2018-04-11 23:58:37 +01:00
Matthew Hodgson 8ab8f76254 move non-Riot-specific components over from riot-web 2018-04-11 23:58:04 +01:00
Matthew Hodgson 3ecbfae371 move everything not explicitly riot (or status) branded into matrix-react-sdk 2018-04-11 23:49:52 +01:00
Travis Ralston 5845a1ec7a Merge branch 'develop' into travis/remove-presence 2018-04-11 15:18:30 -06:00
Travis Ralston fe2cbc584d Merge branch 'develop' into travis/remove-presence 2018-04-11 15:17:28 -06:00
Weblate a2a7668840 Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 17:40:48 +00:00
David Baker 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
David Baker 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
David Baker 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
Weblate e8e1fd933f Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 14:47:48 +00:00
Luke Barnard ab578a5c0c Merge pull request #1819 from pvagner/jump_to_first_unread_a11y
TopUnreadMessagesBar a11y
2018-04-11 15:47:43 +01:00
Weblate edcf516cef Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 11:05:13 +00:00
Luke Barnard 8644a5ead9 Merge branch 'master' into develop 2018-04-11 12:04:58 +01:00
Luke Barnard eaeb495349 v0.14.0 v0.14.0 2018-04-11 12:01:45 +01:00
Luke Barnard 1b602495b1 Prepare changelog for v0.14.0 2018-04-11 12:01:44 +01:00
Luke Barnard b2a0031fe1 v0.14.0 2018-04-11 11:57:33 +01:00
Weblate 1f7ee7cf2c Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 10:55:35 +00:00
Luke Barnard 1c6c180908 Merge branch 'master' into develop 2018-04-11 11:55:24 +01:00
Luke Barnard 1adb82b985 v0.12.1 2018-04-11 11:54:54 +01:00
Luke Barnard d392eef6a8 Prepare changelog for v0.12.1 2018-04-11 11:54:53 +01:00
Luke Barnard 478c2bab33 Bump js-sdk version to 0.10.0 2018-04-11 11:51:16 +01:00
Luke Barnard 5fc37032ad Bump js-sdk to 0.10.0, react-sdk to 0.12.1 2018-04-11 11:42:56 +01:00
Weblate fd73e8ce9e Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 10:33:06 +00:00
Luke Barnard 428cae34eb Merge branch 'master' into develop
(Releasing v0.12.0)
2018-04-11 11:32:05 +01:00
Luke Barnard 87d0c4b45a v0.12.0 2018-04-11 11:31:31 +01:00
Luke Barnard f4d3e6fabf Prepare changelog for v0.12.0 2018-04-11 11:31:30 +01:00
Weblate 6b9159f3fa Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 10:21:24 +00:00
Luke Barnard d877384d64 Merge pull request #593 from matrix-org/luke/fix-render-1-1-avatars-when-others-leave
Use correct 1-1 room avatar after users leave
2018-04-11 11:21:18 +01:00
Luke Barnard a142f4405a Revert "Use GeminiScrollbarWrapper in Flair settings of UserSettings"
This reverts commit 3b5fb3ae30.
2018-04-11 10:41:11 +01:00
Matthew Hodgson 8b2446f803 rename createGroupButton to not be a total misnomer... 2018-04-11 10:24:28 +01:00
Matthew Hodgson 65a500c047 remove spurious opacity from createGroupButton and rename it to not be a total misnomer... 2018-04-11 10:22:14 +01:00
Luke Barnard 3b5fb3ae30 Use GeminiScrollbarWrapper in Flair settings of UserSettings 2018-04-11 10:09:49 +01:00