Commit graph

5735 commits

Author SHA1 Message Date
Klaas Freitag
76ee4cb3ba Add symlinks to the file tree with instruction IGNORE 2013-08-07 12:14:29 +02:00
Klaas Freitag
6226a6ee8f Enable delete messages for progress display. 2013-08-07 10:28:34 +02:00
Daniel Molkentin
c49edeb09d Fix regression in FolderWizard over 1.3
Now it's possible to also pick subdirectory
of in arbitrary depths again
2013-08-06 21:50:22 +02:00
Klaas Freitag
7e794cd94f Tell the progress dialog about a new sync result object. 2013-08-06 18:07:59 +02:00
Klaas Freitag
933a62de01 Add recent action entries in correct sequence to menu. 2013-08-06 18:07:31 +02:00
Klaas Freitag
23f8e3b4f8 Allow Delete notification. 2013-08-06 18:06:54 +02:00
Klaas Freitag
3502edf71b More detailed strings for the progress kind. 2013-08-06 18:06:39 +02:00
Klaas Freitag
4d8a371e43 Display information from SyncResult. 2013-08-06 18:06:05 +02:00
Klaas Freitag
01fd3242c4 Add folder alias to sync result structure. 2013-08-06 18:04:42 +02:00
Klaas Freitag
9c289334e9 Handle notifications for deletes. 2013-08-06 18:04:08 +02:00
Klaas Freitag
7b22972630 Add excluded files to the tree with IGNORE instruction 2013-08-06 18:01:34 +02:00
Klaas Freitag
d88a5e1b11 Rename progress init function to reasonable name. 2013-08-06 15:42:02 +02:00
Krzesimir Nowak
002142539b Remove most of the dead code in Shibboleth setup page.
The effect of most of the code wasn't even visible after making a
browser an independent window.
2013-08-06 14:56:26 +02:00
Krzesimir Nowak
e1d1c10fad Fix workflow in wizard.
Pressing back in third window should show us browser again. Closing
browser window should show us server setup window again.
2013-08-06 14:35:11 +02:00
Klaas Freitag
d585742609 Log if the Etag in the journal is empty. 2013-08-06 12:12:53 +02:00
Klaas Freitag
d910a3af8b Notify sync start and end always. 2013-08-06 12:12:52 +02:00
Olivier Goffart
6ad2920809 Load the statedb in csync_update rather than in csync_init.
This also allow to reduce duplicate code in csync_commit, and ease the
error reporting of csync_commit

csync_commit is supposed to be done after the previous sync, it is
better to open the statedb before the sync
2013-08-06 12:12:52 +02:00
Klaas Freitag
a42d942a35 Finalize progress before error handling. 2013-08-06 12:12:52 +02:00
Klaas Freitag
721443feea deliver file size with the progress callback in propagate. 2013-08-06 12:12:52 +02:00
Klaas Freitag
ba73405613 Defines for progress start- and end delete. 2013-08-06 12:12:52 +02:00
Klaas Freitag
c89a55984b Emit start- and end delete progress. 2013-08-06 12:12:52 +02:00
Krzesimir Nowak
577bc546d8 Handle SSL problems also for Shibboleth servers. 2013-08-06 11:56:27 +02:00
Daniel Molkentin
85a832fb7c NSIS: Add WebKit dll 2013-08-05 23:25:14 +02:00
Daniel Molkentin
045a3f17ba _USE_GNU -> _GNU_SOURCE 2013-08-05 21:11:14 +02:00
Olivier Goffart
a9f23a8331 Get the etag of all subfolder for the root directory
The root directory etag is not updated when the files change.
That's why we need to check the etag of all its sub items
2013-08-05 20:13:39 +02:00
Olivier Goffart
5d24599546 Fetch the etag of the folder to see if it has changed before syncing
Notice that this does not work for the toplevel directory yet, as
owncloud does not change the etag of the root folder
2013-08-05 20:13:39 +02:00
Olivier Goffart
07d9d3770b Refactor: move the pollTimer to the folder 2013-08-05 20:13:39 +02:00
Daniel Molkentin
c9ddb12b5a Build after merge 2013-08-05 20:14:22 +02:00
Daniel Molkentin
0932ee6051 Merge branch 'shibboleth'
Conflicts:
	src/CMakeLists.txt
	src/mirall/application.h
2013-08-05 19:54:06 +02:00
Daniel Molkentin
ee1b8465a3 Revert "Temporarily log HTTP traffic done by MirallAccessManager."
This reverts commit 5930ca8ac7.
2013-08-05 19:47:48 +02:00
Daniel Molkentin
26bd164168 Safer implementation for substitution of WebDav URL
- Use of RegEx is dangerous with folder names
  containing e.g. '(' or ')'.
- Didn't work in my case at all.
2013-08-05 19:45:24 +02:00
Krzesimir Nowak
3979d002bd Add an owncloud-specific redirect callback. 2013-08-05 19:21:38 +02:00
Krzesimir Nowak
00e819bd92 Make sure we don't append several copies of cookies for syncing.
Also, make sure we don't append old Shibboleth ones as well.
2013-08-05 18:39:26 +02:00
Krzesimir Nowak
740d33b378 Revert "Go back if browser in wizard is destroyed before getting a cookie."
This reverts commit da370c8b36.
2013-08-05 17:57:32 +02:00
Krzesimir Nowak
f0b284eda7 Refresh Shibboleth cookie if it gets outdated during sync. 2013-08-05 17:42:03 +02:00
Krzesimir Nowak
da370c8b36 Go back if browser in wizard is destroyed before getting a cookie. 2013-08-05 17:29:11 +02:00
Olivier Goffart
203b9c7f6b leak fix 2013-08-05 16:49:18 +02:00
Daniel Molkentin
7932ec3cc1 IgnoreListEditor: slightly better text 2013-08-05 16:26:17 +02:00
Daniel Molkentin
3f15e02881 Add support for deletable ignores in IgnoreListEditor. 2013-08-05 16:13:26 +02:00
Olivier Goffart
6fb5c04bde Finish danimo's patch that refactor the scheduler
Wait a full poll interval after the end of the sync
2013-08-05 15:15:15 +02:00
Olivier Goffart
578bcc3522 Remove scheduler logic from folderman and moved it in folderman
Also fetch and parse the etag when doing a PROPFIND to get the quota

(Patch from danimo)
2013-08-05 15:15:15 +02:00
Daniel Molkentin
99dea76fd1 Fix path display in folder wizard
The new implementation did not work correctly when owncloud is installed
in a subdirectory.
2013-08-05 14:28:05 +02:00
Jenkins for ownCloud
b680540adf [tx-robot] updated from transifex 2013-08-05 06:54:39 -04:00
Klaas Freitag
67f57a443c Disable unknown csync flags for now. 2013-08-05 12:30:24 +02:00
Klaas Freitag
2b3b4f9daf Start setup wizard if no config exists on startup. 2013-08-05 12:19:53 +02:00
Klaas Freitag
ba01a697e6 Renamed test case to get rid of stinking name. 2013-08-05 09:39:06 +02:00
Klaas Freitag
16d81db117 Show deletes in progress. 2013-08-05 09:39:06 +02:00
Jenkins for ownCloud
4ce92f1a98 [tx-robot] updated from transifex 2013-08-04 01:26:52 -04:00
Jenkins for ownCloud
21c63637bd [tx-robot] updated from transifex 2013-08-03 01:27:06 -04:00
Klaas Freitag
18f764e4d5 Fix a typo. 2013-08-02 21:55:09 +02:00