This repository has been archived by the owner on Jan 15, 2021. It is now read-only.
Merge Story 0 into master #63
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Client - Cordova app Server - Pouchdb-express based node app
Client - Cordova app Server - Pouchdb-express based node app
This reverts commit bfccfe7.
… postcard feature
Included the leveldown related files
…ecific card when they create new cards
Story 0 - Automatic refresh
Story 0 dadougla
The main fix is to assign the mock object to `global.Mobile` rather than to defining it with `var Mobile`, because otherwise, the definition would apply only within the current module. The trigger for the mockups was moved behind a more explicit MOCK_MOBILE environment variable rather than NODE_ENV, because the latter is a fairly commonly used and we don't want these mocks to accidentally apply, for example, in a Cordova-based environment. The readme is updated with steps needed after a fresh clone to be able to run on localhost. Fixes #58.
Make it easier to run on localhost.
Story 0 using thali module 2.0.1 to fix #60
|
@deadlyfingers - There is a merge conflict. You need to resolve that first. |
|
10/27 - Needs to resolve merge conflicts (it's a theme!) |
|
10/28 - No work on this today because of the website work. BTW this is for #233 |
|
Using P4Merge for resolving conflicts but sometimes it joins left+right as one entity so you can't choose left or right separately... Any other merge tool suggestions? |
deadlyfingers
added a commit
that referenced
this pull request
Oct 30, 2015
Merge Story 0 into master
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update master with postcard app (story_0 branch)