fix(Code.NewVersion): update to version 1.1.2

moneymanagerex · Nov 13, 2014 · af4e6d1 · af4e6d1
1 parent 67bdfeb
commit af4e6d1
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 37 deletions.
diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for MoneyManagerEx 1.1.1.
+# Generated by GNU Autoconf 2.69 for MoneyManagerEx 1.1.2.
 #
 # Report bugs to <moneymanagerex@moneymanagerex.org>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='MoneyManagerEx'
 PACKAGE_TARNAME='moneymanagerex'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='MoneyManagerEx 1.1.1'
+PACKAGE_VERSION='1.1.2'
+PACKAGE_STRING='MoneyManagerEx 1.1.2'
 PACKAGE_BUGREPORT='moneymanagerex@moneymanagerex.org'
 PACKAGE_URL=''
 
@@ -1302,7 +1302,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures MoneyManagerEx 1.1.1 to adapt to many kinds of systems.
+\`configure' configures MoneyManagerEx 1.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1368,7 +1368,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of MoneyManagerEx 1.1.1:";;
+     short | recursive ) echo "Configuration of MoneyManagerEx 1.1.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1482,7 +1482,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-MoneyManagerEx configure 1.1.1
+MoneyManagerEx configure 1.1.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1649,7 +1649,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by MoneyManagerEx $as_me 1.1.1, which was
+It was created by MoneyManagerEx $as_me 1.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -10478,7 +10478,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by MoneyManagerEx $as_me 1.1.1, which was
+This file was extended by MoneyManagerEx $as_me 1.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10531,7 +10531,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-MoneyManagerEx config.status 1.1.1
+MoneyManagerEx config.status 1.1.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@
 ##########################################################################
 
 AC_PREREQ(2.53)
-AC_INIT([MoneyManagerEx], 1.1.1, [moneymanagerex@moneymanagerex.org])
+AC_INIT([MoneyManagerEx], 1.1.2, [moneymanagerex@moneymanagerex.org])
 
 ##########################################################################
 

diff --git a/doc/help/index.html b/doc/help/index.html
@@ -20,7 +20,7 @@
     <TD> </TD><TD><A HREF="polish/index.html">Polish</A></TD>
 </tr></table>
 <div class="page-header">
-    <H2>Money Manager Ex User Manual <small>MMEX 1.1.1</small></H2>
+    <H2>Money Manager Ex User Manual <small>MMEX 1.1.2</small></H2>
 </div>
   <UL>
     <LI>
@@ -2033,7 +2033,7 @@ <H3><A NAME="safety"></A><BR>How
 		<th>End Time</th>
 	</tr>
 	<tr>
-		<td>1.1.1 Portable</td>
+		<td>1.1.2 Portable</td>
 		<td>Windows 8 (build 9200), 64-bit edition</td>
 		<td>english</td>
 		<td>United States</td>

diff --git a/doc/help/polish/index.html b/doc/help/polish/index.html
@@ -20,7 +20,7 @@
     <TD> </TD><TD><A HREF="../spanish/index.html">Hiszpański</A></TD>
 </tr></table>
 <div class="page-header">
-    <H2>Instrukcja użytkowania Money Manager <small>MMEX 1.1.1</small></H2>
+    <H2>Instrukcja użytkowania Money Manager <small>MMEX 1.1.2</small></H2>
 </div>
   <UL>
     <LI>
@@ -1969,7 +1969,7 @@ <H3><A NAME="safety"></A><BR>Skąd mam wiedzieć, że MMEX nie próbuje podejrze
 		<th>Czas końca</th>
 	</tr>
 	<tr>
-		<td>1.1.1 Portable</td>
+		<td>1.1.2 Portable</td>
 		<td>Windows 8 (build 9200), 64-bit edition</td>
 		<td>english</td>
 		<td>United States</td>

diff --git a/doc/version.txt b/doc/version.txt
@@ -1,5 +1,17 @@
 Version History of Money Manager Ex
 
+1.1.2 (November 16, 2014)
+- Repeating transaction dialog restyling
+- Added transaction filter to repeating transactions panel
+- Added more keywords into GRM
+- Fix CashFlow crash
+- Fix for repeating transactions with split categories
+- Fix PayPal QIF import (bug #543)
+- Fix stock update date format (bug #545)
+- Fix budget for substituted category (bug #546)
+- Fix category removal error on budget panel (bug #551)
+- Translations update
+
 1.1.1 (November 1, 2014)
 - Full UTF-8 and wide characters support in GRM and LUA
 - Full integration with WebApp @ http:\\webapp.moneymanagerex.org

diff --git a/resources/mmex.rc b/resources/mmex.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,1
- PRODUCTVERSION 1,1,1
+ FILEVERSION 1,1,2
+ PRODUCTVERSION 1,1,2
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MoneyManagerEX"
             VALUE "FileDescription", "Money Management Software"
-            VALUE "FileVersion", "1, 1, 1"
+            VALUE "FileVersion", "1, 1, 2"
             VALUE "InternalName", "mmex"
             VALUE "LegalCopyright", "Copyright (C) 2014 Money Manager EX (http://www.moneymanagerex.org/)"
             VALUE "OriginalFilename", "mmex.exe"
             VALUE "ProductName", "MoneyManagerEx"
-            VALUE "ProductVersion", "1, 1, 1"
+            VALUE "ProductVersion", "1, 1, 2"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/setup/linux/debian/build.sh b/setup/linux/debian/build.sh
@@ -13,7 +13,7 @@
 ARCHITECTURE="amd64"
 
 # Specify the build version of mmex
-MMEX_VERSION="1.1.1.0"
+MMEX_VERSION="1.1.2.0"
 
 cd ../../../
 ./bootstrap

diff --git a/setup/linux/debian/build_new.sh b/setup/linux/debian/build_new.sh
@@ -13,7 +13,7 @@
 ARCHITECTURE="amd64"
 
 # Specify the build version of mmex
-MMEX_VERSION="1.1.1"
+MMEX_VERSION="1.1.2"
 
 EMAIL="moneymanagerex@moneymanagerex.org"
 

diff --git a/setup/linux/debian/readme.txt b/setup/linux/debian/readme.txt
@@ -35,7 +35,7 @@ svn checkout http://svn.code.sf.net/p/moneymanagerex/code/trunk mmex
 #     Modify 3rd/cgitemplate/html_template.h
 #         Add line "#include <cstddef>"
 #     Modify "setup/linux/debian/build.sh"
-#         Specify version of mmex ("1.1.1.0")
+#         Specify version of mmex ("1.1.2.0")
 #         Specify system Architecture  ("i386" or "amd64")
 
 # Build mmex

diff --git a/setup/win/mmex_win32_setup.iss b/setup/win/mmex_win32_setup.iss
@@ -14,7 +14,7 @@
 
 #define MyAppName "MoneyManagerEX"
 #define MyAppExeName "mmex.exe"
-#define MyAppVersion "1.1.1"
+#define MyAppVersion "1.1.2"
 #define MyAppPublisher "Money Manager EX"
 #define MyAppURL "http://www.moneymanagerex.org"
 
@@ -26,8 +26,8 @@
 ; Local definitions specifically designed for my setup 
 #define my_svn_path "..\.."
 #define my_output_root "..\..\mmex_release"
-#define my_output_path "\mmex_1.1.1_win32_portable\MoneyManagerEx"
-#define my_output_filename "mmex_1.1.1_win32_setup"
+#define my_output_path "\mmex_1.1.2_win32_portable\MoneyManagerEx"
+#define my_output_filename "mmex_1.1.2_win32_setup"
 
 ;===============================================================================
 
@@ -59,14 +59,14 @@ OutputBaseFilename={#my_output_filename}
 SetupIconFile={#my_svn_path}\resources\mmex.ico
 Compression=lzma/Max
 SolidCompression=true
-VersionInfoVersion=1.1.1.0
+VersionInfoVersion=1.1.2.0
 VersionInfoCompany=Money Manager EX
 VersionInfoDescription=Money Management Software
-VersionInfoTextVersion=1.1.1.0
+VersionInfoTextVersion=1.1.2.0
 VersionInfoCopyright=2014 - Money Manager EX
 VersionInfoProductName=mmex
-VersionInfoProductVersion=1.1.1.0
-VersionInfoProductTextVersion=1.1.1.0
+VersionInfoProductVersion=1.1.2.0
+VersionInfoProductTextVersion=1.1.2.0
 
 [Languages]
 Name: english; MessagesFile: compiler:Default.isl; 

diff --git a/setup/win/mmex_x64_setup.iss b/setup/win/mmex_x64_setup.iss
@@ -14,7 +14,7 @@
 
 #define MyAppName "MoneyManagerEX"
 #define MyAppExeName "mmex.exe"
-#define MyAppVersion "1.1.1"
+#define MyAppVersion "1.1.2"
 #define MyAppPublisher "Money Manager EX"
 #define MyAppURL "http://www.moneymanagerex.org"
 
@@ -26,8 +26,8 @@
 ; Local definitions specifically designed for my setup 
 #define my_svn_path "..\.."
 #define my_output_root "..\..\mmex_release"
-#define my_output_path "\mmex_1.1.1_x64_portable\MoneyManagerEx"
-#define my_output_filename "mmex_1.1.1_x64_setup"
+#define my_output_path "\mmex_1.1.2_x64_portable\MoneyManagerEx"
+#define my_output_filename "mmex_1.1.2_x64_setup"
 
 ;===============================================================================
 
@@ -59,14 +59,14 @@ OutputBaseFilename={#my_output_filename}
 SetupIconFile={#my_svn_path}\resources\mmex.ico
 Compression=lzma/Max
 SolidCompression=true
-VersionInfoVersion=1.1.1.0
+VersionInfoVersion=1.1.2.0
 VersionInfoCompany=Money Manager EX
 VersionInfoDescription=Money Management Software
-VersionInfoTextVersion=1.1.1.0
+VersionInfoTextVersion=1.1.2.0
 VersionInfoCopyright=2014 - Money Manager EX
 VersionInfoProductName=mmex
-VersionInfoProductVersion=1.1.1.0
-VersionInfoProductTextVersion=1.1.1.0
+VersionInfoProductVersion=1.1.2.0
+VersionInfoProductTextVersion=1.1.2.0
 ArchitecturesAllowed=x64 
 ArchitecturesInstallIn64BitMode=x64 
 

diff --git a/setup/win/update_mmex_build_files.bat b/setup/win/update_mmex_build_files.bat
@@ -18,7 +18,7 @@ cls
 
 REM Set the variable: mmex_release_version
 REM to reflect the correct version.
-set mmex_release_version=mmex_1.1.1
+set mmex_release_version=mmex_1.1.2
 
 set mmex_system_name=MoneyManagerEX
 set mmex_build_location=..\..\build\msw-vc-2013e

diff --git a/src/constants.cpp b/src/constants.cpp
@@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
  For Internet Format for update checking read in util.cpp
  *************************************************************************/
-const wxString MMEX_VERSION = "1.1.1";
+const wxString MMEX_VERSION = "1.1.2";
 
 //#define MMEX_BUILD_TYPE_RELEASE_CANDIDATE
 const int MMEX_VERSION_DEVELOPMENT_COUNT = 3;