summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* setup mount manager before wrappersRobin Appelman2015-04-022-3/+5
* setup storage wrappers before setting up the filesystemRobin Appelman2015-04-012-30/+34
* Merge pull request #15354 from pierrejochem/patch-1Thomas Müller2015-04-011-1/+3
|\
| * 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 functionsRoeland Jago Douma2015-04-017-7/+7
* | Merge pull request #15336 from owncloud/revive-15215Morris Jobke2015-04-012-18/+20
|\ \
| * | 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 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 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"Lukas Reschke2015-03-312-20/+18
|/ /
* | Merge pull request #15215 from owncloud/ext-gdrivelistfilequotingFrank Karlitschek2015-03-312-18/+20
|\ \ | |/ |/|
| * 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 eventsJoas Schilling2015-03-301-12/+7
* | | Merge pull request #15169 from rullzer/fix_displayNamesInGroupMorris Jobke2015-03-303-5/+5
|\ \ \
| * | | Call the proper functionRoeland Jago Douma2015-03-241-1/+1
| * | | Fix unit testsRoeland Jago Douma2015-03-241-3/+3
| * | | 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 credentialsRobin McCorkell2015-03-201-4/+11
* | | | | Merge pull request #15042 from wolfgangkarall/masterLukas Reschke2015-03-301-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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 memcacheLukas Reschke2015-03-2810-92/+382
* | | | | | Merge pull request #13964 from rullzer/capabilitiesMorris Jobke2015-03-303-0/+280
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | Added route againRoeland Jago Douma2015-03-111-0/+6
| * | | | | | Add file_sharing info to capabilitiesRoeland Jago Douma2015-03-112-0/+282
* | | | | | | Merge pull request #15239 from owncloud/see-no-evilMorris Jobke2015-03-305-21/+127
|\ \ \ \ \ \ \
| * | | | | | | 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 dialogLukas Reschke2015-03-282-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | [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
|\ \ \ \ \ \ \