Merge pull request #85 from introlab/dev

Main merge for 1.1.3 release

Author: SBriere

CMakeLists.txt

@@ -17,7 +17,7 @@ cmake_policy(SET CMP0043 NEW)
 # Software version
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "2")
+SET(CPACK_PACKAGE_VERSION_PATCH "3")
 SET(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 add_definitions(-DOPENTERAPLUS_VERSION="${CPACK_PACKAGE_VERSION}" )
 add_definitions(-DOPENTERAPLUS_VERSION_MAJOR="${CPACK_PACKAGE_VERSION_MAJOR}" )

README.md

@@ -7,6 +7,8 @@ OpenTeraPlus is a client that works with [OpenTera Server](https://github.com/in
 
 * Simon Brière, ing. M.Sc.A., Research Center on Aging, CIUSSS de l'Estrie-CHUS (@sbriere)
 * Dominic Létourneau, ing. M.Sc.A., IntRoLab, Université de Sherbrooke (@doumdi)
+* François Michaud, ing. Ph.D., IntRoLab, Université de Sherbrooke
+* Michel Tousignant, pht, Ph.D., CDRV, Université de Sherbrooke
 
 ## Publication(s)
 

client/resources/TeraClient.qrc

@@ -134,5 +134,19 @@
         <file>translations/openteraplus_fr.qm</file>
         <file>icons/test_type.png</file>
         <file>icons/qr.png</file>
+        <file>icons/log_icon.png</file>
+        <file>icons/logs/certificate.png</file>
+        <file>icons/logs/password.png</file>
+        <file>icons/logs/token.png</file>
+        <file>icons/question.png</file>
+        <file>icons/logs/browser_chrome.png</file>
+        <file>icons/logs/browser_firefox.png</file>
+        <file>icons/logs/browser_safari.png</file>
+        <file>icons/logs/os_android.png</file>
+        <file>icons/logs/os_ios.png</file>
+        <file>icons/logs/os_linux.png</file>
+        <file>icons/logs/os_mac.png</file>
+        <file>icons/logs/os_windows.png</file>
+        <file>icons/pause.png</file>
     </qresource>
 </RCC>

client/resources/icons.txt

@@ -0,0 +1,3 @@
+<a href="https://www.flaticon.com/free-icons/logos" title="logos icons">Logos icons created by Pixel perfect - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/logotype" title="logotype icons">Logotype icons created by Freepik - Flaticon</a>
+<a href="https://www.flaticon.com/free-icons/chrome" title="chrome icons">Chrome icons created by Pixel perfect - Flaticon</a>