summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-01142-6/+272
|
* Merge pull request #15335 from owncloud/revert-15215-ext-gdrivelistfilequotingLukas Reschke2015-03-312-20/+18
|\ | | | | Revert "Properly quote file names in listFiles query for GDrive"
| * Revert "Properly quote file names in listFiles query for GDrive"Lukas Reschke2015-03-312-20/+18
|/
* Merge pull request #15215 from owncloud/ext-gdrivelistfilequotingFrank Karlitschek2015-03-312-18/+20
|\ | | | | Properly quote file names in listFiles query for GDrive
| * Added rawurlencode for other params in GDrive storageVincent Petry2015-03-261-2/+2
| |
| * Properly quote file names in listFiles query for GDriveVincent Petry2015-03-262-17/+19
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-31142-624/+842
| |
* | Merge pull request #15312 from owncloud/activity-fix-compilationLukas Reschke2015-03-301-12/+7
|\ \ | | | | | | Correct the app name for sharing events
| * | Correct the app name for sharing eventsJoas Schilling2015-03-301-12/+7
| | |
* | | Merge pull request #15169 from rullzer/fix_displayNamesInGroupMorris Jobke2015-03-303-5/+5
|\ \ \ | | | | | | | | Groupmanagers displayNamesInGroup should actually search in displaynames
| * | | Call the proper functionRoeland Jago Douma2015-03-241-1/+1
| | | | | | | | | | | | | | | | * Fix for #6967
| * | | Fix unit testsRoeland Jago Douma2015-03-241-3/+3
| | | | | | | | | | | | | | | | Altough more are required to make sure this does not happen again
| * | | When searching for displayname then search for displaynameRoeland Jago Douma2015-03-241-1/+1
| | | |
* | | | Merge pull request #15076 from owncloud/fix-smb-oc-adminRobin McCorkell2015-03-301-4/+11
|\ \ \ \ | | | | | | | | | | Support constructing an SMB_OC without saved session credentials
| * | | | Support constructing an SMB_OC without saved session credentialsRobin McCorkell2015-03-201-4/+11
| | | | |
* | | | | Merge pull request #15042 from wolfgangkarall/masterLukas Reschke2015-03-301-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | .htaccess RewriteRules: use permanent redirect for .well-known/(cal|card)dav, add 'L' flag
| * | | | use permanent redirect for .well-known/(cal|card)dav, add 'L' flagWolfgang Karall2015-03-191-2/+2
| | | | |
* | | | | Merge pull request #15269 from owncloud/migrate-checksetup-and-add-memcacheRobin McCorkell2015-03-3010-92/+382
|\ \ \ \ \ | | | | | | | | | | | | Add check for activated local memcache
| * | | | | Add check for activated local memcacheLukas Reschke2015-03-2810-92/+382
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also used the opportunity to refactor it into an AppFramework controller so that we can unit test it. Fixes https://github.com/owncloud/core/issues/14956
* | | | | | Merge pull request #13964 from rullzer/capabilitiesMorris Jobke2015-03-303-0/+280
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add OCS sharing info to capabilities - take 2
| * | | | | | Mark functions privateRoeland Jago Douma2015-03-111-2/+2
| | | | | | |
| * | | | | | Slight better formattingRoeland Jago Douma2015-03-112-47/+11
| | | | | | |
| * | | | | | New array syntaxRoeland Jago Douma2015-03-112-56/+56
| | | | | | |
| * | | | | | Added new headerRoeland Jago Douma2015-03-112-11/+35
| | | | | | |
| * | | | | | Now added enabled elementRoeland Jago Douma2015-03-112-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows for more generic parsing for the capabilities.
| * | | | | | Added route againRoeland Jago Douma2015-03-111-0/+6
| | | | | | |
| * | | | | | Add file_sharing info to capabilitiesRoeland Jago Douma2015-03-112-0/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display the capabilities regarding file sharing in the capabilities API. This will allow the clients to provide users a better experince.
* | | | | | | Merge pull request #15239 from owncloud/see-no-evilMorris Jobke2015-03-305-21/+127
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move federated cloud sharing, files externals and updater to special pos...
| * | | | | | | Fix link to the updaterJoas Schilling2015-03-272-1/+6
| | | | | | | |
| * | | | | | | fix layout for Sharing settingsJan-Christoph Borchardt2015-03-272-14/+17
| | | | | | | |
| * | | | | | | Move federated cloud sharing, files externals and updater to special positionsJoas Schilling2015-03-274-8/+106
| | | | | | | |
* | | | | | | | Merge pull request #15295 from owncloud/add-more-spacing-dialogMorris Jobke2015-03-302-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add more spacing to the file picker dialog
| * | | | | | | | Add more spacing to the file picker dialogLukas Reschke2015-03-282-2/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Without this the first `>` looked somewhat off, to test this change go to the personal settings and choose a profile picture in a subfolder.
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-3026-0/+62
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2956-18/+74
|/ / / / / / /
* | | | | | | Merge pull request #15289 from owncloud/min-upload-limitVincent Petry2015-03-281-3/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Require minimum 1 MiB upload limit
| * | | | | | | Require minimum 1 MiB upload limitRobin McCorkell2015-03-271-3/+7
| | | | | | | |
* | | | | | | | Merge pull request #15288 from owncloud/check-datadir-relativeVincent Petry2015-03-282-5/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Check for relative datadirectory path
| * | | | | | | | Check for relative datadirectory pathRobin McCorkell2015-03-272-5/+30
| |/ / / / / / /
* / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-03-28116-40/+240
|/ / / / / / /
* | | | | | | Merge pull request #15284 from owncloud/revert-master-breakageMorris Jobke2015-03-274-129/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"
| * | | | | | | Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"Vincent Petry2015-03-274-129/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | This reverts commit 012016d3311a13c3c1e9d60778dc6fbd6be0204e.
* | | | | | | Merge pull request #15155 from owncloud/share-donotreturntrashedfilesMorris Jobke2015-03-272-11/+88
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Do not return shares for files outside "files"
| * | | | | | | Add logout in share test to avoid nasty side effectsVincent Petry2015-03-271-0/+1
| | | | | | | |
| * | | | | | | Do not return shares for files outside "files"Vincent Petry2015-03-272-11/+87
| | | | | | | |
* | | | | | | | Merge pull request #13938 from owncloud/deprecate-iappconfigThomas Müller2015-03-277-18/+155
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Deprecated \OCP\IAppConfig - add missing methods to IConfig
| * | | | | | | | migrate share helper method to IConfigMorris Jobke2015-03-181-3/+5
| | | | | | | | |
| * | | | | | | | fix unit testsMorris Jobke2015-03-171-5/+15
| | | | | | | | |
| * | | | | | | | fix failing unit testMorris Jobke2015-03-171-4/+6
| | | | | | | | |
| * | | | | | | | Deprecated \OCP\IAppConfig - add missing methods to IConfigMorris Jobke2015-03-174-6/+129
| | | | | | | | |