Commit Graph
17214 Commits
Author SHA1 Message Date
Markus Goetz a537a98f03 Tray menu: Populate at start 2013-11-14 17:23:56 +01:00
Olivier Goffart 4eb19000a4 Differentiate the RENAME and EVAL_RENAME
EVAL_RENAME is set at the update phase and means that this is the destination of
a file that has been renamed.
RENAME is set for the file that need to be renamed.

Before, we knew the difference because of which remote the instruction was
but now we need to make the distinction explicit
2013-11-14 17:08:42 +01:00
Klaas Freitag bef7c3c48e Fixes to t3.pl, added some assertions. 2013-11-14 17:06:53 +01:00
Klaas Freitag e40370f67a Use printInfo method in t3.pl 2013-11-14 16:10:41 +01:00
Sven Strickroth ed5b0973dd Do not create folder for single link
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-14 15:45:14 +01:00
Olivier Goffart e8e27b61f6 Revert the changes that fetch the file id in the propagator.
We don't want to fetch the file id in the propagator.

Revert "Put item member variable to base class."
This reverts commit f7aa2aa348.

Revert "Add isValidFileId and getFileIdPropget methods."
This reverts commit ccd254abba.
2013-11-14 14:59:03 +01:00
Olivier Goffart 11a131fa90 csync_statedb_query: Allow null fields in the database
The fileid defaults to null for old database.
Since commit 4b8f2a287f,  we query
 the file id to get the etag.
c_strlist_add cannot append null entries, so it would just discard
the md5 instead
2013-11-14 14:41:36 +01:00
Sven Strickroth 336e22233d Do not create uninstall shortcut in start menu
According to Microsoft Design guidelines (http://msdn.microsoft.com/en-us/library/windows/desktop/aa511447.aspx) no icons for uninstallers should be created.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-14 14:40:21 +01:00
Daniel Molkentin 578431c791 Fix building owncloudcmd in case of theming 2013-11-14 14:20:09 +01:00
Olivier Goffart 4d146e87d1 Remove INVALID_FILE_ID and consider empty file id as invalid 2013-11-14 13:43:26 +01:00
Olivier Goffart b518adc203 Don't read from the db if the file id has changed.
File id may change when upgrading to owncloud 6 or when upgrading to mirall 1.5

This also changes the location where we check if we need to read from
the DB.   Instead of doing it from csync_ftw,  we do it from
_csync_detect_update. In that function we know the etag and the file id.
Which mean we change the flag before the recursive call to csync_ftw instead
of in the begin of the function.  Therefore, we need to restore the flag
after calling the function to the previously saved state.
2013-11-14 13:43:26 +01:00
Klaas Freitag 6b0b7d1b90 make t1.pl work again. 2013-11-14 13:07:55 +01:00
Daniel Molkentin ead0f8d029 Update build docs 2013-11-14 12:36:09 +01:00
Klaas Freitag f7aa2aa348 Put item member variable to base class. 2013-11-14 11:37:32 +01:00
Klaas Freitag ccd254abba Add isValidFileId and getFileIdPropget methods. 2013-11-14 11:37:08 +01:00
Klaas Freitag 4b8f2a287f Retrieve file_id together with etag from db if read from db. 2013-11-14 11:32:03 +01:00
Klaas Freitag 3cc2593f62 Handle invalid file_id correctly. 2013-11-14 11:31:30 +01:00
Klaas Freitag c3e154b2e6 Do not overwrite with an invalid file_id. 2013-11-14 11:30:51 +01:00
Daniel Molkentin 56de183155 Merge pull request #1160 from csware/exclude-office-tempfiles
Add another Office lock/temporary file pattern
2013-11-13 15:52:37 -08:00
Daniel Molkentin c8256eea0e Merge pull request #1162 from csware/startmenu-according-to-ms-guidelines
Startmenu according to ms guidelines
2013-11-13 15:52:05 -08:00
Sven Strickroth b026bb308d Do not create folder for single link
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-14 00:45:18 +01:00
Sven Strickroth 6bd4d367d4 Do not create uninstall shortcut in start menu
According to Microsoft Design guidelines (http://msdn.microsoft.com/en-us/library/windows/desktop/aa511447.aspx) no icons for uninstallers should be created.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-14 00:43:11 +01:00
Sven Strickroth d401a62fd9 Add another Office lock/temporary file pattern
Experienced with Microsoft Office 2010.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-14 00:33:11 +01:00
Daniel Molkentin 8f61cc4041 Hint the OS to not show [?] in Wizards and Dialogs
Fixes #1156
2013-11-13 20:12:56 +01:00
Daniel Molkentin 21c9fc2d35 Cleanup 2013-11-13 19:11:46 +01:00
Daniel Molkentin 171572e400 Remember paused state throughout application restarts
Fixes #823
2013-11-13 18:58:35 +01:00
Klaas Freitag e9920bd760 Consider an empty fileid as invalid. 2013-11-13 14:57:34 +01:00
Daniel Molkentin 475a4f2676 Windows: ship QtSql lib 2013-11-13 14:32:09 +01:00
Olivier Goffart 908888a44e Rename 'md5' to 'etag'
'md5' always has been the etag. The name md5 for it is misleading.
It is still called "md5" in the database to keep compatibility
2013-11-13 14:29:31 +01:00
Olivier Goffart 52e01b39d6 Adapt to csync 'md5'->'etag' change 2013-11-13 14:28:41 +01:00
Daniel Molkentin af1dcfd179 Compile fix 2013-11-13 14:24:02 +01:00
Daniel Molkentin 233a6908dd Partial revert "Compile with Qt5"
This reverts commit 878ae56a71.
2013-11-13 14:19:01 +01:00
Daniel Molkentin ae83c12f05 Fix compiler warning 2013-11-13 14:19:01 +01:00
Olivier Goffart 3a1b868348 Directory with different etags should still be moved. 2013-11-13 14:04:51 +01:00
Daniel Molkentin 878ae56a71 Compile with Qt5 2013-11-13 14:00:12 +01:00
Daniel Molkentin 2ff4ebc72f Make user() available throught AbsctractCredentials 2013-11-13 13:59:35 +01:00
Daniel Molkentin ca79d3b437 Merge remote-tracking branch 'origin/master' into account_refactoring 2013-11-13 13:55:58 +01:00
Klaas Freitag a65c5b6f38 Install Headers of libhttpbf 2013-11-13 09:47:39 +01:00
Klaas Freitag 3714bb02f7 Put files with special char names to tarball and removed them.
Jenkins on rotor.o.o is for some reason not able currently to
work with these file names.
2013-11-11 20:44:31 +01:00
Klaas Freitag 14081a197b Call ne_sock_init and ne_sock_exit to initialize neons SSL stack.
See https://github.com/owncloud/mirall/issues/1115 for more details on
why that is done here now.
2013-11-11 17:47:24 +01:00
Klaas Freitag 9323658b01 Remove ne_sock_init and ne_sock_exit from owncloud module.
This change, together with a change in mirall calling the two functions
in folderman, should fix https://github.com/owncloud/mirall/issues/1115

This needs to be verified and maybe reverted!
2013-11-11 17:45:19 +01:00
Daniel Molkentin 9fe2549938 Add user info if the auth backends provides it 2013-11-11 16:57:15 +01:00
Klaas Freitag e0a50d4bb9 PostSyncCleanup added: Remove superfluous entries from database after
sync.
2013-11-11 16:45:40 +01:00
Klaas Freitag 7f10b09a96 Set moved files which are changed to instruction EVAL. 2013-11-11 16:44:21 +01:00
Daniel Molkentin ad1c1f4130 Remove legacy code 2013-11-11 15:36:49 +01:00
Daniel Molkentin 121b18bf70 QtKeychain is not a hard dependency 2013-11-11 15:36:29 +01:00
Daniel Molkentin 22ed29a30b Remove obsolete credentialstore class 2013-11-11 15:24:07 +01:00
Daniel Molkentin 64b59f8679 Don't use integration directory 2013-11-11 15:22:51 +01:00
Daniel Molkentin 406ed5a0c0 Make new folder wizard work again 2013-11-11 15:20:07 +01:00
Daniel Molkentin d5081f4328 Fix logic 2013-11-11 14:02:54 +01:00