Financisto

Merge lp://staging/~snert/financisto/main into lp://staging/~financisto-dev/financisto/trunk

  1. main
  2. Merge into trunk
Proposed by Jan Scheithauer
Status: Needs review
Proposed branch: lp://staging/~snert/financisto/main
Merge into: lp://staging/~financisto-dev/financisto/trunk
Diff against target: 485 lines (+262/-17) (has conflicts)
9 files modified
.bzrignore (+3/-0)
.classpath (+18/-12)
res/values-de/strings.xml (+7/-1)
res/values/strings.xml (+7/-0)
res/xml/preferences.xml (+9/-0)
src/ru/orangesoftware/financisto/activity/MainActivity.java (+144/-4)
src/ru/orangesoftware/financisto/export/CsvExportTaskDropbox.java (+40/-0)
src/ru/orangesoftware/financisto/export/Export.java (+19/-0)
src/ru/orangesoftware/financisto/utils/MyPreferences.java (+15/-0)
Text conflict in src/ru/orangesoftware/financisto/activity/MainActivity.java
Text conflict in src/ru/orangesoftware/financisto/export/Export.java
To merge this branch: bzr merge lp://staging/~snert/financisto/main
Reviewer Review Type Date Requested Status
Financisto Developers Pending
Review via email: mp+50407@code.staging.launchpad.net

Description of the change

rudimentary dropbox integration

To post a comment you must log in.

Unmerged revisions

142. By Jan Scheithauer <email address hidden>

removed dropbox key

141. By Jan Scheithauer <email address hidden>

ignore files set

140. By Jan Scheithauer <email address hidden>

Dropbox CSV Export added

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.