Commit Graph

62531 Commits

Author SHA1 Message Date
David Baker 4517eaba6f Merge pull request #2148 from matrix-org/dbkr/dont_say_email_optional_if_it_isnt
Correctly mark email as optional
2018-09-05 11:31:19 +01:00
Weblate f47a9f93a5 Merge remote-tracking branch 'origin/develop' into develop 2018-09-05 10:31:06 +00:00
David Baker 52bbd8c764 Merge pull request #7272 from vector-im/dbkr/mobileguide
Instructions for installing mobile apps
2018-09-05 11:31:00 +01:00
Weblate 8ef2eec504 Merge remote-tracking branch 'origin/develop' into develop 2018-09-05 10:21:41 +00:00
Bruno Windels 1c5f16c332 Merge pull request #7265 from vector-im/dbkr/make_index_js_less_of_a_dogs_dinner
Tidy up index.js
2018-09-05 12:21:35 +02:00
Weblate 4de7c466d0 Merge remote-tracking branch 'origin/develop' into develop 2018-09-05 07:15:32 +00:00
Milena Brum 562cc32860 Translated using Weblate (Spanish)
Currently translated at 100.0% (1249 of 1249 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-09-05 07:15:32 +00:00
David Baker e5b761b754 Merge pull request #2059 from matrix-org/t3chguy/join_community_fire_ilag_flow
guests trying to join communities should fire the ILAG flow.
2018-09-05 08:15:24 +01:00
Matthew Hodgson dc66c43fa1 downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57 2018-09-04 20:33:04 +01:00
Matthew Hodgson 588369d297 downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57
thanks @ZerataX! :)
2018-09-04 20:32:06 +01:00
David Baker 775d995052 Lint 2018-09-04 18:51:24 +01:00
David Baker a07799879c Fix tests 2018-09-04 18:50:18 +01:00
Milena Brum 2001fc2cd0 Translated using Weblate (Spanish)
Currently translated at 100.0% (1249 of 1249 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-09-04 17:39:18 +00:00
David Baker dc14a42148 Correctly mark email as optional
Look at the flows to see if there is one we can complete without
an email address. Mark the email address as optional iff there is.
2018-09-04 18:26:09 +01:00
Weblate 971c08f8fd Merge remote-tracking branch 'origin/develop' into develop 2018-09-04 16:17:58 +00:00
Bruno Windels a6d241c29f Merge pull request #2146 from matrix-org/bwindels/fixavatars-parttrois
Fix DM avatars, part 3
2018-09-04 18:17:52 +02:00
Bruno Windels 3b29b7aab6 fix getDMRoomsForUserId not calling _getUserToRooms first (thanks e2e tests) 2018-09-04 17:36:50 +02:00
Weblate 0c80cc143d Merge remote-tracking branch 'origin/develop' into develop 2018-09-04 14:40:37 +00:00
Bruno Windels bc97a3efb5 Merge pull request #2143 from matrix-org/bwindels/fixreconnectspinner
Fix: show spinner again while recovering from connection error
2018-09-04 16:40:30 +02:00
Weblate 61bb682c7a Merge remote-tracking branch 'origin/develop' into develop 2018-09-04 14:10:51 +00:00
csybr 37703843e0 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 97.6% (1220 of 1249 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2018-09-04 14:10:51 +00:00
Bruno Windels 2530ecbf39 Merge pull request #2147 from matrix-org/bwindels/fix-gdpr-infinispini
Fix: infinite spinner on trying to create welcomeUserId room without consent
2018-09-04 16:10:45 +02:00
Bruno Windels 44a53cfc0d use lodash for unique function instead of rolling our own 2018-09-04 16:03:15 +02:00
Bruno Windels e171296d51 patch self-chats lazily in favor of awaiting sync state 2018-09-04 16:00:40 +02:00
Bruno Windels be66f98381 use room method for checking power levels
as it is always are of the syncing user's membership
in case of lazy loading members
2018-09-04 15:35:44 +02:00
Bruno Windels 5c395e4db7 wait for room creation, to go to home page in case of failure 2018-09-04 14:26:36 +02:00
Bruno Windels abd9d3a11e fix lint 2018-09-04 13:55:29 +02:00
Bruno Windels 6c7cb380e0 add warning in console when patching rooms, so it appears in rage shakes 2018-09-04 13:12:26 +02:00
Bruno Windels 441036ff93 remove duplicates from room lists 2018-09-04 13:12:26 +02:00
Bruno Windels 245dfbf957 only put NON-guessed rooms in self-chats 2018-09-04 13:12:26 +02:00
Bruno Windels c12abab52d wait until rooms are available
as accountData get processed before rooms, during initial sync
or loading sync from cache, accountData gets emitted
before any room is available, hence our patching wasn't doing
anything. Just as well, because it would have failed (see next commits)
2018-09-04 13:12:26 +02:00
David Baker e23195fd86 Conditionally show custom server bit 2018-09-04 10:08:52 +01:00
Matthew Hodgson 1b0cafd956 Merge pull request #7274 from gusttt/patch-1
Small typo in release notes v0.16.3
2018-09-04 09:50:39 +01:00
gusttt 81a624146b Small typo in release notes v0.16.3
Fixes  #7273
2018-09-04 08:16:29 +02:00
David Baker 9c8ef4240c Instructions for installing mobile apps
Replace the native js dialog with a page telling you how to
download the apps and how to set your HS URL.
2018-09-03 20:38:30 +01:00
Weblate b59edf2690 Merge remote-tracking branch 'origin/develop' into develop 2018-09-03 13:39:35 +00:00
Andri daa3e1351b Translated using Weblate (English (United States))
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/en_US/
2018-09-03 13:39:34 +00:00
David Baker d00ca02c25 v0.16.3 v0.16.3 2018-09-03 14:34:06 +01:00
David Baker 207106ea46 Prepare changelog for v0.16.3 2018-09-03 14:34:05 +01:00
David Baker c150d97eaf v0.16.3 2018-09-03 14:29:48 +01:00
David Baker 6231cf3496 Released js-sdk & react-sdk 2018-09-03 14:28:34 +01:00
Weblate 0b11402b6b Merge remote-tracking branch 'origin/develop' into develop 2018-09-03 13:27:02 +00:00
csybr 0acb403d55 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 97.6% (1220 of 1249 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2018-09-03 13:27:01 +00:00
David Baker 727082b659 Merge branch 'master' into develop 2018-09-03 14:26:50 +01:00
David Baker 4b45c17f59 v0.13.3 2018-09-03 14:26:00 +01:00
David Baker c87406c1b2 Prepare changelog for v0.13.3 2018-09-03 14:26:00 +01:00
David Baker 3e227bb40f released matrix-js-sdk 2018-09-03 14:14:24 +01:00
Weblate e49a5a6723 Merge remote-tracking branch 'origin/develop' into develop 2018-09-03 13:05:33 +00:00
Markel a2bb08f58e Translated using Weblate (Spanish)
Currently translated at 98.8% (1235 of 1249 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-09-03 13:05:33 +00:00
Moo f86b4a6759 Translated using Weblate (Lithuanian)
Currently translated at 62.6% (782 of 1249 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2018-09-03 13:05:32 +00:00