Commit Graph

3035 Commits

Author SHA1 Message Date
rh389 345d81dad9 Change vocabulary desired/manifest -> required/lockfile.
Change appenders to getters.
2017-10-24 13:29:04 +01:00
rh389 a5eed7297b Tidy up shouldSkipAcquire, skip manifest check on --force 2017-10-24 13:05:42 +01:00
rh389 410db7da3c Add a .manifest.list to target. Skip download/extract if target manifest matches. 2017-10-24 02:49:41 +01:00
Yavor Georgiev 2df308ae64 refactor OpenSSL static linking (#1420) 2017-10-23 16:45:34 +03:00
Kenneth Geisshirt 3cac5ae451 [2.0.1] Bump version 2017-10-23 13:49:54 +02:00
Kenneth Geisshirt 7aee9a01c0 Upgrading to Realm Sync 2.1.0. (#1426) 2017-10-23 13:45:42 +02:00
blagoev bbcf5195c2 [2.0.0] Bump version (1) 2017-10-17 01:27:39 +03:00
blagoev 70ee478d36 Merge pull request #1421 from realm/revert-pr-1409
Revert "Merge pull request #1409 from realm/kneth/bugfix/invalid-token"
2017-10-17 01:00:20 +03:00
blagoev 0b5aa68c62 Revert "Merge pull request #1409 from realm/kneth/bugfix/invalid-token"
This reverts commit 4055c9e047, reversing
changes made to d6b3fcb8b1.
2017-10-17 00:51:47 +03:00
blagoev 32a53cd3e5 [2.0.0] Bump version 2017-10-16 22:51:30 +03:00
blagoev eef7fcff0f Merge pull request #1417 from realm/consolidate-2.0
Consolidate 2.0 changes
2017-10-16 22:27:50 +03:00
blagoev 544d2c3fee Merge pull request #1419 from realm/use-latest-ros-2.0
Use latest pos 2.0 rc
2017-10-16 22:27:26 +03:00
blagoev 346a1444ce revert xcode project 2017-10-16 22:15:39 +03:00
blagoev bb0a6ecdca enable xcode nvm support 2017-10-16 21:47:49 +03:00
blagoev a8ac2670ea fix encryption tests 2017-10-16 21:47:35 +03:00
blagoev 9dad53dd88 latest ros 2.0 compat 2017-10-16 18:14:15 +03:00
blagoev b684ea8087 fix latest ros compat 2017-10-16 17:56:27 +03:00
blagoev 81bf83278d Use latest pos 2.0 rc 2017-10-16 17:20:39 +03:00
Brian Munkholm 546387cc36 Update CHANGELOG.md 2017-10-16 16:16:55 +02:00
Brian Munkholm 155bcd674d Update CHANGELOG.md 2017-10-16 15:39:17 +02:00
blagoev 3857a19c74 Consolidate 2.0 changes 2017-10-16 16:26:46 +03:00
blagoev de6cec442e intermediate 2.0 changes consolidation 2017-10-16 16:20:47 +03:00
blagoev 2a20bc96e8 Merge pull request #1415 from realm/fix-partial-sync-config-ts-definition
fix partial in ts definitions
2017-10-16 15:17:33 +03:00
blagoev 863e80643b Merge branch 'master' into fix-partial-sync-config-ts-definition 2017-10-16 15:17:19 +03:00
blagoev 53267f99a2 Add changeling entry 2017-10-16 15:16:16 +03:00
Brian Munkholm 4055c9e047 Merge pull request #1409 from realm/kneth/bugfix/invalid-token
adminUser() throws an exception if token or url is invalid
2017-10-16 14:10:57 +02:00
blagoev f534d64382 fix partial in ts definitions 2017-10-16 12:48:07 +03:00
Yavor Georgiev d6b3fcb8b1 Link against OpenSSL when building for Electron (#1413) 2017-10-16 11:02:35 +02:00
Kenneth Geisshirt a99e433d0a Merge branch 'master' of github.com:realm/realm-js into kneth/bugfix/invalid-token 2017-10-13 18:26:30 +02:00
Kenneth Geisshirt 7e85220e47 Merge branch 'kneth/bugfix/invalid-token' of github.com:realm/realm-js into kneth/bugfix/invalid-token 2017-10-13 18:18:05 +02:00
Kenneth Geisshirt 28c51335d2 Ugly hack. 2017-10-13 18:12:30 +02:00
Brian Munkholm 4b564c9ded Update user-tests.js 2017-10-13 17:26:14 +02:00
Brian Munkholm 2284b3c4c3 Update sync.js 2017-10-13 17:23:46 +02:00
Kenneth Geisshirt a183991a7f Wrongly merged (#1412) 2017-10-13 16:36:30 +02:00
Kenneth Geisshirt 068dc95606 [2.0.0-rc22] Bump version 2017-10-13 14:44:22 +02:00
Kenneth Geisshirt fca7cd4566 wip 2017-10-13 14:39:28 +02:00
Brian Munkholm 6b635ce8d4 Update to latest Sync 2.0.2 and ROS rc.5 (#1411)
* Update to latest Sync 2.0.2 and ROS rc.5
* Update CHANGELOG.md
2017-10-13 14:08:25 +02:00
Brian Munkholm bf731a19f3 Merge pull request #1349 from realm/yg/windows-sync
Sync for Windows
2017-10-13 00:34:16 +02:00
Yavor Georgiev 7efcc7e594
Merge branch 'master' of github.com:realm/realm-js into yg/windows-sync
# Conflicts:
#	dependencies.list
2017-10-12 21:43:10 +02:00
Yavor Georgiev cec0cc744c
define ssize_t the right way on windows 2017-10-12 20:25:21 +02:00
Kenneth Geisshirt ef4057806c [2.0.0-rc21] Bump version 2017-10-12 20:15:44 +02:00
Mark Rowe 35f5116553 Merge pull request #1408 from realm/mar/override-server
Add the ability to override the server that's used by a given sync session
2017-10-12 10:50:33 -07:00
Yavor Georgiev 308e7fe548
fix download-realm to account for lightweight tags 2017-10-12 19:19:06 +02:00
Yavor Georgiev daa9c69f09
bump core and sync 2017-10-12 18:03:25 +02:00
Kenneth Geisshirt 7ff7966e0d update to latest sync 2017-10-12 17:58:16 +02:00
Yavor Georgiev 91421b1220
bump OS 2017-10-12 16:58:25 +02:00
Yavor Georgiev feab6b2e3b
disable async tests on windows
interprocess communication seems to be broken
2017-10-12 16:57:19 +02:00
Kenneth Geisshirt edd4f3186d Trying of latest sync 2017-10-12 16:34:54 +02:00
Kenneth Geisshirt 16957f62eb adminUser() throws an exception if token or url is invalid 2017-10-12 16:30:31 +02:00
Yavor Georgiev 5d2ee561a1
Disable sync tests on Windows 2017-10-12 16:06:24 +02:00