summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-09134-488/+134
|
* Merge pull request #16203 from owncloud/add-warning-for-people-that-cant-readThomas Müller2015-05-081-0/+8
|\ | | | | Add warning to OCC as well in case another PHP version is used there
| * Add warning to OCC as well in case another PHP version is used thereLukas Reschke2015-05-081-0/+8
| | | | | | | | In regard to a recent rant on social media where users complained about us to have broken the command line tool. Guess reading the documentation is hard…
* | Merge pull request #16124 from ↵Lukas Reschke2015-05-081-0/+5
|\ \ | | | | | | | | | | | | owncloud/issue-16109-fix-share-email-with-shared-folder Fix the share mail notification when the item is in a folder
| * | Fix the share mail notification when the item is in a folderJoas Schilling2015-05-061-0/+5
| | |
* | | Merge pull request #16155 from owncloud/enc_admin_settingsBjörn Schießle2015-05-083-63/+90
|\ \ \ | | | | | | | | improved admin settings
| * | | improved admin settingsBjoern Schiessle2015-05-083-63/+90
| | |/ | |/|
* | | Merge pull request #16146 from ↵Lukas Reschke2015-05-081-1/+7
|\ \ \ | |/ / |/| | | | | | | | owncloud/issue-16103-hide-module-already-exists-on-enable-app Avoid the log entry with the ModuleAlreadyExists exception when enabl…
| * | Avoid the log entry with the ModuleAlreadyExists exception when enabling the appJoas Schilling2015-05-071-1/+7
| | |
* | | Merge pull request #16168 from owncloud/cron-errorsLukas Reschke2015-05-081-3/+1
|\ \ \ | | | | | | | | fix cron errors to only appear in one line instead of introducing another list
| * | | fix cron errors to only appear in one line instead of introducing another listJan-Christoph Borchardt2015-05-071-3/+1
| | | |
* | | | Merge pull request #16170 from owncloud/fix-15621Thomas Müller2015-05-081-6/+9
|\ \ \ \ | | | | | | | | | | drop global file cache support, fixes #15621
| * | | | drop global file cache support, fixes #15621Arthur Schiwon2015-05-071-6/+9
| |/ / /
* | | | Merge pull request #16183 from owncloud/fix-16147Thomas Müller2015-05-081-2/+2
|\ \ \ \ | | | | | | | | | | check optional parameter before using it, fixes #16147
| * | | | check optional parameter before using it, fixes #16147Arthur Schiwon2015-05-071-2/+2
| | | | |
* | | | | Merge pull request #16159 from owncloud/webdav-cross-storage-mioveMorris Jobke2015-05-081-10/+12
|\ \ \ \ \ | | | | | | | | | | | | use cross storage move when renaming the part file during webdav put
| * | | | | use cross storage move when renaming the part file during webdav putRobin Appelman2015-05-071-10/+12
| | |/ / / | |/| | |
* | | | | Merge pull request #16160 from ↵Morris Jobke2015-05-082-1/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-15924-php-notice-empty-path-pathinfo Do not run method when the path is empty
| * | | | | Add a test for getting the versions of an empty pathJoas Schilling2015-05-071-1/+12
| | | | | |
| * | | | | Do not run method when the path is emptyJoas Schilling2015-05-071-0/+3
| |/ / / /
* | | | | Merge pull request #16175 from owncloud/fix-enc-typoJoas Schilling2015-05-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in encryption module message
| * | | | | Fix typo in encryption module messageMorris Jobke2015-05-071-1/+1
| | |/ / / | |/| | | | | | | | | | | | | * finishes #16021
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0838-40/+234
| | | | |
* | | | | 8.1.0 beta 1v8.1.0beta1Frank Karlitschek2015-05-071-2/+2
|/ / / /
* | | | Merge pull request #16153 from owncloud/CopyEtagHeaderPlugin-noargJoas Schilling2015-05-071-1/+1
|\ \ \ \ | |/ / / |/| | | [HHVM] \OC\Connector\Sabre\CopyEtagHeaderPlugin constructor does not take any arguments
| * | | \OC\Connector\Sabre\CopyEtagHeaderPlugin constructor does not take arguments.Andreas Fischer2015-05-071-1/+1
|/ / /
* | | Merge pull request #16035 from ↵Thomas Müller2015-05-075-20/+62
|\ \ \ | |/ / |/| | | | | | | | owncloud/issue-15975-occ-encryption-enable-warning-no-module Display a message when there is a problem with the default module
| * | Display a message when there is a problem with the default moduleJoas Schilling2015-05-045-20/+62
| | |
* | | Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-pageMorris Jobke2015-05-076-9/+21
|\ \ \ | | | | | | | | Display the module settings in the list of the encryption modules
| * | | Display the module settings in the list of the encryption modulesJoas Schilling2015-05-046-9/+21
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-07204-236/+110
| | |
* | | Merge pull request #16119 from owncloud/fix-16056Thomas Müller2015-05-071-11/+14
|\ \ \ | | | | | | | | [HHVM] Throw RunTimeException from OC\AppFramework\App::buildAppNamespace()
| * | | Check return value of OC_App::getAppPath() and verify info.xml exists.Andreas Fischer2015-05-061-11/+14
| | | |
* | | | Merge pull request #16122 from owncloud/fix-15866Morris Jobke2015-05-061-5/+9
|\ \ \ \ | | | | | | | | | | Fix broken group presentation in selected groups list
| * | | | fix filter index on selected groups is updated too earlyArthur Schiwon2015-05-061-2/+3
| | | | |
| * | | | fix broken group presentation in selected groups listArthur Schiwon2015-05-061-3/+6
| | | | |
* | | | | Merge pull request #15628 from owncloud/enc_fix_renameBjörn Schießle2015-05-063-17/+119
|\ \ \ \ \ | |/ / / / |/| | | | Encryption - fix moving/copying files between storages
| * | | | Fix missing types on doc block and deduplicate the method nameJoas Schilling2015-05-062-5/+5
| | | | |
| * | | | update 'encrypted'-flag in file cache according to the storage settingsBjoern Schiessle2015-05-062-6/+47
| | | | |
| * | | | move/copy from storageBjoern Schiessle2015-05-062-16/+77
| | |_|/ | |/| |
* | | | Merge pull request #16099 from labkode/prevent-preview-hooksJoas Schilling2015-05-061-1/+3
|\ \ \ \ | | | | | | | | | | Do not trigger preview hooks if enable_previews is false
| * | | | Do not trigger preview hooks if enable_previews is falseHugo Gonzalez Labrador2015-05-061-10/+10
| | | | |
| * | | | Do not trigger preview hooks if enable_previews is falseHugo Gonzalez Labrador2015-05-061-7/+9
| | | | |
* | | | | Merge pull request #16116 from owncloud/encryption-l10n-settingsMorris Jobke2015-05-061-9/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Add l10n support to encryption settings
| * | | | kill new lines in l10n stringsMorris Jobke2015-05-061-6/+2
| | | | |
| * | | | Add l10n support to encryption settingsMorris Jobke2015-05-061-5/+5
| | |/ / | |/| | | | | | | | | | * fixes #16111
* | | | Merge pull request #15880 from owncloud/check_if_encryption_is_enabledBjörn Schießle2015-05-063-75/+111
|\ \ \ \ | |/ / / |/| | | check if encryption is enbaled before we start moving keys
| * | | unit testsBjoern Schiessle2015-05-062-42/+69
| | | |
| * | | check if encryption is enbaled before we start moving keysBjoern Schiessle2015-05-062-34/+43
| | | |
* | | | Merge pull request #16098 from owncloud/remove-phpmailerLukas Reschke2015-05-061-0/+0
|\ \ \ \ | |/ / / |/| | | Remove phpmailer from 3rdparty
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 15:27:10 +0000