Add Encryption #48
base: master
Are you sure you want to change the base?
Add Encryption #48
Conversation
…chbase # Conflicts: # couchbase.d.ts # couchbase.ios.ts # ng-demo/app/couchbaseinstance.ts # platforms/ios/PodFile
Can you pull from the upstream and do a proper merge? Seems like your repository might have been out of date. Other than that, it looks great. I am going to test it tomorrow :-) |
…t-couchbase # Conflicts: # couchbase.android.ts
@nraboy Done ;) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well done +1 to getting this merged so I can use it!
@nraboy what is the status of this? I'm really itching to encrypt the magic :) |
Sorry I've taken so long on this. After reviewing the ng-demo that you've provided, I noticed a lot of the demo had been commented out. I feel it is necessary to leave that information uncommented. Can you rollback the following files (use what's in the master):
Your other changes look good. Just want to remove the conflicts. We can clean up the demos later. |
@danielgek let me know if you are too busy and I should be able to find time to help |
@nraboy @bot2600 after more test on this, it still not working for iOS, i don't have much time now to get back on this, in mean time you can adopt this approach if you have any doubt about this, feel free to ask i still remember a few things about this |
@danielgek So it isn't working at all? |
@hypery2k for ios it's not |
any update on this? can at least for now have this for Android since its working. |
What this commit changes?
Todo list
@nraboy i don't have time right now for the todos list, but i can do it later!! if you need something else just say it ;)