summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Move start of the maintenance mode to the ajax callBart Visscher2013-05-041-4/+0
* Merge pull request #3216 from owncloud/fix-api-3rdpartyTom Needham2013-05-021-2/+8
|\
| * respect format outputBernhard Posselt2013-05-021-2/+3
| * logout before output to not run into header already sent problemsBernhard Posselt2013-05-021-1/+2
| * fix bug that would only return error responses for 3rdparty appsBernhard Posselt2013-05-021-1/+5
* | Merge pull request #3183 from miicha/patch-1Thomas Müller2013-05-021-3/+3
|\ \ | |/ |/|
| * fixing mimetype for "new" ms office formatsmiicha2013-04-301-3/+3
* | typo fix in a comment.joel hansson2013-05-011-1/+1
* | Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cacheFlorinPeter2013-04-292-2/+2
|\ \
| * | fix for infinite loop causing on files_encryption branch when testing "apps/f...Florin Peter2013-04-292-2/+2
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2013-04-301-1/+11
|/
* Merge pull request #3154 from owncloud/fix_3153Frank Karlitschek2013-04-281-1/+1
|\
| * Use correct variable when checking authTom Needham2013-04-271-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2852-161/+6
* | Merge pull request #3121 from owncloud/ocs_fix_api_responseLukas Reschke2013-04-271-2/+2
|\ \ | |/ |/|
| * Correct the api response when both a shipped app and/or a third party app failTom Needham2013-04-251-2/+2
* | Merge pull request #3146 from owncloud/restart-hintMorris Jobke2013-04-271-13/+13
|\ \
| * | web_server_restart needs to be true to display the hintBart Visscher2013-04-261-13/+13
* | | Merge pull request #3145 from owncloud/magic_quotes_gpc-checkMorris Jobke2013-04-271-0/+5
|\ \ \
| * | | Add check for Magic QuotesBart Visscher2013-04-261-0/+5
| |/ /
* | | Merge pull request #3114 from owncloud/update-notificationRaghu Nayyar2013-04-262-34/+26
|\ \ \
| * | | Add an update notification on every page for admin usersLukas Reschke2013-04-242-34/+26
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2744-130/+105
* | | | Code styleRobin Appelman2013-04-261-206/+231
* | | | Merge pull request #3136 from owncloud/mount-cleanupicewind19912013-04-2610-139/+255
|\ \ \ \ | |_|/ / |/| | |
| * | | Further seperation of mount management logicRobin Appelman2013-04-266-109/+164
| * | | Cache: seperate handing of numeric storage id's to it's own classRobin Appelman2013-04-264-30/+91
* | | | Merge pull request #3026 from owncloud/cli-no-sessionBart Visscher2013-04-261-1/+3
|\ \ \ \
| * | | | Don't start the session when in cli modeRobin Appelman2013-04-261-1/+3
| |/ / /
* | | | Merge pull request #3028 from owncloud/simplyfy-resource-locatingBart Visscher2013-04-261-42/+17
|\ \ \ \
| * | | | Simplify app js locating for layout pagesBart Visscher2013-04-261-11/+8
| * | | | Simplify app css locating for layout pagesBart Visscher2013-04-261-31/+9
| |/ / /
* | | | Merge pull request #2955 from owncloud/displaynames-numericBart Visscher2013-04-261-1/+1
|\ \ \ \
| * | | | Fix OC_User::getDisplaynames when using numeric user id'sRobin Appelman2013-04-171-1/+1
* | | | | Merge pull request #1872 from herbrechtsmeier/forcessl-with-ssl-proxyBart Visscher2013-04-261-6/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | request.php: add type check to the not empty check of a stringherbrechtsmeier2013-03-091-5/+5
| * | | | Overwrite host and webroot when forcessl is enabledherbrechtsmeier2013-03-091-3/+4
* | | | | Merge pull request #3132 from owncloud/mount-setupfsicewind19912013-04-252-0/+4
|\ \ \ \ \
| * | | | | Have the filecache updater testcase clean the filesystem properlyRobin Appelman2013-04-251-0/+1
| * | | | | Make sure the filesystem is initialized when searching for mountsRobin Appelman2013-04-251-0/+3
| | |_|/ / | |/| | |
* | | | | Correct the parameter descriptionLukas Reschke2013-04-251-1/+1
* | | | | Correct function descriptionLukas Reschke2013-04-251-1/+1
* | | | | use utf-8 encoding for jsonBernhard Posselt2013-04-251-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #2993 from owncloud/resolve_apps_lib_pathThomas Tanghus2013-04-241-2/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Added explanationThomas Tanghus2013-04-181-0/+1
| * | | Let autoloader resolve paths under apps lib directory.Thomas Tanghus2013-04-181-2/+8
* | | | Merge pull request #3112 from owncloud/markdown-mimetypeicewind19912013-04-241-1/+5
|\ \ \ \
| * | | | Add markdown to mimetype listRobin Appelman2013-04-241-1/+5
* | | | | Merge pull request #3111 from owncloud/csp-audioicewind19912013-04-241-1/+2
|\ \ \ \ \
| * | | | | Allow loading of external media ressourcesLukas Reschke2013-04-241-1/+2