Merge pull request codinguser#1 from codinguser/develop

Develop

.gitignore

@@ -6,4 +6,10 @@ gen
 bin
 dist
 target
-gen-external-apklibs
+#IntelliJ
+gen-external-apklibs
+*.iml
+*.ipr
+.idea/
+*.iws
+out/

CHANGELOG.md

@@ -1,18 +1,35 @@
 Change Log
 ===============================================================================
+Version 1.2.0 *(2013-06-20)*
+----------------------------
+* Feature: Import GnuCash desktop account structure
+* Feature: Nested display of account hierarchy
+* Feature: Options for deleting all accounts/transactions
+* Feature: Preliminary support for account types
+* Fixed:   Account balance now takes sub-accounts into consideration
+* Fixed:   Support for GnuCash ROOT account (will not be displayed)
+
+Version 1.1.2 *(2013-02-03)*
+----------------------------
+* Fixed: Crash upon screen rotation when creating account
+* Fixed: Crash when entering a transaction after deleting an account which has a widget
+
+Version 1.1.1 *(2013-01-31)*
+----------------------------
+* Updated German and Norwegian (Bokmal) translations
 
 Version 1.1.0 *(2013-01-31)*
 ----------------------------
 
 * Feature: Double entry accounting - every transaction is a transfer
 * Feature: Nested accounts
-* Feature: SGML support for OFX exports. Fixes encoding detection problems during imports
+* Feature: SGML support for OFX exports. Exports are now SGML by default 
 * Feature: Display what's new to user after minor/major updates
 * Improved: Reworked UX for creating accounts
 * Improved: Default accounts now match GnuCash desktop accounts
 * Fixed: Crash when creating accounts with special characters in the names
 * Fixed: GnuCash declares itself as launcher application
-
+* Fixed: Encoding of exported OFX not properly detected by GnuCash desktop
 
 Version 1.0.3 *(2012-11-23)*
 ----------------------------

CONTRIBUTORS

@@ -14,4 +14,5 @@ Israel Buitron <israel.buitron@gmail.com>
 Geert Janssens <janssens-geert@telenet.be>
 Nicolas Barranger <wicowyn@gmail.com>
 Sigurd Gartmann <sigurdga-github@sigurdga.no>
-Pedro Abel <pedroabel@gmail.com>
+Pedro Abel <pedroabel@gmail.com>
+windwarrior <lennartbuit@gmail.com>