summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* GDrive stream download with RetryWrapperVincent Petry2016-03-301-4/+5
|
* Merge pull request #23660 from owncloud/master-make-google-drive-drumpf-againThomas Müller2016-03-301-0/+1
|\ | | | | Use the shipped cacerts.pem instead of the global one
| * Use the shipped cacerts.pem instead of the global oneLukas Reschke2016-03-301-0/+1
| | | | | | | | The one we ship may cause problems since Equifax is not included anymore (SHA-1 certs) are deprecated. We should just be consistent here and also use the certificate file which is used by the other calls in the library.
* | Merge pull request #23628 from owncloud/avatar-removeThomas Müller2016-03-302-3/+2
|\ \ | | | | | | only remove avatars from the folder we store them in
| * | only remove avatars from the folder we store them inRobin Appelman2016-03-302-3/+2
| | |
* | | Merge pull request #23654 from owncloud/issue-23653-xcache-detection-failsThomas Müller2016-03-301-1/+1
|\ \ \ | | | | | | | | xcache.var_size with 64M should evaluate to isAvailable
| * | | xcache.var_size with 64M should evaluate to isAvailableJoas Schilling2016-03-301-1/+1
| | |/ | |/|
* | | Merge pull request #23651 from owncloud/fix_23536Thomas Müller2016-03-302-1/+24
|\ \ \ | |/ / |/| | Non moveable mount points should always be UPDATE+DELETE shareable
| * | Non moveable mount points should always be UPDATE+DELETE shareableRoeland Jago Douma2016-03-302-1/+24
|/ / | | | | | | | | | | | | | | | | | | | | | | Fixes #23536 The new sharing code is much stricter in checking permissions. However for non moveable mounts the permissions UPDATE+DELETE are not reported on the mount point. This is just a quick fix. * Updated unit tests
* | Merge pull request #23630 from owncloud/upload-whiteThomas Müller2016-03-302-3/+1
|\ \ | | | | | | correct form of upload-white icon to be same as upload icon
| * | correct form of upload-white icon to be same as upload iconJan-Christoph Borchardt2016-03-292-3/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-3014-2/+42
|/ /
* | Merge pull request #23543 from owncloud/issue-23503-activity-emails-always-shortThomas Müller2016-03-292-2/+31
|\ \ | | | | | | Fix activity emails always using the short translation
| * | Allow the activity app to set the current user when sending emailsJoas Schilling2016-03-242-1/+29
| | |
| * | We are only formatting an object when it's not nullJoas Schilling2016-03-241-1/+2
| | |
* | | Merge pull request #23568 from ↵Thomas Müller2016-03-291-1/+2
|\ \ \ | |_|/ |/| | | | | | | | owncloud/finally-fix-23328-now-for-addressbooks-as-well Handle group shares of addressbooks on v1 as well ... now FINALLY ....
| * | Handle group shares of addressbooks on v1 as well ... now FINALLY ....Thomas Müller2016-03-241-1/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2948-22/+156
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2828-6/+206
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2742-18/+194
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2636-0/+110
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2544-4/+270
| | |
* | | Merge pull request #23549 from owncloud/dav-sharetypes-remoteThomas Müller2016-03-244-2/+8
|\ \ \ | | | | | | | | Return remote shares in oc:share-types Webdav property
| * | | Return remote shares in oc:share-types Webdav propertyVincent Petry2016-03-244-2/+8
| | | | | | | | | | | | | | | | | | | | Fixes web UI to properly display the share status icon when an outgoing remote share exists
* | | | Merge pull request #23545 from owncloud/issue-17144-lock-mount-point-on-removalThomas Müller2016-03-241-0/+4
|\ \ \ \ | | | | | | | | | | Lock the mountpoint while removing
| * | | | Lock the mountpoint while removingJoas Schilling2016-03-241-0/+4
| | | | |
* | | | | Merge pull request #23154 from owncloud/avatar-save-failureThomas Müller2016-03-244-7/+25
|\ \ \ \ \ | |_|_|/ / |/| | | | dont die when we cant save the resized avatar, log instead
| * | | | dont die when we cant save the resized avatar, log insteadRobin Appelman2016-03-114-7/+25
| | | | |
* | | | | Merge pull request #23511 from owncloud/sidebar-clickThomas Müller2016-03-242-4/+19
|\ \ \ \ \ | | | | | | | | | | | | sidebar click modification
| * | | | | sidebar click modificationErik Pellikka2016-03-242-4/+19
| | |/ / / | |/| | |
* | | | | Merge pull request #23551 from owncloud/objectstoremissingvarThomas Müller2016-03-241-0/+4
|\ \ \ \ \ | | | | | | | | | | | | add missing var
| * | | | | add missing varJörn Friedrich Dreyer2016-03-241-0/+4
| | | | | |
* | | | | | Merge pull request #23342 from ↵Thomas Müller2016-03-2410-88/+212
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | owncloud/fix-group-sharing-for-v1-caldav-and-carddav Fix group shares on v1 caldav and carddav
| * | | | | Fix acls for calendar objects and cards - fixes #23273Thomas Müller2016-03-249-84/+192
| | | | | |
| * | | | | Return proper current-user-principal on v1 endpoints - fixes #23306Thomas Müller2016-03-241-0/+15
| | | | | |
| * | | | | Fix group shares on v1 caldav and carddav - fixes #23328Thomas Müller2016-03-243-4/+5
| | |_|_|/ | |/| | |
* | | | | Merge pull request #23542 from ↵Thomas Müller2016-03-241-3/+6
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | owncloud/catch-empty-app-path-oh-we-really-should-use-exceptions-in-the-future getAppPath can return false
| * | | | getAppPath can return falseLukas Reschke2016-03-241-3/+6
| |/ / / | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23533
* | | | Merge pull request #23530 from owncloud/fix-shibbolethVincent Petry2016-03-243-36/+242
|\ \ \ \ | |/ / / |/| | | Check if request is sent from official ownCloud client
| * | | Check if request is sent from official ownCloud clientLukas Reschke2016-03-243-36/+242
|/ / / | | | | | | | | | | | | | | | There are authentication backends such as Shibboleth that do send no Basic Auth credentials for DAV requests. This means that the ownCloud DAV backend would consider these requests coming from an untrusted source and require higher levels of security checks. (e.g. a CSRF check) While an elegant solution would rely on authenticating via token (so that one can properly ensure that the request came indeed from a trusted client) this is a okay'ish workaround for this problem until we have something more reliable in the authentication code.
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-24372-1018/+420
| | |
* | | Merge pull request #23515 from owncloud/issue-22695-wrong-menu-translationsThomas Müller2016-03-231-6/+4
|\ \ \ | | | | | | | | Fix the translations of the User menu
| * | | Fix the translations of the User menuJoas Schilling2016-03-231-6/+4
| | | |
* | | | Merge pull request #23507 from owncloud/fix-23496-masterThomas Müller2016-03-231-2/+4
|\ \ \ \ | | | | | | | | | | Avoid fatal php error dring cron execution
| * | | | fixes #23496Thomas Müller2016-03-231-2/+4
| | | | |
* | | | | Merge pull request #23509 from owncloud/bump_polyfillThomas Müller2016-03-231-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | [3rdparty] Bump symfony/polyfill packages
| * | | | [3rdparty] Bump symfony/polyfill packagesRoeland Jago Douma2016-03-231-0/+0
|/ / / /
* | | | Merge pull request #22506 from owncloud/node-get-from-cacheThomas Müller2016-03-236-66/+131
|\ \ \ \ | | | | | | | | | | Query the cache when checking if a node exists
| * | | | properly use fileinfo objectsRobin Appelman2016-03-212-34/+75
| | | | |
| * | | | set watch policy in testRobin Appelman2016-03-212-9/+39
| | | | |