Commit Graph

62531 Commits

Author SHA1 Message Date
David Baker 738bc4d2d5 Prepare changelog for v1.0.2-rc.3 2019-03-01 17:36:10 +00:00
David Baker 784f468d94 Merge pull request #2733 from matrix-org/travis/misc-roomlist
Misc room list improvements & invite fix
2019-03-01 17:28:30 +00:00
Travis Ralston 593bd8ff66 Merge pull request #2732 from matrix-org/travis/rageshake-errors
Convert objects and such to usable strings in rageshake
2019-03-01 10:20:23 -07:00
Travis Ralston e1f26059a7 Convert objects and such to usable strings in rageshake
Fixes https://github.com/vector-im/riot-web/issues/7844
2019-03-01 09:58:54 -07:00
Travis Ralston 3ce2c3a76d Merge pull request #2724 from matrix-org/travis/stacked-dialogs
Support stacking dialogs to prevent unmounting
2019-03-01 09:03:39 -07:00
Travis Ralston 5a4676ac66 Merge pull request #2725 from matrix-org/travis/settings/pl-dropdowns
Convert PowerSelector to use mxField instead
2019-03-01 09:03:16 -07:00
Travis Ralston f9d6d42781 Merge pull request #2726 from matrix-org/travis/settings/save-feedback
Don't re-enable the save button after saving profiles
2019-03-01 09:02:54 -07:00
Travis Ralston ad2a98926a Merge pull request #2727 from matrix-org/travis/email-notifs
Support multiple email pushers and remove the legacy UserSettingsStore
2019-03-01 09:02:36 -07:00
Bruno Windels eb33b2dcbb Merge pull request #2731 from matrix-org/bwindels/bringback528fix
Bring back #528 fix as it still seems broken on OSX
2019-03-01 16:49:52 +01:00
Bruno Windels 65807c7a66 Revert "remove test for #528 as we removed that fix"
This reverts commit 42030796c7.
2019-03-01 16:08:58 +01:00
Bruno Windels 37593c117a Revert "remove fix for old chrome bug"
This reverts commit ecb074862e.
2019-03-01 16:08:41 +01:00
David Baker ea959d5994 v1.0.2-rc.1 v1.0.2-rc.1 2019-03-01 12:22:19 +00:00
David Baker 813fdf4aad Prepare changelog for v1.0.2-rc.1 2019-03-01 12:22:18 +00:00
David Baker ab1ceff242 v1.0.2-rc.1 2019-03-01 12:20:32 +00:00
David Baker 2e3d0e50ec react-sdk rc.2 2019-03-01 12:19:28 +00:00
David Baker 9d2ef8a3cd v1.0.2-rc.2 2019-03-01 12:17:26 +00:00
David Baker e8213bc5c3 Prepare changelog for v1.0.2-rc.2 2019-03-01 12:17:25 +00:00
David Baker 4f430db981 Merge pull request #2730 from matrix-org/dbkr/langs_file_resolve_alias
Use webpack alias to resolve the languages file
2019-03-01 12:13:31 +00:00
David Baker 4a5a73597c Merge pull request #9014 from vector-im/dbkr/langs_file_resolve_alias
Set a require alias for the webapp directory
2019-03-01 12:13:28 +00:00
David Baker bf1ab7f420 Use $webapp rather than Webapp 2019-03-01 12:03:19 +00:00
David Baker 4f84311bde Use $webapp rather than Webapp 2019-03-01 12:03:04 +00:00
David Baker f2328904cd stray semicolon 2019-03-01 11:48:48 +00:00
David Baker 53aceaa412 Add fallback for languages file
So we're not completely dependent on the alias being set
2019-03-01 11:44:44 +00:00
David Baker 53e25ff247 Set a resuire alias for the webapp directory
So languagehandler can pull the languages json from there
2019-03-01 11:32:37 +00:00
David Baker 63c6f600bf Use webpack alias to resolve the languages file
Hopefully this will end up simpler than having to figure out in
riot-web what the relative path is from react-sdk's
src/languageHandler.js to riot-web's webapp directory.
2019-03-01 11:30:50 +00:00
Bruno Windels 60c4c55010 Merge pull request #2721 from matrix-org/bwindels/e2emembericonmargin
Fix margin on e2e icon in member panel
2019-03-01 11:11:14 +01:00
Bruno Windels fe3fe208e1 Merge pull request #2676 from matrix-org/bwindels/improvedscrolling
Improved scrolling & pagination
2019-03-01 11:09:23 +01:00
Michael Telatynski eb46e62a2e delint NetworkDropdown
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-03-01 09:39:39 +00:00
J. Ryan Stinnett 48015aa36d Merge pull request #8991 from vector-im/jryans/nudge-karma
Nudge karma to 3.1.2
2019-03-01 09:37:07 +00:00
J. Ryan Stinnett 0bc4243215 Merge pull request #2719 from matrix-org/jryans/nudge-karma
Nudge karma to 3.1.2
2019-03-01 09:36:57 +00:00
Michael Telatynski 6b07195b63 Add missing permalinkCreator prop
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-03-01 09:36:36 +00:00
Michael Telatynski 01becf00f5 Try and improve README
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-03-01 08:01:26 +00:00
Michael Telatynski baa034230f Merge pull request #8983 from vector-im/t3chguy/local-config
Add support for localConfig at $appData/config.json.
2019-03-01 07:54:49 +00:00
Travis Ralston 7d207ca2c3 speeling 2019-02-28 20:45:31 -07:00
Travis Ralston 9402e81835 Get confirmation before enabling encryption
Fixes https://github.com/vector-im/riot-web/issues/8843
2019-02-28 20:39:07 -07:00
Travis Ralston 12d939b36f Support multiple email pushers and remove the legacy UserSettingsStore
Fixes https://github.com/vector-im/riot-web/issues/5496
Fixes https://github.com/vector-im/riot-web/issues/8424
2019-02-28 19:57:45 -07:00
Travis Ralston b84b11d3bd Don't re-enable the save button after saving profiles
Fixes https://github.com/vector-im/riot-web/issues/8569
2019-02-28 19:13:28 -07:00
Travis Ralston a41df7ab68 Convert PowerSelector to use mxField instead 2019-02-28 19:00:57 -07:00
Travis Ralston 0978ab3da0 Support stacking dialogs to prevent unmounting
Fixes https://github.com/vector-im/riot-web/issues/8371
2019-02-28 15:55:58 -07:00
Travis Ralston 8d7837829e Merge pull request #2722 from matrix-org/travis/misc-roomlist
Misc room list improvements & invite fix
2019-02-28 15:13:06 -07:00
Travis Ralston 940ba51f9f Merge pull request #2723 from matrix-org/travis/destate-stickerpicker
Stop listening to account data when the stickerpicker is unmounted
2019-02-28 15:01:43 -07:00
Travis Ralston b5ffd4a538 Stop listening to account data when the stickerpicker is unmounted
Fixes https://github.com/vector-im/riot-web/issues/8994
2019-02-28 14:15:01 -07:00
Travis Ralston 805676a511 Don't lose invites when multiple are pending 2019-02-28 14:03:28 -07:00
Travis Ralston 872cdaa9b3 Use the already available state for checking if custom tags are enabled 2019-02-28 14:03:28 -07:00
Travis Ralston b1e16e9f49 Fix stacktrace when starting riot up with rooms
Settings can trigger before we're ready, so don't generate the room list. This also includes a comment to signify to future people that we need to track settings still.
2019-02-28 13:55:20 -07:00
Travis Ralston b2f4de4488 Merge pull request #2716 from matrix-org/travis/what-even-is-a-category
Move complex part of room sorting to a dedicated function
2019-02-28 13:36:09 -07:00
Travis Ralston a3342a5790 Standardize on "Category" being the canonical term for room list sections 2019-02-28 13:24:05 -07:00
Bruno Windels 0c06a702dc pr feedback 2019-02-28 16:05:55 +01:00
David Baker 6206b1d073 js-sdk & react-sdk rc.1 2019-02-28 14:51:51 +00:00
David Baker 52a2fe1c9c v1.0.2-rc.1 2019-02-28 14:43:36 +00:00