52cf1f6a4b
Missed a wire_onclick
2016-12-15 16:36:14 +00:00
61f9966fe0
Merge pull request #2747 from vector-im/dbkr/third_party_filter
...
Support room dir 3rd party network filtering
2016-12-15 16:21:28 +00:00
5f7cdb8d42
s/wire_onclick/handleClicks/
...
and actually pass handleClicks false as appropriate
2016-12-15 14:29:16 +00:00
901c0e7e41
Remove unused event params
2016-12-15 14:24:55 +00:00
98cad8779c
Add instance_id to initial state
2016-12-15 10:42:11 +00:00
fc597ba86e
Underscore for private method
2016-12-15 10:41:22 +00:00
f5bd8abfda
Support room dir 3rd party network filtering
...
As per https://github.com/matrix-org/synapse/pull/1676
The existing local config system still exists and is used for
remote home server directories (since /thirdparty/protocols
doesn't support listing remote home servers, and also because
people are using it).
2016-12-14 15:41:15 +00:00
8be72e6c27
Configure olm memory size
...
16M is somewhat excessive: configure olm to use a bit less.
Requires changes to the olm library to do anything useful, but will be harmless
without them.
Partial fix to vector-im/riot-web#2726 .
2016-12-14 11:59:37 +00:00
2740013625
RELEASES is for update, not install
2016-12-13 10:24:32 +00:00
119e03b64f
Get the update base URL right
...
and update the text in the README.
2016-12-12 17:24:22 +00:00
c6dbeee245
ico needs to be at least 256x256
2016-12-09 22:33:20 +00:00
feb3a13a71
Get version after we've checked out...
2016-12-09 20:23:19 +00:00
c80d1c15d2
dev js-sdk & react-sdk
2016-12-09 20:12:37 +00:00
b9ba795cb0
v0.9.1
2016-12-09 20:05:41 +00:00
598b841bf7
Prepare changelog for v0.9.1
2016-12-09 20:05:41 +00:00
93b3857a9b
Merge branch 'develop' into release-v0.9.1
2016-12-09 20:03:10 +00:00
5414b5d189
Released js-sdk & react-sdk
2016-12-09 19:58:33 +00:00
b4e362d700
Bump to electron 1.4.11
2016-12-09 19:14:59 +00:00
eabb91da1e
Merge pull request #2732 from vector-im/dbkr/desktop_readme
...
Update README to say how to build the desktop app
2016-12-09 19:06:14 +00:00
fe574b008b
Credit aviral & other options for native riot
2016-12-09 19:05:25 +00:00
b8fe8a4363
Merge branch 'develop' of github.com:vector-im/riot-web into develop
2016-12-09 18:30:38 +00:00
6acbdc442d
Actually write latest version into `latest`
2016-12-09 18:29:54 +00:00
f7cd5cb76f
Update README to say how to build the desktop app
2016-12-09 18:29:06 +00:00
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
3921aa4e54
Merge pull request #2722 from vector-im/dbkr/icons
...
Makeover!
2016-12-09 17:18:27 +00:00
48ca0254fe
Add signing ID in release_config.yaml
...
Read by release script in js-sdk
2016-12-09 17:13:20 +00:00
375a7605ae
Merge remote-tracking branch 'origin/develop' into dbkr/icons
2016-12-09 15:45:21 +00:00
8097b150a0
Merge pull request #2730 from vector-im/dbkr/fix_test_breakage
...
Fix broken tests
2016-12-09 15:44:17 +00:00
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
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
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
f0b0999f65
Numeracy
2016-12-08 18:04:44 +00:00
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
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
5e8e6f4c8b
Add icon missed from #2708
2016-12-08 11:40:33 +00:00
98f9e2f870
Merge remote-tracking branch 'origin/develop' into release-v0.9.1
2016-12-07 17:18:15 +00:00
2b51cda6da
talk to jenkins via https for the /dev redeployer
2016-12-07 14:07:31 +00:00
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
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
f6957aa367
Merge pull request #2703 from uhoreg/patch-1
...
Add missing brackets to call to toUpperCase
2016-12-07 09:24:11 +00:00
ad79f67ab6
Add missing brackets to call to toUpperCase
2016-12-06 22:36:42 -05:00
a9fcf106ab
v0.9.1-rc.2
2016-12-06 16:06:15 +00:00
0f47c9956c
Prepare changelog for v0.9.1-rc.2
2016-12-06 16:06:14 +00:00
d4ac5f829f
react-sdk rc.2
2016-12-06 16:04:46 +00:00
d31a675ca8
Merge remote-tracking branch 'origin/develop' into release-v0.9.1
2016-12-06 16:02:26 +00:00
96f620829f
Merge pull request #2700 from vector-im/dbkr/fix_notification_click
...
Fix clicking on notifications
2016-12-06 14:47:41 +00:00
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
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
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
df5143c818
v0.9.1-rc.1
2016-12-05 18:02:03 +00:00
David Baker