mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 05:25:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
8630 commits 473 branches 255 tags 510 MiB
Commit graph

8630 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Klaas Freitag
726be08917 Revert "Config: Use monochrome icons per default on MacOSX." 
This reverts commit 546cab3f62.
For OEMs this patch causes an empty tray icon set.
 2015-10-29 15:37:31 +01:00
Jenkins for ownCloud
4d7fde59c2 [tx-robot] updated from transifex 2015-10-29 02:18:59 -04:00
Olivier Goffart
3ff7fa0092 Merge pull request #3997 from owncloud/phil-davis-patch-1 
ChangeLog 2.0.2 minor typos for 2.0 branch
 2015-10-27 12:58:59 +01:00
Jenkins for ownCloud
6611d878ea [tx-robot] updated from transifex 2015-10-25 02:19:01 -04:00
Jenkins for ownCloud
c3fc711095 [tx-robot] updated from transifex 2015-10-24 02:18:59 -04:00
Phil Davis
2eb5715599 ChangeLog 2.0.2 minor typos for 2.0 branch 
These changes were committed to 2.0.2-rc1 branch https://github.com/owncloud/client/pull/3957/files 6da2139a1b but that branch was never merged up into 2.0 (or 2.0.2-rc2) so the changes never went anywhere.

These changes could also be applied on 2.0.2-rc2 and 2.0.2 branch for completeness - then they would be in every branch in which they have appeared.
 2015-10-23 21:21:31 +05:45
Markus Goetz
e5570c24f2 Merge pull request #3995 from owncloud/return-code-of-version-and-help 
owncloudcmd: Make returncode 0 for --version and --help
 2015-10-23 15:36:01 +02:00
Joas Schilling
6d87bd15cd Make returncode 0 for --version and --help 2015-10-23 15:17:29 +02:00
Jenkins for ownCloud
6fae06f1d0 [tx-robot] updated from transifex 2015-10-23 02:19:00 -04:00
Jenkins for ownCloud
b5390b5aa2 [tx-robot] updated from transifex 2015-10-22 02:19:02 -04:00
Daniel Molkentin
c8ae54d9e8 Merge pull request #3982 from owncloud/20-update 
update 3-dot menu
 2015-10-21 18:49:38 +02:00
Carla Schroder
daf6d8772f update 3-dot menu 2015-10-21 09:44:38 -07:00
Daniel Molkentin
78d782601e 2.0.2 final 2015-10-21 09:54:02 +02:00
Daniel Molkentin
86a83dc32c Finalize ChangeLog, adjust formatting 2015-10-21 09:53:34 +02:00
Daniel Molkentin
c67e53c7b2 set version suffix back to git 2015-10-21 09:48:18 +02:00
Jenkins for ownCloud
5659e04e89 [tx-robot] updated from transifex 2015-10-21 02:19:02 -04:00
Markus Goetz
5f43c9cfad Second RC of ownCloud Client 2.0.2 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJWJi7YAAoJEEmMRevpTns3ytcQAKZtrJUr8ZCCKGHka/V18bUq
 7u6CD5c1MNRV7e6kV4a3CGAt99ADgp8Fnl+jevHeYl33pNT0mRV8bFSJmMCx07Ml
 Bvpt+hXo73S5IoKt1qNwNES0DMHfLBupaZJQ9Ty2GGwko6SxXhEpqqceamoxpt0S
 VSbcID0K8tl7k85O4GNl48al4TmuIBWZ0+BMbQdc0/E9tbeKaIaIHVfkXFnPj/EF
 1igYirMGRziZip/RhisQircSKcipFa+rGcEusl8V4xGndx48yySPJ8Yi8tTSKrRQ
 toVZYxvfJxHQNuM0lir1dXdWdnJXtHBLeAU+OYQAQABpad4wgXaaRbSkhM81eBA1
 TZyr/GuAdFFcEGlYNyrORipxHuzUMdDqOCl0IxORqdOhGCjGrsd/G5RLY8k/hpC0
 GV7f1aXK85PTqmEF2sdknlF3jrT1E3dalPPa09hjHkCmlHiKry+dxdsvTA3xfNk2
 DMtTvp1B4ZhVkdep6Zk33WQeSexaczHH1WByOwruGKAdsAM2SMXOkYCc5JV3xx2/
 QsuC7911Y3CEVnfGZXX+fRQKuy4/7HtNSZCU9yGgpEH4QXw03n2qxU5zUeryUsPq
 zACvrlpxpbySOIvAkrQw+kLlHKELzy1kbsixztS5A518oVW9vRxdD+8JNHjuCaCc
 khyXPKHV/NCkC5oxtepj
 =vjZI
 -----END PGP SIGNATURE-----

Merge tag 'v2.0.2-rc2' into 2.0

Second RC of ownCloud Client 2.0.2
 2015-10-20 15:46:09 +02:00
Markus Goetz
4c9bc42b69 Revert libqsqlite changes for now 
QtWebKit depends on it unfortunately
 2015-10-20 13:04:33 +02:00
Klaas Freitag
d09de79491 Bump version to RC2 2015-10-20 11:30:00 +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
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
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
Jenkins for ownCloud
eb6b254dc5 [tx-robot] updated from transifex 2015-10-16 02:19:02 -04:00
Markus Goetz
745cf55abb SelectiveSync: Increase folder list timeout to 60 
Already done for 2.1 in 05eee16959
For #3524
 2015-10-15 14:43:11 +02:00
Olivier Goffart
e1c634d000 Don't show the settings if another instance is started less than 10 secs after the apps. 
Issue #3273

isSessionRestored was not set correctlty so ignore it
 2015-10-15 14:25:23 +02:00
Jenkins for ownCloud
49a3a3ba7b [tx-robot] updated from transifex 2015-10-15 02:19:02 -04:00
Carla Schroder
9982211ced Merge pull request #3950 from owncloud/revert-3931-phil-davis-3dot-menu-doc-20 
Revert "Update "..." menu documentation for 2.0"
 2015-10-14 09:04:06 -07:00
Carla Schroder
10f59bf3ad Revert "Update "..." menu documentation for 2.0" 2015-10-14 09:03:08 -07:00
Jenkins for ownCloud
7487d02a70 [tx-robot] updated from transifex 2015-10-14 02:19:00 -04:00
Jenkins for ownCloud
c39f6c3fae [tx-robot] updated from transifex 2015-10-13 02:19:01 -04:00
Jenkins for ownCloud
f4365dcca0 [tx-robot] updated from transifex 2015-10-12 02:18:57 -04:00
Jenkins for ownCloud
fd75d5c679 [tx-robot] updated from transifex 2015-10-11 02:18:57 -04:00