Olivier Goffart
671af9f8fe
Merge branch 'master'
2015-10-19 15:53:58 +02:00
Olivier Goffart
6ea05ff6e3
Dolphin shell integration: use the owncloud icons
2015-10-19 15:53:40 +02:00
Markus Goetz
00485e133f
VERSION.cmake: This is git not rc1
2015-10-19 15:51:33 +02:00
Olivier Goffart
c520ee4eab
Dolphin Shell Extension: renamove the kf5 in the name
2015-10-19 15:43:42 +02:00
Olivier Goffart
5408ec79f7
Dolphin shell extention: Remove the KDE4 based plugin
2015-10-19 15:42:41 +02:00
Olivier Goffart
f8e68ae823
Merge branch 'dolphin-plugin'
2015-10-19 15:41:47 +02:00
Olivier Goffart
184412d88e
Dolphin shell integration: Renames the plugins
...
And put the helper in a shared library so it is shared accross both plugins
2015-10-19 15:40:11 +02:00
Olivier Goffart
82d1d04774
Dolphin shell integration: share code between two plugins
2015-10-19 15:40:11 +02:00
Olivier Goffart
731d4b3d4d
Dolphin shell extention: adapt to the change in KDE Frameworks
2015-10-19 15:39:51 +02:00
Markus Goetz
ccec186b98
ETagJob: Depth 0 for server >= 8.1 #3730
2015-10-19 15:31:27 +02:00
Klaas Freitag
c66c259447
SettingsDialog: Add new widet called ActivityWidget.
...
This is the new widget to display server activity.
2015-10-19 14:41:53 +02:00
Klaas Freitag
4ad165ce26
Utility: add method fileNameForGuiUse(), pimp up filename for GUI
...
Currently, this one only replaces colons by / on Mac platform. This makes
the function resuseable.
2015-10-19 14:36:55 +02:00
Markus Goetz
24a801dfd3
CMake/NSIS: We don't need QtSql (more)
2015-10-19 13:56:36 +02:00
Markus Goetz
af79bc9211
CMake/NSIS: We don't need QtSql
...
The NSIS change also had a redundant libsqlite3 DLL entry
2015-10-19 13:46:46 +02:00
Klaas Freitag
a3904f4d32
Theme: Revert logic of singleAccount switch.
...
To use the same logic as the other clients and unify ownBrander
implementations, the switch is now called multiAccount() rather
than singleAccount() with a reverse logic.
Desktop Client stays with the default of having multiaacount
enabled.
Note that existing brandings need to rename the switch.
https://github.com/owncloud/ownbrander/issues/443
2015-10-19 12:26:42 +02:00
Olivier Goffart
5cac90b3eb
SelectiveSyncTreeView: show the size for the root item ( #3755 )
2015-10-19 10:58:54 +02:00
Olivier Goffart
df135a0bb2
Merge branch '2.0'
...
Conflicts:
src/gui/folder.cpp
2015-10-19 10:57:37 +02:00
Olivier Goffart
b7c927f349
csync: Fix warning the bit field need to be unsigned
2015-10-19 10:13:11 +02:00
Jenkins for ownCloud
64718fe567
[tx-robot] updated from transifex
2015-10-19 01:15:39 -04:00
Jenkins for ownCloud
79f14e0933
[tx-robot] updated from transifex
2015-10-18 01:15:40 -04:00
Jenkins for ownCloud
3ad8c692a4
[tx-robot] updated from transifex
2015-10-17 02:19:01 -04:00
Klaas Freitag
546cab3f62
Config: Use monochrome icons per default on MacOSX.
2015-10-16 18:55:07 +02:00
Roeland Jago Douma
4a04dc1a3e
Typos
2015-10-16 12:51:24 +02:00
Roeland Jago Douma
0e97fbb730
Use overloaded functions
2015-10-16 12:48:48 +02:00
Olivier Goffart
83edb7fb8a
csync: fix compilation error with -pedentic
2015-10-16 11:45:36 +02:00
Olivier Goffart
0c59c85127
SyncEngine: Folders with ignored files should not count when counting none files
...
If there is a any none files, we do not show the dialog saying that all
files have been removed. If a directory contiains ignored files, we still
want to show this message box even if the directory will not be deleted
2015-10-16 11:43:52 +02:00
Klaas Freitag
d6098c39dc
Update Changelog and bump version to 2.0.2rc1
2015-10-16 11:12:50 +02:00
Klaas Freitag
af721118cd
Merge branch '2.0' of github.com:owncloud/mirall into 2.0
2015-10-16 10:08:27 +02:00
Markus Goetz
0d5f2b5d31
Propagator: Reset upload blacklist if a chunk suceeds
...
For #3934
2015-10-16 10:06:45 +02:00
Klaas Freitag
1790a128aa
Version 2.0.1
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABAgAGBQJV5d2iAAoJEEmMRevpTns35HMP/jkQEXRcx+lIPWJ6EYptTmY2
j3icXJfkvhHDY1rFlIPsCAW/O9gmUWvIhM+kwxPemfShXmn6+5UOu10teoOkWYr+
WS6zMRmL0x2cXzouFDHqHz4DIx2iwH/A6h0IYHDf3oLdibCsUt8UyEraHQJdVDSn
+H/w3qjgrDmI50n03VGDf6iTZnSBwO9yuVJDJ8GiJT+wSKzh44k4pkTIkfgd5w5v
C0vju24UT7N4kfkshUi/ki51q1/wxgfmoEwgms6DHz6ByVd8Pf5ulcyAGF2PGqMJ
yv3aQMtGIUPnZzZWHAXXbU08bTkI31GTJwsSSP4+uQRjqZmlcs0t39gUQPupPtpI
GWVD65ClpsvpTQ8enUhb6/VDjUhjuWjV/gX4qpdkoy4Ln1lh0ZUKvoUPsK20Emwp
9W/uqF82z+/NLuDFk14SFzU7q6UFQZg9mqdagFLwuRZ8HnJEwlIiIXQESSbqTSuZ
SC2i1uZ3FUC48M1o6nqdrO7iUboSluTnSKmud0UpvCqoRMV60PLwfJW+kuu8IHPU
84a3GUF0vWab8ENFC0anfE+omB8iQLLs5OP27iRXfBuIlgqvwVAnCMU99miqw/Cs
i6p+IrMXtpYVPR4oAAVUla4YEqRSu5f/4yZ7GOuuodnf8U43RC9aNfJH5Z1qO2AE
ddZE9V4Pm57SIaz4f9vJ
=Nyot
-----END PGP SIGNATURE-----
Merge tag 'v2.0.1' into 2.0
Version 2.0.1
2015-10-16 10:06:38 +02:00
Olivier Goffart
87fa1794a1
Updater: remove unused function
...
It was even throwing a warning because it is an infinite recursion
2015-10-16 09:56:26 +02:00
Olivier Goffart
4df828d0b0
csync_file_stat_s: Save a bit of memory
2015-10-16 09:56:26 +02:00
Hugo Gonzalez Labrador
4d1d6dff3b
Increased fileID size to 36 bytes
...
This is the size used by UUIDs
2015-10-16 09:27:19 +02:00
Olivier Goffart
81e30cd8d2
Merge pull request #3695 from owncloud/nomkpath3692
...
Folder: Do not create the sync folder if it does not exist #3692
2015-10-16 09:21:15 +02:00
Markus Goetz
983671c8cb
Shibboleth: Add our base user agent to WebKit
...
For #3913
2015-10-16 09:15:47 +02:00
Roeland Jago Douma
40ab3ee751
Now only 1 constructor to ocssharejob
...
* Pass the share_id to the functions that need it
2015-10-16 08:28:13 +02:00
Jenkins for ownCloud
eb6b254dc5
[tx-robot] updated from transifex
2015-10-16 02:19:02 -04:00
Roeland Jago Douma
f95fea9866
Move permissions to OcsShareJob
2015-10-16 08:09:57 +02:00
Roeland Jago Douma
03719334ea
Remove unused members
2015-10-15 22:27:55 +02:00
Roeland Jago Douma
4441053b1c
Thumbnailjob fixes
...
* Comments
* Use the path of the abstractnetworkjob
2015-10-15 22:18:22 +02:00
Roeland Jago Douma
a34b663828
Now add parameters in a less crappy way
2015-10-15 21:58:16 +02:00
Roeland Jago Douma
db1f4d4016
OCSJob -> OcsJob and more docs
2015-10-15 20:54:52 +02:00
Roeland Jago Douma
3ea944d1b3
Added setPublicUpload to OcsShareJob
2015-10-15 20:34:56 +02:00
Roeland Jago Douma
b293aa762c
Split sharing code
...
There is now a generic OCSJob which must be inherited by other jobs. This is in
prepartion for the other OCS job that will come (for the Sharee API endpoint
for example).
More logic is moved from the sharedialog to the OcsShareJob. So in the GUI code
we now only say what we want (a new share, set the password etc). And the code
in libsync will make that happen. Error handling is for now still done in the
GUI part.
For now the ocsjob and ocssharejob live in gui but probabaly we should
create a libshare or libocs at some point.
2015-10-15 20:05:47 +02:00
Markus Goetz
b5e75afc17
General settings: Align checkbox #3758
2015-10-15 19:15:50 +02:00
Markus Goetz
027a865fbc
Account Settings: Show selective sync buttons after list load
...
Especially nice when having a slower network.
For #3839
2015-10-15 18:52:16 +02:00
Markus Goetz
132b5f5130
Account Settings: Expand selective sync on show #3585
2015-10-15 17:27:38 +02:00
Markus Goetz
c3754e1fdd
folderstatusmodel.h: Fix warning
2015-10-15 17:27:29 +02:00
Markus Goetz
963eb1f29b
VERSION.cmake: master is 2.1
2015-10-15 16:51:29 +02:00
Christian Kamm
c418d67920
Merge remote-tracking branch 'origin/2.0'
2015-10-15 15:54:09 +02:00
