status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #971 from realm/al/notifier-fix 

Use notifier fix in latest object store, update core & sync
This commit is contained in:
Radu Tutueanu 2017-04-19 13:20:42 +03:00 committed by GitHub
parent aa506935a5 e1479026c6
commit ba0b298244
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dependencies.list
View File

@ -1,5 +1,5 @@
PACKAGE_NAME=realm-js PACKAGE_NAME=realm-js
VERSION=1.2.0 VERSION=1.2.0
REALM_CORE_VERSION=2.5.1 REALM_CORE_VERSION=2.6.0
REALM_SYNC_VERSION=1.5.0 REALM_SYNC_VERSION=1.5.2
REALM_OBJECT_SERVER_VERSION=1.3.0 REALM_OBJECT_SERVER_VERSION=1.3.0

2
src/js_sync.hpp
View File

@ -123,7 +123,7 @@ void UserClass<T>::create_user(ContextType ctx, FunctionType, ObjectType this_ob
Value::validated_to_string(ctx, arguments[1]), Value::validated_to_string(ctx, arguments[1]),
Value::validated_to_string(ctx, arguments[2]), Value::validated_to_string(ctx, arguments[2]),
(std::string)Value::validated_to_string(ctx, arguments[0]), (std::string)Value::validated_to_string(ctx, arguments[0]),
Value::validated_to_boolean(ctx, arguments[3]))); Value::validated_to_boolean(ctx, arguments[3]) ? SyncUser::TokenType::Admin : SyncUser::TokenType::Normal));
return_value.set(create_object<T, UserClass<T>>(ctx, user)); return_value.set(create_object<T, UserClass<T>>(ctx, user));
} }

2
src/object-store

@ -1 +1 @@
Subproject commit dd68cd727ae8702390f3231ef4df934fe214acd3 Subproject commit 91b460fa5ad4083bdb5c59955cfd231bb2b25c54