Merge of archiving feature and sync changes (RC1) #277

Closed
wants to merge 3 commits into
from

Projects

None yet

3 participants

@eisbehr
Contributor
eisbehr commented Jul 18, 2012

merge of #276 and parts of #271

I removed the revision check part from my code. What's still there is this:

  • The "work offline" option is now called "manual sync", it better represents what is happening because the app now works offline without going into an offline mode.
  • When not connected the app works just like it does connected, but will tell you with toasts that syncing couldn't be done. Will sync as soon as the device reconnects.
  • Syncing happens more often to reduce merge problems (before adding a task, when phone reconnects, ...)
  • Smaller changes in strings.xml

Also already included German translations for @chuckbjones' feature.

The ADT plugin seems to have changed again as well to work better with Ant, that's why there are also changes to the .classpath

@ginatrapani ginatrapani added a commit that referenced this pull request Jul 19, 2012
@eisbehr @ginatrapani eisbehr + Improve Work offline feature
* The "work offline" option is now called "manual sync", which better represents what is happening because the app now works offline without going into an offline mode.
* When not connected the app works just like it does connected, but will tell you with toasts that syncing couldn't be done. Will sync as soon as the device reconnects.
* Syncing happens more often to reduce merge problems (before adding a task & when phone reconnects)
closes #248, closes #209, closes #161, closes #271, closes #277
1fcafa2
@ginatrapani ginatrapani added a commit that referenced this pull request Jul 30, 2012
@eisbehr @ginatrapani eisbehr + Improve Work offline feature
* The "work offline" option is now called "manual sync", which better represents what is happening because the app now works offline without going into an offline mode.
* When not connected the app works just like it does connected, but will tell you with toasts that syncing couldn't be done. Will sync as soon as the device reconnects.
* Syncing happens more often to reduce merge problems (before adding a task & when phone reconnects)
closes #248, closes #209, closes #161, closes #271, closes #277
5ddbc60
@ginatrapani ginatrapani added a commit that referenced this pull request Aug 8, 2012
@ginatrapani Merge branch '1.0-rc1' of github.com:ginatrapani/todo.txt-touch into …
…1.0-rc1

* '1.0-rc1' of github.com:ginatrapani/todo.txt-touch:
  Fixed unit tests to work with new changes that look for DropboxServerException for missing files.
  * Added some logging in Dropbox logic. * Check for 404 errors specifically, instead of assuming all errors mean a non-existent remote file. * Don't assume a need to push unless we have modified a task. At the same time, never assume a need to pull. Added Generic SYNC_WITH_REMOTE intent for those ambiguous cases. That intent's handler will determine based on a persistent flag whether we need to push. The flag is set whenever a push is initiated directly, and cleared when that push succeeds or when a pull is later manually initiated. * Only sync after a connectivity change if we previously had no connectivity. Otherwise, we were syncing every few seconds. (whenever there was a signal change?)
  Copy tweaks * Only capitalize first word in settings panel * Move File location to top of Dropbox settings area * Various minor copy tweaks and clarifications
  Added German translations for archiving feature
  Improve Work offline feature * The "work offline" option is now called "manual sync", which better represents what is happening because the app now works offline without going into an offline mode. * When not connected the app works just like it does connected, but will tell you with toasts that syncing couldn't be done. Will sync as soon as the device reconnects. * Syncing happens more often to reduce merge problems (before adding a task & when phone reconnects) closes #248, closes #209, closes #161, closes #271, closes #277
  done.txt and Dropbox revision support * Archive completed tasks to done.txt either manually or automatically (in Settings) * Check file revision number before uploading or downloading changes to avoid clobbering the todo.txt or done.txt on either end closes #41, closes #276, closes #236
664a63e
@ginatrapani ginatrapani added a commit that referenced this pull request Aug 11, 2012
@eisbehr @ginatrapani eisbehr + Improve Work offline feature
* The "work offline" option is now called "manual sync", which better represents what is happening because the app now works offline without going into an offline mode.
* When not connected the app works just like it does connected, but will tell you with toasts that syncing couldn't be done. Will sync as soon as the device reconnects.
* Syncing happens more often to reduce merge problems (before adding a task & when phone reconnects)
closes #248, closes #209, closes #161, closes #271, closes #277
3ca7907
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment