summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 9.0.1 RC2v9.0.1RC2C Montero-Luque2016-04-011-2/+2
* Merge pull request #23590 from owncloud/fix-themes-for-stable9Thomas Müller2016-04-011-1/+1
|\
| * [stable9] Fix for themes with .jpg backgroundsDaniel Hansson2016-03-261-1/+1
* | Merge pull request #23684 from owncloud/stable9-backport-23676Thomas Müller2016-04-013-1/+19
|\ \
| * | Properly handle return values of OC_App::getAppInfo()Morris Jobke2016-04-013-1/+19
|/ /
* | Merge pull request #23709 from owncloud/stable9-make-sure-that-encrypted-vers...Thomas Müller2016-04-012-7/+26
|\ \
| * | Make sure that the encrypted version is setLukas Reschke2016-03-312-7/+26
* | | Merge pull request #23710 from owncloud/fix_encryption_versions_on_external_s...Thomas Müller2016-04-0112-130/+311
|\ \ \
| * | | fix creation of versions of encrypted files on external storagesBjoern Schiessle2016-03-3112-130/+311
| |/ /
* | | Merge pull request #23518 from owncloud/stable9-gdrive-stream-downloadThomas Müller2016-03-311-4/+5
|\ \ \
| * | | GDrive stream download with RetryWrapperVincent Petry2016-03-301-4/+5
* | | | Merge pull request #23522 from owncloud/stable9-dropbox-stream-downloadFrank Karlitschek2016-03-312-8/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Dropbox stream download with RetryWrapperVincent Petry2016-03-231-4/+6
| * | | Fix dropbox storage to not store the whole file in memoryVincent Petry2016-03-232-7/+29
* | | | Merge pull request #23689 from owncloud/revert-23629Thomas Müller2016-03-3114-137/+65
|\ \ \ \
| * | | | Revert "Explicitly add the current principal to the acl in case of group shar...Thomas Müller2016-03-3114-137/+65
|/ / / /
* | | | Merge pull request #23673 from owncloud/stable9-fix-sftp-retry-wrapperThomas Müller2016-03-311-1/+3
|\ \ \ \
| * | | | Use RetryWrapper for SFTP storageLukas Reschke2016-03-301-1/+3
* | | | | Merge pull request #23552 from owncloud/fix-group-sharing-for-v1-caldav-and-c...Thomas Müller2016-03-3110-88/+214
|\ \ \ \ \
| * | | | | Handle group shares of addressbooks on v1 as well ... now FINALLY ....Thomas Müller2016-03-311-1/+2
| * | | | | Fix acls for calendar objects and cards - fixes #23273Thomas Müller2016-03-319-84/+193
| * | | | | Return proper current-user-principal on v1 endpoints - fixes #23306Thomas Müller2016-03-311-0/+15
| * | | | | Fix group shares on v1 caldav and carddav - fixes #23328Thomas Müller2016-03-313-4/+5
|/ / / / /
* | | | | Merge pull request #23629 from owncloud/fix-group-sharing-access-stable9Thomas Müller2016-03-3114-67/+139
|\ \ \ \ \
| * | | | | Fix unit testThomas Müller2016-03-301-1/+1
| * | | | | Explicitly add the current principal to the acl in case of group sharingThomas Müller2016-03-2914-66/+138
* | | | | | Merge pull request #23640 from owncloud/backport-23545-lock-mountpoint-on-rem...Thomas Müller2016-03-311-0/+4
|\ \ \ \ \ \
| * | | | | | Lock the mountpoint while removingJoas Schilling2016-03-301-0/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #23659 from owncloud/backport-23654-xcache-availablilityThomas Müller2016-03-311-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | xcache.var_size with 64M should evaluate to isAvailableJoas Schilling2016-03-301-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #23664 from owncloud/stable9-share-displayownerfixThomas Müller2016-03-302-3/+4
|\ \ \ \ \
| * | | | | Fix displaying owner before share icon in file listVincent Petry2016-03-302-3/+4
* | | | | | Merge pull request #23662 from owncloud/make-google-drive-drumpf-againThomas Müller2016-03-301-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use the shipped cacerts.pem instead of the global oneLukas Reschke2016-03-301-0/+1
| |/ / / /
* | | | | Merge pull request #23652 from owncloud/stable9_23651Thomas Müller2016-03-302-1/+24
|\ \ \ \ \
| * | | | | Non moveable mount points should always be UPDATE+DELETE shareableRoeland Jago Douma2016-03-302-1/+24
| |/ / / /
* | | | | Merge pull request #23641 from owncloud/avatar-remove-9Thomas Müller2016-03-302-3/+2
|\ \ \ \ \
| * | | | | only remove avatars from the folder we store them inRobin Appelman2016-03-302-3/+2
| |/ / / /
* | | | | Merge pull request #23618 from owncloud/backport-23543-activity-emails-always...Thomas Müller2016-03-302-2/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow the activity app to set the current user when sending emailsJoas Schilling2016-03-292-1/+29
| * | | | We are only formatting an object when it's not nullJoas Schilling2016-03-291-1/+2
| | |_|/ | |/| |
* | | | Merge pull request #23631 from owncloud/stable9-upload-whiteThomas Müller2016-03-302-3/+1
|\ \ \ \
| * | | | correct form of upload-white icon to be same as upload iconJan-Christoph Borchardt2016-03-292-3/+1
| | |/ / | |/| |
* / | | 9.0.1 RC1v9.0.1RC1C Montero-Luque2016-03-291-2/+2
|/ / /
* | | Merge pull request #23582 from owncloud/avatar-save-failure-9Thomas Müller2016-03-294-7/+25
|\ \ \
| * | | dont die when we cant save the resized avatar, log insteadRobin Appelman2016-03-254-7/+25
| |/ /
* | | Merge pull request #23570 from owncloud/stable9-dav-sharetypes-remoteThomas Müller2016-03-294-2/+8
|\ \ \ | |/ / |/| |
| * | Return remote shares in oc:share-types Webdav propertyVincent Petry2016-03-244-2/+8
* | | Merge pull request #23550 from owncloud/backport-23542Thomas Müller2016-03-241-3/+6
|\ \ \ | |/ / |/| |
| * | getAppPath can return falseLukas Reschke2016-03-241-3/+6