update binary path

ChangeLog

@@ -1,28 +1,5 @@
 ChangeLog
 =========
-version 2.2.0 (release 2016-05-12)
- * Overlay icons: Refactoring - mainly for performance improvements
- * Improved error handling with Sync Journal on USB storages (#4632)
- * Sharing Completion: Improved UI of completion in sharing from desktop. (#3737)
- * Show server notifications on the client (#3733)
- * Improved Speed with small files by dynamic parallel request count (#4529)
- * LockWatcher: Make sure to sync files after apps released exclusive locks on Windows.
- * Improved handling of Win32 file locks and network files
- * Workaround Ubuntu 16.04 tray icon bug (#4693)
- * Removed the Alias field from the folder definition (#4695)
- * Improved netrc parser (#4691)
- * Improved user notifications about ignored files and conflicts (#4761, #3222)
- * Add warnings for old server versions (#4523)
- * Enable tranportation checksums if the server supports based on server capabilities (#3735)
-
- * Default Chunk-size changed to 10MB (#4354)
- * Documentation Improvements, ie. about overlay icons
- * Translation fixes
- * Countless other bugfixes
- * Sqlite Update to recent version
- * Update of QtKeyChain to support Windows credential store
- * Packaging of dolphin overlay icon module for bleeding edge distros
-
 version 2.1.1 (release 2016-02-10)
  * UI improvements for HiDPI screens, error messages, RTL languages
  * Fix occurences of "Connection Closed" when a new unauthenticated TCP socket is used

VERSION.cmake

@@ -5,7 +5,7 @@ set( MIRALL_VERSION_YEAR  2016 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "git") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )

doc/navigating.rst

@@ -207,30 +207,6 @@ such as files not synced.
 .. figure:: images/client-8.png
    :alt: Activity windows logs all server and client activities.
 
-Server Notifications
---------------------
-
-Starting with version 2.2.0 the client will display notifications which origin 
-from the server. Notifications require a kind of manual interaction from the 
-user and they are triggered by certain events happening on the server. One 
-example is that somebody created a share from a remote ownCloud for the user
-which has to approved. The notification will be something like "Do you want 
-to accept the share from user Joe on host owncloud.joesdomain.com", and the
-user of the client can either click an Accept- or Decline-button.
-
-The desktop client checks for avialable notifications automatically on a regular
-base.
-
-If a notification is due for the user, it is displayed integrated in the
-activity tab, and the user receives a tray notification to draw attention.
-
-.. figure:: images/client12.png
-   :alt: Activity window with notification.
-
-There is also the Announcement App that allows administrators to create 
-notifications for users. This is a convenient way to send information to 
-all users.
-
 General Window
 --------------
 

src/libsync/syncfilestatustracker.cpp

@@ -180,7 +180,8 @@ void SyncFileStatusTracker::slotItemCompleted(const SyncFileItem &item)
     } else if (showWarningInSocketApi(item)) {
         _syncProblems[item._file] = SyncFileStatus::StatusWarning;
     } else {
-        _syncProblems.erase(item._file);
+        // There is currently no situation where an error status set during discovery/update is fixed by propagation.
+        Q_ASSERT(_syncProblems.find(item._file) == _syncProblems.end());
     }
 
     emit fileStatusChanged(getSystemDestination(item.destination()), syncFileItemStatus(item));

test/testexcludedfiles.cpp

@@ -26,23 +26,22 @@ private slots:
         bool excludeHidden = true;
         bool keepHidden = false;
 
-        bool x = excluded.isExcluded("/a/b", "/a", keepHidden);
-        QVERIFY(!excluded.isExcluded("/a/b", "/a", keepHidden));
-        QVERIFY(!excluded.isExcluded("/a/b~", "/a", keepHidden));
-        QVERIFY(!excluded.isExcluded("/a/.b", "/a", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/.b", "/a", excludeHidden));
+        QVERIFY(!excluded.isExcluded("/a/b", "b", keepHidden));
+        QVERIFY(!excluded.isExcluded("/a/b~", "b~", keepHidden));
+        QVERIFY(!excluded.isExcluded("/a/.b", ".b", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/.b", ".b", excludeHidden));
 
         QString path(BIN_PATH);
         path.append("/sync-exclude.lst");
         excluded.addExcludeFilePath(path);
         excluded.reloadExcludes();
 
-        QVERIFY(!excluded.isExcluded("/a/b", "/a", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/b~", "/a", keepHidden));
-        QVERIFY(!excluded.isExcluded("/a/.b", "/a", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/.Trashes", "/a", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/foo_conflict-bar", "/a", keepHidden));
-        QVERIFY(excluded.isExcluded("/a/.b", "/a", excludeHidden));
+        QVERIFY(!excluded.isExcluded("/a/b", "b", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/b~", "b~", keepHidden));
+        QVERIFY(!excluded.isExcluded("/a/.b", ".b", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/.Trashes", ".Trashes", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/foo_conflict-bar", "foo_conflict-bar", keepHidden));
+        QVERIFY(excluded.isExcluded("/a/.b", ".b", excludeHidden));
     }
 };
 

test/testutility.cpp

@@ -121,9 +121,7 @@ private slots:
                 // Current requires an X-Server
                 return;
             }
-            // pass the binary name owncloud to the next call. This brakes branding,
-            // but branding is not supposed to work with this.
-            QString ver = versionOfInstalledBinary(BIN_PATH+QLatin1String("/owncloud"));
+            QString ver = versionOfInstalledBinary(BIN_PATH);
 	    qDebug() << "Version of installed ownCloud Binary: " << ver;
 	    QVERIFY( !ver.isEmpty());
 
@@ -136,27 +134,34 @@ private slots:
 
     void testTimeAgo()
     {
-        // Both times in same timezone
+        // Both times in local time
         QDateTime d1 = QDateTime::fromString("2015-01-24T09:20:30+01:00", Qt::ISODate);
         QDateTime d2 = QDateTime::fromString("2015-01-23T09:20:30+01:00", Qt::ISODate);
         QString s = timeAgoInWords(d2, d1);
         QCOMPARE(s, QLatin1String("1 day(s) ago"));
 
-        // Different timezones
+        //
         QDateTime earlyTS = QDateTime::fromString("2015-01-24T09:20:30+01:00", Qt::ISODate);
-        QDateTime laterTS = QDateTime::fromString("2015-01-24T09:20:30-01:00", Qt::ISODate);
+        earlyTS.setTimeSpec(Qt::UTC);
+        QDateTime laterTS = earlyTS.toOffsetFromUtc(3600);
+        laterTS.setTimeSpec(Qt::UTC);
         s = timeAgoInWords(earlyTS, laterTS);
-        QCOMPARE(s, QLatin1String("2 hour(s) ago"));
+        QCOMPARE(s, QLatin1String("1 hour(s) ago"));
 
-        // 'Now' in whatever timezone
         earlyTS = QDateTime::currentDateTime();
+
+        laterTS.setTimeSpec(Qt::LocalTime);
+        laterTS.setTimeZone( QTimeZone("Pacific/Easter") );
         laterTS = earlyTS;
+
         s = timeAgoInWords(earlyTS, laterTS );
         QCOMPARE(s, QLatin1String("now"));
 
         earlyTS = earlyTS.addSecs(-6);
         s = timeAgoInWords(earlyTS, laterTS );
         QCOMPARE(s, QLatin1String("Less than a minute ago"));
+
+
     }
 };