summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is ↵Florin Peter2013-05-0178-702/+741
| | | | very unstable right now
* Merge branch 'master' into files_encryption to get the latest files_trashbin appFlorin Peter2013-04-3078-741/+702
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/l10n/bn_BD.php apps/files/l10n/da.php apps/files/l10n/de.php apps/files/l10n/de_DE.php apps/files/l10n/fa.php apps/files/l10n/fi_FI.php apps/files/l10n/hr.php apps/files/l10n/ms_MY.php apps/files/l10n/ro.php apps/files/l10n/si_LK.php apps/files/l10n/sl.php apps/files/l10n/ta_LK.php apps/files_external/l10n/de_DE.php apps/files_external/l10n/et_EE.php apps/user_ldap/l10n/tr.php core/l10n/bg_BG.php l10n/af_ZA/files.po l10n/af_ZA/files_external.po l10n/ar/core.po l10n/ar/files.po l10n/ar/files_external.po l10n/be/files.po l10n/be/files_external.po l10n/bg_BG/core.po l10n/bg_BG/files.po l10n/bg_BG/files_external.po l10n/bg_BG/files_trashbin.po l10n/bg_BG/files_versions.po l10n/bg_BG/settings.po l10n/bn_BD/core.po l10n/bn_BD/files.po l10n/bn_BD/files_external.po l10n/ca/core.po l10n/ca/files.po l10n/ca/files_external.po l10n/cs_CZ/core.po l10n/cs_CZ/files.po l10n/cs_CZ/files_external.po l10n/cs_CZ/lib.po l10n/cy_GB/core.po l10n/cy_GB/files.po l10n/cy_GB/files_external.po l10n/cy_GB/settings.po l10n/da/core.po l10n/da/files.po l10n/da/files_external.po l10n/de/core.po l10n/de/files.po l10n/de/files_external.po l10n/de_DE/core.po l10n/de_DE/files.po l10n/de_DE/files_external.po l10n/el/core.po l10n/el/files.po l10n/el/files_external.po l10n/eo/core.po l10n/eo/files.po l10n/eo/files_external.po l10n/es/core.po l10n/es/files.po l10n/es/files_external.po l10n/es_AR/core.po l10n/es_AR/files.po l10n/es_AR/files_external.po l10n/et_EE/core.po l10n/et_EE/files.po l10n/et_EE/files_external.po l10n/eu/core.po l10n/eu/files.po l10n/eu/files_external.po l10n/fa/core.po l10n/fa/files.po l10n/fa/files_external.po l10n/fi/files.po l10n/fi_FI/core.po l10n/fi_FI/files.po l10n/fi_FI/files_external.po l10n/fr/core.po l10n/fr/files.po l10n/fr/files_external.po l10n/gl/core.po l10n/gl/files.po l10n/gl/files_external.po l10n/he/core.po l10n/he/files.po l10n/he/files_external.po l10n/hi/files.po l10n/hi/files_external.po l10n/hr/core.po l10n/hr/files.po l10n/hr/files_external.po l10n/hu_HU/core.po l10n/hu_HU/files.po l10n/hu_HU/files_external.po l10n/hy/files.po l10n/hy/files_external.po l10n/ia/core.po l10n/ia/files.po l10n/ia/files_external.po l10n/id/core.po l10n/id/files.po l10n/id/files_external.po l10n/is/core.po l10n/is/files.po l10n/is/files_external.po l10n/it/core.po l10n/it/files.po l10n/it/files_external.po l10n/ja_JP/core.po l10n/ja_JP/files.po l10n/ja_JP/files_external.po l10n/ka/files.po l10n/ka/files_external.po l10n/ka_GE/core.po l10n/ka_GE/files.po l10n/ka_GE/files_external.po l10n/kn/files.po l10n/kn/files_external.po l10n/ko/core.po l10n/ko/files.po l10n/ko/files_external.po l10n/ku_IQ/files.po l10n/ku_IQ/files_external.po l10n/lb/core.po l10n/lb/files.po l10n/lb/files_external.po l10n/lt_LT/core.po l10n/lt_LT/files.po l10n/lt_LT/files_external.po l10n/lv/core.po l10n/lv/files.po l10n/lv/files_external.po l10n/mk/core.po l10n/mk/files.po l10n/mk/files_external.po l10n/ms_MY/core.po l10n/ms_MY/files.po l10n/ms_MY/files_external.po l10n/my_MM/files.po l10n/my_MM/files_external.po l10n/nb_NO/core.po l10n/nb_NO/files.po l10n/nb_NO/files_external.po l10n/ne/files.po l10n/ne/files_external.po l10n/nl/core.po l10n/nl/files.po l10n/nl/files_external.po l10n/nn_NO/files.po l10n/nn_NO/files_external.po l10n/oc/core.po l10n/oc/files.po l10n/oc/files_external.po l10n/pl/core.po l10n/pl/files.po l10n/pl/files_external.po l10n/pl_PL/files.po l10n/pt_BR/core.po l10n/pt_BR/files.po l10n/pt_BR/files_external.po l10n/pt_PT/core.po l10n/pt_PT/files.po l10n/pt_PT/files_external.po l10n/ro/core.po l10n/ro/files.po l10n/ro/files_external.po l10n/ru/core.po l10n/ru/files.po l10n/ru/files_external.po l10n/ru_RU/core.po l10n/ru_RU/files.po l10n/si_LK/core.po l10n/si_LK/files.po l10n/si_LK/files_external.po l10n/sk/files.po l10n/sk/files_external.po l10n/sk_SK/core.po l10n/sk_SK/files.po l10n/sk_SK/files_external.po l10n/sl/core.po l10n/sl/files.po l10n/sl/files_external.po l10n/sq/core.po l10n/sq/files.po l10n/sq/files_external.po l10n/sr/core.po l10n/sr/files.po l10n/sr/files_external.po l10n/sr@latin/files.po l10n/sr@latin/files_external.po l10n/sv/core.po l10n/sv/files.po l10n/sv/files_external.po l10n/sw_KE/files.po l10n/sw_KE/files_external.po l10n/ta_LK/core.po l10n/ta_LK/files.po l10n/ta_LK/files_external.po l10n/te/files.po l10n/te/files_external.po l10n/templates/core.pot l10n/templates/files.pot l10n/templates/files_encryption.pot l10n/templates/files_external.pot l10n/templates/files_sharing.pot l10n/templates/files_trashbin.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/templates/user_webdavauth.pot l10n/th_TH/core.po l10n/th_TH/files.po l10n/th_TH/files_external.po l10n/tr/core.po l10n/tr/files.po l10n/tr/files_external.po l10n/tr/user_ldap.po l10n/uk/core.po l10n/uk/files.po l10n/uk/files_external.po l10n/ur_PK/files.po l10n/ur_PK/files_external.po l10n/vi/core.po l10n/vi/files.po l10n/vi/files_external.po l10n/zh_CN.GB2312/core.po l10n/zh_CN.GB2312/files.po l10n/zh_CN.GB2312/files_external.po l10n/zh_CN/core.po l10n/zh_CN/files.po l10n/zh_CN/files_external.po l10n/zh_HK/core.po l10n/zh_HK/files.po l10n/zh_HK/files_external.po l10n/zh_TW/core.po l10n/zh_TW/files.po l10n/zh_TW/files_external.po lib/base.php lib/files/mount/mount.php
| * 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
| | * fix for infinite loop causing on files_encryption branch when testing ↵Florin Peter2013-04-292-2/+2
| | | | | | | | | | | | "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-04-301-1/+11
| |/
| * Merge pull request #3154 from owncloud/fix_3153Frank Karlitschek2013-04-281-1/+1
| |\ | | | | | | Change app identifier for core api routes
| | * 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
| |\ \ | | |/ | |/| Fix the api response when a shipped and third party app both fail.
| | * 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 hint
| | * | 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 Quotes
| | * | | 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
| | * | | 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
| |\ \ \ \ | | |_|/ / | |/| | | Separation of mount management
| | * | | 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 mode
| | * | | | 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 resource locating in templatelayout
| | * | | | 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's
| | * | | | Fix OC_User::getDisplaynames when using numeric user id'sRobin Appelman2013-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | fixes #2948
| * | | | | Merge pull request #1872 from herbrechtsmeier/forcessl-with-ssl-proxyBart Visscher2013-04-261-6/+7
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Overwrite host and webroot when forcessl is enabled
| | * | | | request.php: add type check to the not empty check of a stringherbrechtsmeier2013-03-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The not equal comparison (<>) of a variable with an empty string could lead to false positive results as the compare do not check the type and thereby could not make sure that the checked variable is a string. The usage of the not identical comparison operator (!==) make sure that the variable is a string and not empty.
| | * | | | Overwrite host and webroot when forcessl is enabledherbrechtsmeier2013-03-091-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables the use of forcessl together with a multiple domains reverse SSL proxy (owncloud/core#1099) which have different hostname and webroot for http and https access. The code assumes that the ssl proxy (https) hostname and webroot is configured via overwritehost and overwritewebroot.
| * | | | | 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
| | |/ / / / | |/| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-03 23:28:23 +0000