summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3132 from owncloud/mount-setupfsicewind19912013-04-252-0/+4
|\ | | | | Make sure the filesystem is initialized when searching for mounts
| * 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
| | | | | | Thanks @kabum
* | Correct function descriptionLukas Reschke2013-04-251-1/+1
| | | | | | $password is not supported
* | 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
|\ \ | |/ |/| Let autoloader resolve paths under apps lib directory.
| * 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 list
| * | 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 ressources
| * | | 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 now
| * | | - xframe restriction configurable nowFlorian Scholz2013-04-241-1/+6
| |/ /
* | | Merge pull request #3100 from owncloud/ensure_index_phpDaniel Molkentin2013-04-241-0/+4
|\ \ \ | | | | | | | | Fix for #3049
| * | | 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 install
| * | Fix ugly error style on installMarkus Goetz2013-04-231-1/+1
| | | | | | | | | | | | | | | | | | By initializing the template engine first we can show the 'Can't write into config directory 'config'' error in a nice way instead of plain unstyled HTML.
* | | Merge pull request #3080 from owncloud/validate_redirect_mastBernhard Posselt2013-04-231-2/+7
|\ \ \ | | | | | | | | Disallow URLs containing a @
| * | | 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 operation
| * | | Files: also check if the source path is valid when doing a rename or copy ↵Robin Appelman2013-04-221-15/+23
| | | | | | | | | | | | | | | | operation
* | | | [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 driver
| * | | 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 setup
| * | | 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 root
| * | 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
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-201-10/+22
| | |
* | | Merge pull request #3020 from owncloud/cleaner-webdav-reasonBart Visscher2013-04-191-1/+1
|\ \ \ | |/ / |/| | Cleaner isWebDAVWorking reason, otherwise people overlook the reason
| * | Cleaner isWebDAVWorking reason, otherwise people overlook the reasonBart Visscher2013-04-191-1/+1
| |/
* | Merge pull request #3010 from owncloud/fix-cookie_pathThomas Tanghus2013-04-191-2/+3
|\ \ | | | | | | Don't use empty session.cookie_path, otherwise we get multiple cookies
| * | Don't use empty session.cookie_path, otherwise we get multiple cookiesBart Visscher2013-04-181-2/+3
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2013-04-1832-34/+2
| |
* | Warn when we do an upgradeBrice Maron2013-04-171-1/+1
|/
* Merge pull request #2978 from owncloud/displayname_can_be_nullBernhard Posselt2013-04-171-1/+1
|\ | | | | Remove not null constraint. Fix #2976
| * Remove not null constraint. Fix #2976Thomas Tanghus2013-04-171-1/+1
| |
* | Merge pull request #2975 from owncloud/log-dateMorris Jobke2013-04-171-1/+2
|\ \ | |/ |/| use date and time instead of timestamp in log
| * fix admin log display and use a more readable formatBernhard Posselt2013-04-171-1/+1
| |
| * use date and time instead of timestampBernhard Posselt2013-04-171-1/+2
| |
* | Merge pull request #2746 from owncloud/use-count-userexistsThomas Tanghus2013-04-171-2/+2
|\ \ | | | | | | Use count SQL to check for user existance
| * | Use the MDB2 function to get the count resultBart Visscher2013-04-061-1/+1
| | |
| * | Use count SQL to check for user existanceBart Visscher2013-04-051-2/+2
| | |
* | | Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_betterBart Visscher2013-04-171-1/+1
|\ \ \ | | | | | | | | Handle empty datafolder better.
| * | | Handle empty datafolder better.kondou2013-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If datafolder is erased, the default value will be shown as a placeholder. If installation is submitted without a datafolder the default value will be used.