summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is ↵Florin Peter2013-05-011091-14109/+15371
| | | | very unstable right now
* fixed public-keys mount point errorFlorin Peter2013-05-011-1/+6
|
* fixed tests after merge against masterFlorin Peter2013-04-304-8/+19
|
* Merge branch 'master' into files_encryption to get the latest files_trashbin appFlorin Peter2013-04-301086-15362/+14084
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #3156 from ↵FlorinPeter2013-04-301-86/+309
| |\ | | | | | | | | | | | | owncloud/trashbin_for_encryption_keys_against_master Trashbin for encryption keys now against master
| | * delete and restore of versions and share-keys now worksFlorin Peter2013-04-281-20/+37
| | | | | | | | | | | | fix restore of the same file name
| | * added handling for share-keysFlorin Peter2013-04-281-13/+88
| | | | | | | | | | | | this works only with latest files_encryption branch up from 813641e6e86601cc73da0f00d8430da62e872180
| | * restore fixedFlorin Peter2013-04-281-22/+40
| | |
| | * fixed some problems and broken codeFlorin Peter2013-04-281-42/+83
| | |
| | * restore encryption keys from trash bin (development snapshot)Björn Schießle2013-04-281-45/+72
| | |
| | * move encryption keys to trash binBjörn Schießle2013-04-281-31/+76
| | |
| * | 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-30118-631/+852
| |/ /
| * | Merge pull request #3159 from owncloud/rewordJan-Christoph Borchardt2013-04-291-1/+1
| |\ \ | | | | | | | | Reword sentence and move HTML out of translation
| | * | Reword sentence and move HTML out of translationLukas Reschke2013-04-291-1/+1
| | |/
| * | Merge pull request #3160 from owncloud/remove-onclickMorris Jobke2013-04-292-2/+6
| |\ \ | | | | | | | | Remove onclick
| | * | It's a classLukas Reschke2013-04-281-1/+1
| | | |
| | * | Remove uneeded onclick handlerLukas Reschke2013-04-281-1/+1
| | | |
| | * | Move onclick handlerLukas Reschke2013-04-282-1/+5
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-2951-135/+199
| | |/ | |/|
| * | Merge pull request #3154 from owncloud/fix_3153Frank Karlitschek2013-04-282-10/+66
| |\ \ | | | | | | | | Change app identifier for core api routes
| | * | Fix typoTom Needham2013-04-271-1/+1
| | | |
| | * | Code style for ocs/routes.phpTom Needham2013-04-271-9/+65
| | | |
| | * | Change app identifier for core api routesTom Needham2013-04-271-8/+8
| | | |
| | * | Use correct variable when checking authTom Needham2013-04-271-1/+1
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-28233-1591/+876
| | |/ | |/|
| * | 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-265-38/+32
| |\ \ \ | | | | | | | | | | Add an update notification
| | * | | Remove uneeded linkLukas Reschke2013-04-241-1/+1
| | | | |
| | * | | Clubbing Exact styles together.raghunayyar2013-04-241-5/+2
| | | | |
| | * | | Add an update notification on every page for admin usersLukas Reschke2013-04-245-36/+33
| | | | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-27934-28068/+28442
| | | | |
| * | | | Code styleRobin Appelman2013-04-261-206/+231
| | | | |
| * | | | Merge pull request #3136 from owncloud/mount-cleanupicewind19912013-04-2615-201/+326
| |\ \ \ \ | | | | | | | | | | | | Separation of mount management
| | * | | | Further seperation of mount management logicRobin Appelman2013-04-2611-171/+235
| | | | | |
| | * | | | Cache: seperate handing of numeric storage id's to it's own classRobin Appelman2013-04-264-30/+91
| | | | | |
| * | | | | Merge pull request #3002 from owncloud/priorize_common_languagesBart Visscher2013-04-263-4/+21
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Priorize common languages.
| | * | | | Make divider not selectablekondou2013-04-192-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Very hacky
| | * | | | Priorize common languages.kondou2013-04-183-4/+22
| | | | | |
| * | | | | 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
| | |/ / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-04 04:49:46 +0000