aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Update mapper.phpinfoneo2013-06-081-25/+8
* Fixed problems with a dots in a filenamesinfoneo2013-05-121-6/+12
* Dots in a filenames fixinfoneo2013-05-121-8/+19
* 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
* | | | | | Merge pull request #3106 from IMM0rtalis/xframe_restriction_configLukas Reschke2013-04-241-1/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | - xframe restriction configurable nowFlorian Scholz2013-04-241-1/+6
| |/ / / /
* | | | | Merge pull request #3100 from owncloud/ensure_index_phpDaniel Molkentin2013-04-241-0/+4
|\ \ \ \ \
| * | | | | sync parameters in setup.php with the ones in the actual .htaccessDaniel Molkentin2013-04-241-0/+4
* | | | | | use variable instead of relative path to fileBernhard Posselt2013-04-241-1/+1
* | | | | | check if there is a default/ folder in the theme directory if no theme existsBernhard Posselt2013-04-244-4/+25
| |/ / / / |/| | | |
* | | | | Merge pull request #3089 from guruz/fix_ugly_config_writeability_errorMorris Jobke2013-04-241-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix ugly error style on installMarkus Goetz2013-04-231-1/+1
* | | | | Merge pull request #3080 from owncloud/validate_redirect_mastBernhard Posselt2013-04-231-2/+7
|\ \ \ \ \
| * | | | | Disallow URLs containing a @Lukas Reschke2013-04-231-2/+7
* | | | | | Merge pull request #3077 from owncloud/rename-checksourcepathLukas Reschke2013-04-231-15/+23
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Files: also check if the source path is valid when doing a rename or copy ope...Robin Appelman2013-04-221-15/+23
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-231-0/+10
* | | | | | Merge pull request #3074 from owncloud/sqlite3-raiseerrorBernhard Posselt2013-04-221-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix raiseError call in the MDB2 sqlite3 driverRobin Appelman2013-04-221-2/+2
* | | | | | Merge pull request #3073 from owncloud/setup-error-messageBernhard Posselt2013-04-221-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Improve error message if user creation fails during setupRobin Appelman2013-04-221-1/+2
| |/ / / /
* | | | | Merge pull request #3019 from owncloud/fix-3004Bart Visscher2013-04-221-2/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Test if we want a 3rdparty style/script before checking the 3rdparty rootBart Visscher2013-04-191-2/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-221-1/+40