Merge branch 'v2.1.16'

CHANGELOG.md

@@ -1,4 +1,44 @@
-## 2.1.14(2014-11-19)
+##2.1.16(2015-3-12)
+
+Bugfixes:
+
+- [Mac]Fix the delay problem of text input.
+- [Linux]Fix the crash problem when drag document to folder.
+- Fixed the initialization delay problem of insert code panel.
+
+Features:
+
+- Add the funtion of importing files(not supported documents with images for now).
+- Added support table cell alignment.
+- Modify the usage of editor color selection buttons.
+- Add function to retrieve the deleted notes.
+- Modify the limitation prompt of group.
+- Optimized loading speed of notes list.
+- Modify the Markdown references css file storage location, you can manually modify the style.
+- You can edit note information now.
+
+
+##2.1.15(2015-1-16)
+
+Bugfixes:
+
+- Fix the problem that modify the sync interval had no effect.
+- Fix the width problem when pasting as plain text.
+
+Features:
+
+- Modify the way of checking the status of the group notes, no longer allowed to edit notes that editing by other users!
+- Add the function of manually sorting folders. You can choose to manually sort the folder or sorted in a systematic manner in the preferences.
+- Quit program if system tray icon is unvisible when users close the mainwindow.
+- Change the icon for system tray icon.
+- Add the function of sending notes by email.
+- Added support for searching encrypted notes, need to enter the password in the preferences.
+- Add the function of setting the editor background color in preferences.
+- Add the function of editing the html source code of notes.
+- All unread messages can be marked as read.
+- Update note version when upload data to server.
+
+##2.1.14(2014-11-9)
 
 Bugfixes:
 

CMakeLists.txt

@@ -28,6 +28,17 @@ if(NOT CMAKE_BUILD_TYPE)
       FORCE)
 endif()
 
+include(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+if(COMPILER_SUPPORTS_CXX11)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+elseif(COMPILER_SUPPORTS_CXX0X)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+else()
+        message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+endif()
+
 if(NOT WIZNOTE_USE_QT5)
     set(WIZNOTE_USE_QT5 OFF CACHE BOOL
         "Build WizNote use Qt5, default is off.")
@@ -39,6 +50,8 @@ if(APPLE)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -gdwarf-2")
         add_definitions(-DBUILD4APPSTORE=TRUE)
     endif(APPSTORE_BUILD)
+#    add_definitions(-DUSECOCOATOOLBAR=TRUE)
+#    add_definitions(-DUSEWEBENGINE=FALSE)
 endif(APPLE)
 
 if(APPLE)

build/osx/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.15</string>
+	<string>2.1.16.2</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>CFBundleName</key>
@@ -27,7 +27,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.1</string>
+	<string>9.2.2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>