summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-0218-22/+98
|
* Merge pull request #15364 from rullzer/apps_linkToDocsRoeland Douma2015-04-012-2/+2
|\ | | | | Use URLGenerator instead of OC_Helper for linkToDocs
| * Use URLGenerator instread of OC_HelperRoeland Jago Douma2015-04-012-2/+2
| |
* | Merge pull request #15366 from rullzer/deprecate_util_linksRobin McCorkell2015-04-012-0/+8
|\ \ | | | | | | Deprecate functions (OC_Helper + OCP\Util) that only call the urlgenerator anyway
| * | Deprecate functions that only call the urlgenerator anywayRoeland Jago Douma2015-04-012-0/+8
| |/
* | Merge pull request #15358 from owncloud/global-cmdMorris Jobke2015-04-011-2/+2
|\ \ | | | | | | Allow app:check-code and l10n:createjs commands when not installed
| * | Allow app:check-code and l10n:createjs commands when not installedRobin McCorkell2015-04-011-2/+2
| | |
* | | Merge pull request #15353 from owncloud/run-cron-with-the-correct-user-masterMorris Jobke2015-04-011-0/+16
|\ \ \ | |_|/ |/| | Cron has to be executed with the correct user
| * | Cron has to be executed with the correct user - fixes 13912 and othersThomas Müller2015-04-011-0/+16
| | |
* | | Merge pull request #15354 from pierrejochem/patch-1Thomas Müller2015-04-011-1/+3
|\ \ \ | | | | | | | | More secure proposal
| * | | More secure proposalPierre Jochem2015-04-011-1/+3
| | | |
* | | | Merge pull request #15356 from rullzer/apps_oc_to_ocsRoeland Douma2015-04-017-7/+7
|\ \ \ \ | |/ / / |/| | | Move core apps from private to public functions (trivial part)
| * | | Move core apps from private to public functionsRoeland Jago Douma2015-04-017-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Apps still use OC_Helper and OC_Util functions even when public ones are already available. Sometimes the public one is even used in the same file.
* | | | Merge pull request #15336 from owncloud/revive-15215Morris Jobke2015-04-012-18/+20
|\ \ \ \ | | | | | | | | | | Properly quote file names in listFiles query for GDrive
| * | | | Only escape single quotesLukas Reschke2015-03-311-2/+2
| | | | |
| * | | | Added rawurlencode for other params in GDrive storageVincent Petry2015-03-311-2/+2
| | | | |
| * | | | Properly quote file names in listFiles query for GDriveVincent Petry2015-03-312-17/+19
| | | | |
* | | | | Merge pull request #15351 from owncloud/add-title-to-app-entriesLukas Reschke2015-04-011-2/+2
|\ \ \ \ \ | | | | | | | | | | | | add title to entries in app menu
| * | | | | add title to entries in app menuMorris Jobke2015-04-011-2/+2
|/ / / / /
* | | | | Merge pull request #15331 from owncloud/fix-passwordMorris Jobke2015-04-011-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Fix JS reference error for personal password changing
| * | | | Fix JS reference error for personal password changingRobin McCorkell2015-03-311-1/+1
| | |_|/ | |/| |
* | | | [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
| | | | | | | |