Commit Graph

3240 Commits (219bfffea293ed3f4171df130d5f4da1464bbd12)

Author SHA1 Message Date
David Baker d5b1db064f Merge remote-tracking branch 'origin/develop' into release-v0.9.8 2017-04-11 18:48:55 +01:00
Richard van der Hoff 4efb2b6750 Rageshake: Factor out `getLogsForReport`
... in preparation for factoring out sending the report
2017-04-11 18:47:55 +01:00
Richard van der Hoff cbfa4dd1ab Get rageshake endpoint from SdkConfig instead of storing in rageshake
- in preparation for factoring out the sending of the rageshake
2017-04-11 18:46:48 +01:00
Matthew Hodgson b26c460f13 shrink the redacted tear 2017-04-10 23:22:25 +01:00
daniel tygel dd9150cef1 Merge branch 'add_config_json_to_gitignore' into develop 2017-04-10 14:12:38 -03:00
daniel tygel ab1b377a1d add config.json to .gitignore 2017-04-10 14:11:26 -03:00
David Baker 3fa8460ed7 Merge pull request #3598 from vector-im/dbkr/clear_cache_button_electron
Make the clear cache button work on desktop
2017-04-10 17:56:49 +01:00
David Baker 7f6d9a625d Make the clear cache button work on desktop
Implement reload in Platforms to support
https://github.com/matrix-org/matrix-react-sdk/pull/798

Fixes https://github.com/vector-im/riot-web/issues/3597
2017-04-10 17:40:09 +01:00
David Baker 0b266d2e83 v0.9.8-rc.2 2017-04-10 16:56:41 +01:00
David Baker 7907d41ea8 Prepare changelog for v0.9.8-rc.2 2017-04-10 16:56:40 +01:00
David Baker 32c6482dcf Bump js-sdk & react-sdk versions 2017-04-10 16:55:27 +01:00
David Baker ea0c41a9f8 Merge remote-tracking branch 'origin/develop' into release-v0.9.8 2017-04-10 16:55:02 +01:00
David Baker a1cb566761 Bump electron version 2017-04-10 16:01:21 +01:00
Luke Barnard 01a96d92f4 Merge pull request #3596 from vector-im/luke/fix-redacted-bg
Redacted events bg: black lozenge -> torn paper
2017-04-10 15:59:41 +01:00
Luke Barnard 0b1745bceb Redacted events bg: black lozenge -> torn paper 2017-04-10 15:49:40 +01:00
David Baker 7d203f40cd Merge pull request #3594 from vector-im/rav/send_app_to_rageshake
Add 'app' parameter to rageshake report
2017-04-10 15:25:55 +01:00
Richard van der Hoff b8b74402c1 Add 'app' parameter to rageshake report 2017-04-10 15:07:43 +01:00
David Baker 08ee93a57b v0.9.8-rc.1 2017-04-07 17:29:12 +01:00
David Baker bced608c48 Roll back version number to try again 2017-04-07 17:28:32 +01:00
David Baker c576e07c85 v0.9.8-rc.1 2017-04-07 17:19:08 +01:00
David Baker cc87135b28 Prepare changelog for v0.9.8-rc.1 2017-04-07 17:19:08 +01:00
David Baker a63eb2621b Prerelease js-sdk & react-sdk 2017-04-07 17:12:48 +01:00
David Baker 42e317dab8 Merge pull request #3578 from vector-im/dbkr/indexeddb_webworker
Add support for indexeddb sync in webworker
2017-04-07 16:17:39 +01:00
David Baker ec870039bf Don't use endsWith as it'll break on old node
It's a lodash template though, so use lodash
2017-04-07 14:57:02 +01:00
David Baker b65466bc4f Use dedicated indexeddb worker import 2017-04-07 14:41:41 +01:00
David Baker 515b57ba12 Update for rename of worker 2017-04-07 11:23:14 +01:00
Luke Barnard 4d4da0d7ca Merge pull request #3574 from vector-im/luke/feature-clickable-emotes
Add CSS to make Emote sender cursor : pointer
2017-04-06 15:56:45 +01:00
Luke Barnard 778e7dcab0 Add CSS to make Emote sender cursor : pointer 2017-04-06 14:11:37 +01:00
David Baker fd5e94dfad Merge pull request #3565 from vector-im/rav/remove_rageshake
Remove rageshake server
2017-04-06 12:21:33 +01:00
David Baker f187a359e6 Add support for indexeddb sync in webworker 2017-04-06 11:15:14 +01:00
Luke Barnard 579e70e967 Merge pull request #3566 from vector-im/luke/clarify-unread-msg-top-banner
Adjust CSS for matrix-org/matrix-react-sdk#789
2017-04-04 16:45:38 +01:00
Luke Barnard 3407f66e82 Adjust CSS for matrix-org/matrix-react-sdk#789 2017-04-04 16:36:05 +01:00
Richard van der Hoff 8707cca7bc Remove rageshake server
This is now at https://github.com/matrix-org/rageshake
2017-04-04 16:29:12 +01:00
Michael Telatynski 99923b7b8f Escape HTML tags in Notifications (Linux)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-03 20:30:05 +01:00
Matthew Hodgson e40c6905dd more instructions 2017-04-01 13:33:24 +01:00
Matthew Hodgson 84a0ef9695 spell out that if you're on develop you need to keep your deps up-to-date 2017-04-01 13:25:16 +01:00
Matthew Hodgson 546e2ab30b bump emojione 2017-04-01 01:28:44 +01:00
Luke Barnard 6380f1a24a Merge pull request #3537 from vector-im/luke/fix-flaky-tests-maybe
Fix tests to reflect recent changes
2017-03-29 17:32:31 +02:00
Luke Barnard e40d3852ff Fix tests to reflect recent changes
This is an attempt to reduce flakiness (see https://github.com/matrix-org/matrix-react-sdk/pull/781 also)
2017-03-29 16:07:11 +01:00
David Baker e248a7f029 Merge pull request #3536 from vector-im/luke/fix-people-unstable-ordering
Do not assume getTs will return comparable integer
2017-03-29 14:40:50 +01:00
Luke Barnard 91892ec18b Do not assume getTs will return comparable integer
Fixes https://github.com/vector-im/riot-web/issues/3529. In the worst case, tsOfNewestEvent will return MAX_SAFE_INTEGER, instead of undefined, as may be the case of some events that were redacted and persisted in indexDB before changes were made to how events are redacted locally. (The important change is that events are now not stripped of their `origin_server_ts`).
2017-03-29 14:30:08 +01:00
Richard van der Hoff ff2a9f4b20 Merge pull request #3535 from vector-im/dbkr/rename_perf
Rename ReactPerf to Perf
2017-03-29 11:53:57 +02:00
David Baker a3040e22d3 Rename ReactPerf to Perf
As this makes it work out of the box with react-perf chrome
extension (which doesn't do a whole lot other than save you having
to remember the commands, but is still quite nice).
2017-03-29 10:38:46 +01:00
David Baker 2480831e2f Merge pull request #3530 from vector-im/dbkr/email_notifs_only_to_email_addresses
Don't show phone number as target for email notifs
2017-03-28 16:40:13 +01:00
David Baker c72a49d229 More equalses 2017-03-28 16:34:35 +01:00
David Baker 83b7f94609 Don't show phone number as target for email notifs
Fixes https://github.com/vector-im/riot-web/issues/3518
2017-03-28 16:24:54 +01:00
Luke Barnard 8b50ed8006 Merge pull request #3458 from vector-im/luke/fix-people-section2
Fix people section again
2017-03-27 15:52:15 +02:00
Matthew Hodgson d696196d72 fix https://github.com/vector-im/riot-web/issues/3348 2017-03-27 12:39:58 +01:00
Luke Barnard abc5b2d5f4 UI delay in UI 2017-03-27 09:44:33 +01:00
Matthew Hodgson f4134167a0 Merge pull request #3479 from t3chguy/t3chguy/dark-theme-invert-inconsistency-fix
dark theme invert inconsistent across browsers
2017-03-25 14:06:01 +00:00