63695 Commits

Author SHA1 Message Date
Richard van der Hoff 65a31cc8a9 Merge pull request #2708 from vector-im/dbkr/png_icon_on_linux
Use a PNG for the icon on non-Windows
2016-12-07 11:23:10 +00:00
David Baker 737f912abb Use a PNG for the icon on non-Windows
MATE desktop env (and presumably other GNOMEs don't support ICOs,
so use a PNG.

Fixes https://github.com/vector-im/riot-web/issues/2705
2016-12-07 11:19:51 +00:00
Matthew Hodgson f6957aa367 Merge pull request #2703 from uhoreg/patch-1
Add missing brackets to call to toUpperCase
2016-12-07 09:24:11 +00:00
Hubert Chathi ad79f67ab6 Add missing brackets to call to toUpperCase 2016-12-06 22:36:42 -05:00
David Baker a9fcf106ab v0.9.1-rc.2 2016-12-06 16:06:15 +00:00
David Baker 0f47c9956c Prepare changelog for v0.9.1-rc.2 2016-12-06 16:06:14 +00:00
David Baker d4ac5f829f react-sdk rc.2 2016-12-06 16:04:46 +00:00
David Baker a297015d27 v0.8.1-rc.2 2016-12-06 16:04:05 +00:00
David Baker a8a07a01de Prepare changelog for v0.8.1-rc.2 2016-12-06 16:04:05 +00:00
David Baker d31a675ca8 Merge remote-tracking branch 'origin/develop' into release-v0.9.1 2016-12-06 16:02:26 +00:00
David Baker 1006d50a0d Merge remote-tracking branch 'origin/develop' into release-v0.8.1 2016-12-06 16:02:14 +00:00
Richard van der Hoff 587325b36c Merge pull request #585 from matrix-org/dbkr/fix_exception_roomdir
Fix exception when clearing room dir search
2016-12-06 15:58:07 +00:00
David Baker fe0dc85d66 Merge pull request #583 from matrix-org/luke/fix-post-message-api-origin-check
Allow integration UI URLs with paths
2016-12-06 15:00:26 +00:00
David Baker 9e3c94edf4 Fix exception when clearing room dir search
Needed more isMounted checks after promises return.
2016-12-06 14:59:10 +00:00
Richard van der Hoff b3f642e835 Merge pull request #584 from matrix-org/dbkr/search_box_field_name
Give the search box field a name
2016-12-06 14:48:25 +00:00
Richard van der Hoff 96f620829f Merge pull request #2700 from vector-im/dbkr/fix_notification_click
Fix clicking on notifications
2016-12-06 14:47:41 +00:00
Richard van der Hoff 004b420eaa Merge pull request #582 from matrix-org/dbkr/fix_notification_click
Pass the room object into displayNotification
2016-12-06 14:47:37 +00:00
David Baker a3ab59832e Give the search box field a name
Should fix https://github.com/vector-im/riot-web/issues/2462
2016-12-06 14:40:09 +00:00
Luke Barnard ef1cb9530f Allow integration UI URLs with paths
The postMessage API assumed that event origins contained paths of their window origins, but they do not (https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage). This changes the origin check such that the integrations UI URL must start with the event origin.
2016-12-06 14:30:21 +00:00
David Baker 5fa0f62ccc Fix clicking on notifications
* Dismiss the notification when it's clicked
 * Accept the room object: we need it to view_room
 * Desktop app: Un-minimise when notification clicked
 * Desktop App: Set App User Model ID so notifications work on
   Windows 8!
2016-12-06 13:28:59 +00:00
David Baker 28e663dd48 Pass the room object into displayNotification
It needs it to do the view_room if the notification is clicked.
2016-12-06 13:27:36 +00:00
Richard van der Hoff b825862f95 Merge pull request #2697 from vector-im/dbkr/show_when_ready
Only show window when ready
2016-12-06 09:59:32 +00:00
Richard van der Hoff c0b931a837 Merge pull request #581 from matrix-org/dbkr/dont_crash_settings_if_no_e2e
Don't throw an exception entering settings page
2016-12-06 09:49:55 +00:00
David Baker 8d06b54091 Only show window when ready
Avoids it sitting there for a short period with no spinner while
it parses the js.
2016-12-06 09:45:31 +00:00
David Baker 6777e07a41 Remove device name from crypto section
As it was getting it by assuming our device was the first one,
which is just not a valid assumption.
2016-12-05 20:03:43 +00:00
David Baker 8ffe14881e Don't throw an exception entering settings page
if end to end encryption is disabled (eg. if you're a guest and
the server is too old to support e2e for guests).
2016-12-05 18:33:38 +00:00
David Baker df5143c818 v0.9.1-rc.1 2016-12-05 18:02:03 +00:00
David Baker ca6a3a2ad9 Prepare changelog for v0.9.1-rc.1 2016-12-05 18:02:03 +00:00
David Baker 6934b7ed56 released js-sdk & react-sdk 2016-12-05 17:53:06 +00:00
David Baker 66f72e674b v0.8.1-rc.1 2016-12-05 17:51:04 +00:00
David Baker b348dfa382 Prepare changelog for v0.8.1-rc.1 2016-12-05 17:51:03 +00:00
David Baker 6693817cdb released js-sdk 2016-12-05 17:47:54 +00:00
David Baker 987822bd5a typo in cp destination 2016-12-05 17:27:30 +00:00
David Baker 189c8aca79 Remove redundant line getting version
As there is no latest.yml now
2016-12-05 17:15:48 +00:00
David Baker b6aa7f430c Merge pull request #2653 from vector-im/dbkr/electron_dist_tweaks
Final bits to prepare electron distribtion:
2016-12-05 16:22:44 +00:00
David Baker d8e772cfc4 Merge pull request #2692 from vector-im/dbkr/repo-rename-riot
Update name & repo to reflect renamed repository
2016-12-05 16:22:33 +00:00
David Baker ec959f0052 Update name & repo to reflect renamed repository
Unsure whether we want to go through doing a complete
s/vector/riot/ - I'm not sure there's a whole lot of point.
2016-12-05 14:40:06 +00:00
David Baker 3d813e68e9 gitignore electron/pub 2016-12-05 14:20:26 +00:00
David Baker 37b4734bbe Also re-add installer spinner 2016-12-05 14:19:49 +00:00
David Baker b613a742f5 Forgot to re-add squirrelhooks 2016-12-05 14:17:22 +00:00
David Baker 72de35a2a1 Switch back to Squirrel installer
which it turns out is by far the lesser of two evils.

 * Auto-update works with a proxy
 * The update process is reasonably atomic & faster, rather than
   running the uninstaller then the installer, leaving you with a
   broken install if you shut down your machine at the wrong time
 * Gets the update URL the same way as on mac, rather than baking
   it into the app at build time from package.json. We don't want
   it in package.json because only our builds want our update URL.
2016-12-05 14:08:27 +00:00
Matthew Hodgson 61cf08ca1b Merge pull request #579 from kyrias/irc-strip-click
Strip (IRC) when clicking on username
2016-12-03 01:17:33 +00:00
Johannes Löthberg f321c6c346 Strip (IRC) when clicking on username
Fixes vector-im/riot-web#2072.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-03 01:20:50 +01:00
David Baker 970a029cea Merge remote-tracking branch 'origin/develop' into dbkr/electron_dist_tweaks 2016-12-02 14:32:31 +00:00
David Baker d5a5abe202 Merge pull request #2680 from vector-im/dbkr/document_cross_origin_renderer_url
Document cross_origin_renderer_url
2016-12-02 14:31:45 +00:00
Richard van der Hoff 6ff253d0d8 Empty commit
to test Jenkins
2016-12-02 14:27:34 +00:00
David Baker 749d26c8f4 Link to the repo which it turns out is a thing 2016-12-02 14:25:20 +00:00
David Baker f1998497f2 Put the riot.im config back in this repo 2016-12-02 14:21:33 +00:00
Mark Haines 81e429eb14 Fix e2e attachment download by using iframes. (#562)
* Render attachments inside iframes.

* Fix up the image and video views

* Fix m.audio

* Comments, and only use the cross domain renderer if the attachment is encrypted

* Fix whitespace

* Don't decrypt file attachments immediately

* Use https://usercontent.riot.im/v1.html by default

* typos

* Put the config in the React context.

Use it in MFileBody to configure the cross origin renderer URL.

* Call it appConfig in the context

* Return the promises so they don't get dropped
2016-12-02 14:21:07 +00:00
David Baker d0c2ab4cf1 Document cross_origin_renderer_url 2016-12-02 13:43:41 +00:00