gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,314 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

3314 Commits

Author SHA1 Message Date
David Baker b8fe8a4363 Merge branch 'develop' of github.com:vector-im/riot-web into develop 2016-12-09 18:30:38 +00:00
David Baker 6acbdc442d Actually write latest version into `latest` 2016-12-09 18:29:54 +00:00
David Baker f7cd5cb76f Update README to say how to build the desktop app 2016-12-09 18:29:06 +00:00
Richard van der Hoff e2195de719 Merge pull request #2731 from vector-im/dbkr/signing_id 
Add signing ID in release_config.yaml
 2016-12-09 17:31:46 +00:00
David Baker 3921aa4e54 Merge pull request #2722 from vector-im/dbkr/icons 
Makeover!
 2016-12-09 17:18:27 +00:00
David Baker 48ca0254fe Add signing ID in release_config.yaml 
Read by release script in js-sdk
 2016-12-09 17:13:20 +00:00
David Baker 375a7605ae Merge remote-tracking branch 'origin/develop' into dbkr/icons 2016-12-09 15:45:21 +00:00
Richard van der Hoff 8097b150a0 Merge pull request #2730 from vector-im/dbkr/fix_test_breakage 
Fix broken tests
 2016-12-09 15:44:17 +00:00
David Baker 67cf4230ac Fix broken tests 
Promises are now not being resolved within the same tick, so give
another tick for the UI to update after all the HTTP calls have
flushed through. This is fairly terrible, but I can't immediately
see a better way of doing this.
 2016-12-09 14:27:41 +00:00
Richard van der Hoff b06cff7928 Merge pull request #2727 from vector-im/dbkr/make_loading_tests_work_alone 
Make the 'loading' tests work in isolation
 2016-12-09 10:58:25 +00:00
David Baker d65374f7f9 Make the 'loading' tests work in isolation 
The 'loading' tests only worked when run with the other tests and
failed if you just ran the file by itself, because the skin was
loading in the 'joining' tests, but not here.
 2016-12-09 10:31:26 +00:00
David Baker f0b0999f65 Numeracy 2016-12-08 18:04:44 +00:00
David Baker e55845ac52 Makeover! 
Also add script for generating the PNGs and add pre-rendered PNGs
for the Linux electron build which means you don't need icns2png
to build it and the Linux icons are straight from the SVG rather
than resized bitmaps.
 2016-12-08 16:22:34 +00:00
David Baker 229693dd71 gitignore .npmrc 
(We now require a .npmrc in the riot-web dir to use the right
account when releasing)
 2016-12-08 11:41:31 +00:00
David Baker 5e8e6f4c8b Add icon missed from #2708 2016-12-08 11:40:33 +00:00
David Baker 98f9e2f870 Merge remote-tracking branch 'origin/develop' into release-v0.9.1 2016-12-07 17:18:15 +00:00
Matthew Hodgson 2b51cda6da talk to jenkins via https for the /dev redeployer 2016-12-07 14:07:31 +00:00
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 d31a675ca8 Merge remote-tracking branch 'origin/develop' into release-v0.9.1 2016-12-06 16:02:26 +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
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
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
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 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 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
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
David Baker d0c2ab4cf1 Document cross_origin_renderer_url 2016-12-02 13:43:41 +00:00
David Baker 7871a3edb5 Just rm dist in the clean step 2016-12-01 19:43:04 +00:00
David Baker 9f51e2c407 Auto-update & build process with NSIS for windows 
Amalgamate the electron build packaging into one script.
Use update_base_url so we can compute the actual URL in the
script for windows (because we need to put it in the build) and
at runtime for mac os.
 2016-12-01 19:33:42 +00:00
David Baker 2930a94c79 Change to update_base_url 2016-12-01 18:01:23 +00:00