Klaas Freitag
bc5890d8b5
Add version suffix git.
2015-10-29 15:46:02 +01:00
Klaas Freitag
ee65315520
Merge branch '2.0.2' into 2.0
...
Conflicts:
ChangeLog
2015-10-29 15:44:56 +01:00
Roeland Jago Douma
12f7cfde87
Shares do not have parents
...
Also some pointer cleanups
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
6d80f3d756
Proper foreach
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
b32f752d31
Properly cleanup OCS jobs
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
cf8be7de91
Proper const usage
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
30a3498c22
Fix typos
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
239603e24c
Make sure enforced passwords are properly respected
...
Fixes for old and new servers
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
390daed3de
Added getPublicUpload to LinkShare
...
so the gui does not have to know abou the internal permissions
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
918c06aba3
Add share manager and the share objects
2015-10-29 15:42:20 +01:00
Klaas Freitag
726be08917
Revert "Config: Use monochrome icons per default on MacOSX."
...
This reverts commit 546cab3f62
2015-10-29 15:37:31 +01:00
Olivier Goffart
a127debc54
Quota: handle special negative value for the quota #3940
...
Don't show a progress bar if there is an unkown or unlimited total
2015-10-29 14:33:29 +01:00
Olivier Goffart
6aa26654f6
Merge remote-tracking branch 'origin/2.0'
2015-10-29 12:44:28 +01:00
Olivier Goffart
0fde7f0e6b
Propagator: Keep a meaningfull error with old server and invalid file names
...
We changed the discovery code not to ignore files whose filename contains
charachter invalid on windows. (Because newer versions of the server
supports them)
Servers older than 8.1 will just say "Bad Request" as an error and it's a
regression against previous client version. So keep nice error even with
older server.
Relates to #3736
2015-10-29 12:44:08 +01:00
Christian Kamm
d9f8edd259
Hidden files: Consider .* hidden everywhere #4023
...
This seems to be the only place where we did this only on
non-windows OSes.
2015-10-29 11:59:46 +01:00
ckamm
251679253a
Merge pull request #3951 from ckamm/checksum
...
Checksums stored in database #3735
2015-10-29 10:40:24 +01:00
Christian Kamm
64756c5dce
--version also shows Qt version
...
That makes it much easier for people reporting bugs.
2015-10-29 09:48:36 +01:00
Christian Kamm
9788055147
Propagator: Add blacklisting of disk space errors #2939
2015-10-29 09:36:59 +01:00
Jenkins for ownCloud
4d7fde59c2
[tx-robot] updated from transifex
2015-10-29 02:18:59 -04:00
Daniel Molkentin
4737c16996
State application name in update notification
...
Fixes #4020
2015-10-28 20:45:57 +01:00
Markus Goetz
c97dfbf60c
ChangeLog: Mention propagator removal
2015-10-28 17:03:47 +01:00
Christian Kamm
496b1e907d
Checksum: Don't lose it on metadata update #3735
...
Also improve tests.
2015-10-28 14:49:55 +01:00
Christian Kamm
566131209d
Checksum: Fixes after review
2015-10-28 14:46:20 +01:00
Christian Kamm
b7823dc648
Checksum: Put checksum type into separate column #3735
2015-10-28 14:46:20 +01:00
Olivier Goffart
6d28a1b645
Fix Qt4 compilation
2015-10-28 13:26:35 +01:00
Markus Goetz
b6aa18bfbc
sync-exclude.lst: More likely matching files first
2015-10-28 11:25:02 +01:00
Markus Goetz
d91ffc216a
Exclude: Add .fuse_hidden #3999
...
No matter if we sync hidden files or not, those are files we should not sync
2015-10-28 11:18:44 +01:00
Markus Goetz
a6c9e8c5b4
Merge branch 'kill_legacy_propagator'
2015-10-28 11:06:50 +01:00
Markus Goetz
9337927722
legacy propagator: Remove more code
2015-10-28 10:59:02 +01:00
Christian Kamm
c81b02c7d9
csync tests: Remove unused function
2015-10-28 10:04:15 +01:00
Christian Kamm
5ea09d2668
Checksum: Disallow ADLER32, use Adler32 #3735
2015-10-28 09:59:33 +01:00
Christian Kamm
b9fc4c5994
Checksum: Fix recomputation when forced in cfg file #3735
...
Don't recompute the checksum on each upload when the server does not
advertise supporting checksums.
2015-10-28 09:56:39 +01:00
Christian Kamm
f1b500d3e0
Checksum: Add env variables to disable #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
dff37e11eb
Propagate: Store computed checksums in db during upload #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
b1387f801b
Propagate: On download store checksum header in db #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
60b2312ab6
SyncJournal: Add checksumHeader column to metadata table #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
0354289795
Checksums: Improvement in async computation and validation #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
c11c35c459
Revert "In case of empty checksum type, emit validated."
...
This reverts commit b05ca526a4
2015-10-28 09:56:39 +01:00
Christian Kamm
7c5e70ac3c
PropagateUpload: Fix double-emission of finished #3844
2015-10-28 09:53:54 +01:00
Christian Kamm
d2e5ba123d
Fix compile after pull request merge
...
It conflicted with the optimization in
f18b40f7e7
2015-10-28 09:53:06 +01:00
Klaas Freitag
0c9568f6dc
Merge pull request #4004 from owncloud/fix_hidden_detection
...
Fix hidden detection
2015-10-28 09:28:35 +01:00
Olivier Goffart
f1d48a9356
Folder Model: The item needs to be selectable for the currenIndex to appear selected
...
And we set the current index in AccountSettings::slotLinkActivated
2015-10-27 17:37:12 +01:00
Olivier Goffart
89f2a9e6dc
Account Settings: A link should make sure all the parents are expanded
2015-10-27 17:37:12 +01:00
Klaas Freitag
a203da3919
FolderStatusModel: Check for null argument at start.
2015-10-27 17:37:12 +01:00
Klaas Freitag
1c1ef52cf1
AccountSettings: Display a link for undecided dirs in the sub text.
...
This only works in case the index is known. If not, no link is
shown, but we wait for the next update of the model.
2015-10-27 17:37:12 +01:00
Klaas Freitag
40c82c5c36
AccountSettings: Add index to undecided folder to be able to select it.
2015-10-27 17:37:12 +01:00
Klaas Freitag
81f0c6535e
Enable external links in the label.
2015-10-27 17:37:12 +01:00
Klaas Freitag
46558d79a5
Add slot to handle clicks on folder names.
2015-10-27 17:37:12 +01:00
Olivier Goffart
e86b4203b9
IgnoreFiles: Fix the socket API would not load the new custom ignored files #3496
...
We did not flush or closed the file after having modified it from the UI.
So when the socket api was reloading it, it wouldn't be able to load
the newly added rules
2015-10-27 16:07:59 +01:00
Olivier Goffart
05dd9554f9
SocketApi: Fix returning ignore for the root item all the time
2015-10-27 16:06:38 +01:00
