summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'files_encryption' of github.com:owncloud/core into ↵Björn Schießle2013-05-151203-18129/+22711
|\ | | | | | | files_encryption
| * workaround for blank page need an other solutionFlorin Peter2013-05-151-20/+20
| |
| * improved files_encryption testsFlorin Peter2013-05-154-4/+4
| |
| * removed FileProxy from testFlorin Peter2013-05-151-5/+6
| |
| * merge changes for files_encryptionFlorin Peter2013-05-151-40/+42
| |
| * fix for losing mount point "/"Florin Peter2013-05-151-1/+4
| |
| * Merge branch 'files_encryption' of https://github.com/owncloud/core into ↵Florin Peter2013-05-1549-832/+2464
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files_encryption Conflicts: apps/files/l10n/ar.php apps/files/l10n/bn_BD.php apps/files/l10n/de.php apps/files/l10n/de_DE.php apps/files/l10n/el.php apps/files/l10n/es.php apps/files/l10n/fa.php apps/files/l10n/fr.php apps/files/l10n/gl.php apps/files/l10n/id.php apps/files/l10n/ko.php apps/files/l10n/nl.php apps/files/l10n/nn_NO.php apps/files/l10n/pl.php apps/files/l10n/pt_BR.php apps/files/l10n/pt_PT.php apps/files/l10n/ro.php apps/files/l10n/ru.php apps/files/l10n/sl.php apps/files/l10n/uk.php apps/files/l10n/vi.php apps/files_encryption/l10n/ca.php apps/files_sharing/lib/cache.php apps/files_sharing/lib/sharedstorage.php apps/user_ldap/l10n/tr.php core/l10n/cs_CZ.php core/l10n/de.php core/l10n/de_DE.php core/l10n/ru.php core/l10n/sk_SK.php core/l10n/tr.php core/l10n/vi.php core/l10n/zh_CN.php l10n/af_ZA/files.po l10n/ar/files.po l10n/be/files.po l10n/bg_BG/files.po l10n/bn_BD/files.po l10n/ca/files.po l10n/ca/files_encryption.po l10n/cs_CZ/core.po l10n/cs_CZ/files.po l10n/da/files.po l10n/da/settings.po l10n/de/core.po l10n/de/files.po l10n/de/files_encryption.po l10n/de/files_external.po l10n/de/files_sharing.po l10n/de/files_trashbin.po l10n/de/files_versions.po l10n/de/lib.po l10n/de/settings.po l10n/de/user_ldap.po l10n/de_DE/files.po l10n/de_DE/files_encryption.po l10n/de_DE/files_external.po l10n/de_DE/files_sharing.po l10n/de_DE/files_trashbin.po l10n/de_DE/lib.po l10n/de_DE/settings.po l10n/de_DE/user_ldap.po l10n/el/files.po l10n/eo/files.po l10n/es/files.po l10n/es/lib.po l10n/es/settings.po l10n/es_AR/files.po l10n/eu/files.po l10n/fa/files.po l10n/fi/files.po l10n/fi_FI/files.po l10n/fr/core.po l10n/fr/files.po l10n/gl/files.po l10n/gl/settings.po l10n/he/core.po l10n/he/files.po l10n/he/user_ldap.po l10n/hi/files.po l10n/hr/files.po l10n/hu_HU/core.po l10n/hu_HU/files.po l10n/hu_HU/files_external.po l10n/hu_HU/settings.po l10n/hy/files.po l10n/ia/core.po l10n/ia/files.po l10n/ia/files_trashbin.po l10n/ia/settings.po l10n/id/files.po l10n/is/files.po l10n/it/files.po l10n/ja_JP/files.po l10n/ja_JP/user_ldap.po l10n/ka/files.po l10n/ka_GE/files.po l10n/kn/files.po l10n/ko/files.po l10n/ko/files_trashbin.po l10n/ko/settings.po l10n/ku_IQ/files.po l10n/lb/files.po l10n/lt_LT/core.po l10n/lt_LT/files.po l10n/lv/files.po l10n/mk/files.po l10n/ms_MY/files.po l10n/my_MM/files.po l10n/nb_NO/files.po l10n/ne/files.po l10n/nl/core.po l10n/nl/files.po l10n/nn_NO/files.po l10n/oc/files.po l10n/pl/files.po l10n/pl_PL/files.po l10n/pt_BR/files.po l10n/pt_PT/core.po l10n/pt_PT/files.po l10n/pt_PT/files_external.po l10n/pt_PT/settings.po l10n/ro/files.po l10n/ru/core.po l10n/ru/files.po l10n/si_LK/files.po l10n/sk/files.po l10n/sk_SK/core.po l10n/sk_SK/files.po l10n/sl/core.po l10n/sl/files.po l10n/sq/files.po l10n/sr/files.po l10n/sr@latin/files.po l10n/sv/files.po l10n/sw_KE/files.po l10n/ta_LK/files.po l10n/te/files.po l10n/th_TH/files.po l10n/tr/core.po l10n/tr/files.po l10n/tr/lib.po l10n/tr/settings.po l10n/tr/user_ldap.po l10n/uk/files.po l10n/ur_PK/files.po l10n/vi/core.po l10n/vi/files.po l10n/vi/files_external.po l10n/zh_CN.GB2312/files.po l10n/zh_CN/core.po l10n/zh_CN/files.po l10n/zh_CN/settings.po l10n/zh_HK/files.po l10n/zh_TW/core.po l10n/zh_TW/files.po l10n/zh_TW/files_versions.po l10n/zh_TW/settings.po l10n/zh_TW/user_ldap.po lib/base.php lib/files/filesystem.php lib/files/view.php lib/public/share.php settings/l10n/es.php settings/l10n/pt_PT.php settings/l10n/tr.php settings/l10n/zh_CN.php settings/personal.php
| * \ Merge branch 'master' into files_encryptionFlorin Peter2013-05-151242-19019/+23988
| |\ \
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-15133-2828/+3136
| | | |
| | * | Merge pull request #2821 from owncloud/fix-2159-rename-to-sharedThomas Müller2013-05-143-19/+230
| | |\ \ | | | | | | | | | | fix allowed rename of folder in root directory to reserved name "Shared"
| | | * | [files] add private declaration of $viewMorris Jobke2013-05-141-0/+1
| | | | |
| | | * | [files] fix mock creation and remove hardcoded 'require' statementMorris Jobke2013-05-122-7/+2
| | | | |
| | | * | [files] rename lib to "App"Morris Jobke2013-05-123-7/+7
| | | | |
| | | * | [files] ownCloud typoMorris Jobke2013-05-121-1/+1
| | | | |
| | | * | [files] rename test class and add rename testMorris Jobke2013-05-121-1/+22
| | | | |
| | | * | [files] remove realpath in testMorris Jobke2013-05-121-1/+1
| | | | |
| | | * | [files] rename testsMorris Jobke2013-05-121-0/+99
| | | | |
| | | * | [files] remove normalizePath on rename and dependency injectionMorris Jobke2013-05-122-7/+8
| | | | |
| | | * | [files] kill stripslashesMorris Jobke2013-05-121-3/+3
| | | | |
| | | * | [files] fix typosMorris Jobke2013-05-121-5/+5
| | | | |
| | | * | [files] refactoringMorris Jobke2013-05-122-19/+111
| | | | |
| | | * | string comparisionMorris Jobke2013-05-121-1/+1
| | | | |
| | | * | wrong root dir nameMorris Jobke2013-05-121-2/+2
| | | | |
| | | * | fix allowed rename of folder in root directory to reserved name "Shared"Morris Jobke2013-05-121-2/+4
| | | | | | | | | | | | | | | | | | | | refs #2159
| | * | | fix history template, print_unescaped() needs to include closing tagsBjörn Schießle2013-05-141-4/+4
| | | | |
| | * | | Merge pull request #3338 from owncloud/button_color_fixRaghu Nayyar2013-05-141-2/+4
| | |\ \ \ | | | | | | | | | | | | Keeping Font Colors Consistant on the headers.
| | | * | | color change to crumb elements as well.raghunayyar2013-05-141-1/+1
| | | | | |
| | | * | | Keeping Font Colors Consistant on the headers.raghunayyar2013-05-131-1/+3
| | | | | |
| | * | | | Merge pull request #3330 from owncloud/preselect_filename_on_renameMorris Jobke2013-05-142-0/+27
| | |\ \ \ \ | | | | | | | | | | | | | | peselect filename without extension on rename
| | | * | | | peselect filename without extension on renameJörn Friedrich Dreyer2013-05-132-0/+27
| | | | | | |
| | * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1411-11/+11
| | | |/ / / | | |/| | |
| | * | | | Merge pull request #3303 from owncloud/update_etags_on_restoreMorris Jobke2013-05-131-1/+4
| | |\ \ \ \ | | | | | | | | | | | | | | Make sure that etags get updated once a file gets retored from the trash bin
| | | * \ \ \ Merge branch 'master' into update_etags_on_restoreBjörn Schießle2013-05-13136-990/+1336
| | | |\ \ \ \
| | | * | | | | touch() needs to be performed relative to user/files otherwise ownCloud ↵Björn Schießle2013-05-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't execute the hooks which means that etags aren't updated properly
| | * | | | | | Merge pull request #3329 from owncloud/increase_lock_timeoutBernhard Posselt2013-05-131-1/+1
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | Set the SQLite database lock timeout to 60 seconds which is the default ...
| | | * | | | | Set the SQLite database lock timeout to 60 seconds which is the default in ↵Frank Karlitschek2013-05-131-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHP anyways. I don't know why the MDB2 driver has this hardcoded to 0.1 seconds. This potentially fixes a lot of SQLite database lock problems and stuck in maintainance mode during upgrade issues.
| | * | | | | Merge pull request #3326 from owncloud/fix-3321Lukas Reschke2013-05-131-1/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | Add requesttoken to guest view
| | | * | | | Add requesttoken to guest viewLukas Reschke2013-05-131-1/+1
| | |/ / / / | | | | | | | | | | | | Should fix #3321
| | * | | | Merge pull request #3235 from NCTU-NBA/pr-langcodeMorris Jobke2013-05-131-3/+3
| | |\ \ \ \ | | | | | | | | | | | | | | Modify zh_* language codes
| | | * \ \ \ Merge remote-tracking branch 'upstream/master' into pr-langcodePellaeon Lin2013-05-12162-1108/+1720
| | | |\ \ \ \
| | | * | | | | Modify zh_* language codesPellaeon Lin2013-05-041-3/+3
| | | | | | | |
| | * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1313-32/+49
| | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #3311 from owncloud/disable_mbstring.func_overloadMorris Jobke2013-05-121-0/+1
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | disable mbstring.func_overload in setup v.3
| | | * | | | disable mbstring.func_overload in setupThomas Tanghus2013-05-121-0/+1
| | | | | | |
| | * | | | | Merge pull request #3290 from owncloud/config-dataLukas Reschke2013-05-123-5/+5
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Move config data to template
| | | * | | | TypoLukas Reschke2013-05-121-2/+2
| | | | | | |
| | | * | | | Get config from templateLukas Reschke2013-05-123-5/+5
| | |/ / / /
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-12119-941/+1260
| | | | | |
| | * | | | Merge pull request #3309 from owncloud/no_explicit_autoloadicewind19912013-05-112-4/+5
| | |\ \ \ \ | | | | | | | | | | | | | | Use new autoloader class in tests
| | | * | | | Use new autoloader classThomas Tanghus2013-05-112-4/+5
| | |/ / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-01 16:06:20 +0000