Klaas Freitag
43800e3d1c
Merge pull request #4049 from Naereen/patch-1
...
Reviewing, improved style, and a initializing message
2015-11-02 10:14:07 +01:00
Klaas Freitag
3b8e1dcd89
SettingsDialog: Make ActivityWidget a member.
2015-11-01 22:30:46 +01:00
Klaas Freitag
302d6b321e
ActivityWidget: Add a job to fetch activities, Activity object added
2015-11-01 22:30:37 +01:00
Jenkins for ownCloud
3f85694394
[tx-robot] updated from transifex
2015-11-01 02:18:55 -05:00
RealRancor
8c5ef2f1c3
Make registry key a code block in autoupdate docs.
2015-10-31 19:05:21 +01:00
Lilian Besson
aa1a2d1247
Reviewing, improved style, and a initializing message
...
- Add an "Initializing owncloud-client-nautilus extension" message
2015-10-31 13:07:18 +01:00
Olivier Goffart
3993a7f636
OwnSQL: add asserts in case of error that should not happen
2015-10-30 14:05:58 +01:00
Olivier Goffart
aaf16ff0e8
SyncJournalDB, clear all the queries before closing the database
2015-10-30 14:03:08 +01:00
Olivier Goffart
16c078963b
owncloudcmd: add --max-sync-retries #4037
...
And limit by default to 3 retries
2015-10-30 13:36:31 +01:00
Klaas Freitag
9279bcdba4
Add a tabwidget to Settings dialog for activity.
2015-10-30 13:26:27 +01:00
Olivier Goffart
0c467ef5b4
Sync engine: fix signal/slot connection
2015-10-30 13:21:34 +01:00
Olivier Goffart
49cd53ee44
FolderStatusModel: attempt to detect removed undecided files #3612
2015-10-30 12:43:33 +01:00
Olivier Goffart
0e6a463564
Discovery: Don't leak DiscoveryDirectoryResult in case of error
...
Also remove redundent Q_FUNC_INFO
2015-10-30 12:43:33 +01:00
Roeland Douma
d38b190317
Merge pull request #4033 from owncloud/share_object
...
Add share manager and the share objects
2015-10-30 11:01:03 +01:00
Klaas Freitag
29558cb7bb
Merge pull request #4040 from owncloud/phil-davis-changelog-master
...
ChangeLog typos that reverted in merge from 2.0
2015-10-30 10:36:38 +01:00
Jenkins for ownCloud
d2cd237e25
[tx-robot] updated from transifex
2015-10-30 02:19:00 -04:00
Roeland Jago Douma
c7b814337a
Use proper QFlags
...
Now the ShareTypes and Permissions are part of the Share class (which is
a bit better abstracted away).
2015-10-29 21:47:47 +01:00
Phil Davis
ced51813c7
ChangeLog typos that reverted in merge from 2.0
...
Hopefully the last place I need to submit this again :)
2015-10-29 23:35:48 +05:45
Roeland Jago Douma
dd8d02b8ef
Act properly if OCS endpoint returned an error (OCS error)
...
For now pass it on to the gui. So at least they know something is wrong.
2015-10-29 16:56:23 +01:00
Olivier Goffart
c3cf6aef7d
SyncEngine: Don't whipe the white list if the sync was aborted
...
Issue #4018
2015-10-29 16:47:39 +01:00
Olivier Goffart
38a8e5ee03
Discovery: conding style: use const references for function parameters
2015-10-29 16:47:36 +01:00
Klaas Freitag
46269dac4e
Merge branch '2.0'
...
Conflicts:
ChangeLog
2015-10-29 16:34:15 +01:00
Roeland Jago Douma
8c0297f688
Use QLatin1Char
2015-10-29 16:03:47 +01:00
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
