Commit Graph

24816 Commits

Author SHA1 Message Date
Morris Jobke e79c255cab Conditional logging
* Log condition for log level increase based on conditions. Once one of these
   conditions is met, the required log level is set to debug. This allows to
   debug specific requests, users or apps

 * Supported conditions (setting `log_condition` in `config.php`):
    - `shared_secret`: if a request parameter with the name `log_secret` is set to
                this value the condition is met
    - `users`:  if the current request is done by one of the specified users,
                this condition is met
    - `apps`:   if the log message is invoked by one of the specified apps,
                this condition is met
 * fix unit test and add app log condition test
2015-05-08 15:58:33 +02:00
Morris Jobke 892b5ceeeb Move log level check to logger parent class
* remove duplicate code from child classes
2015-05-08 15:14:45 +02:00
Lukas Reschke c9921ec127 Merge pull request #16124 from owncloud/issue-16109-fix-share-email-with-shared-folder
Fix the share mail notification when the item is in a folder
2015-05-08 13:03:28 +02:00
Björn Schießle bcbf9a9bb5 Merge pull request #16155 from owncloud/enc_admin_settings
improved admin settings
2015-05-08 12:16:16 +02:00
Lukas Reschke 16a0de6314 Merge pull request #16146 from owncloud/issue-16103-hide-module-already-exists-on-enable-app
Avoid the log entry with the ModuleAlreadyExists exception when enabl…
2015-05-08 11:55:02 +02:00
Bjoern Schiessle 4a450c9d0d improved admin settings 2015-05-08 11:41:38 +02:00
Lukas Reschke ebf3953908 Merge pull request #16168 from owncloud/cron-errors
fix cron errors to only appear in one line instead of introducing another list
2015-05-08 11:23:19 +02:00
Thomas Müller e4c05acf94 Merge pull request #16170 from owncloud/fix-15621
drop global file cache support, fixes #15621
2015-05-08 11:06:00 +02:00
Thomas Müller dfd451777c Merge pull request #16183 from owncloud/fix-16147
check optional parameter before using it, fixes #16147
2015-05-08 10:47:33 +02:00
Morris Jobke 8e565dd3e8 Merge pull request #16159 from owncloud/webdav-cross-storage-miove
use cross storage move when renaming the part file during webdav put
2015-05-08 09:53:12 +02:00
Morris Jobke 1fbf9c3d71 Merge pull request #16160 from owncloud/issue-15924-php-notice-empty-path-pathinfo
Do not run method when the path is empty
2015-05-08 09:49:51 +02:00
Joas Schilling 0577691631 Merge pull request #16175 from owncloud/fix-enc-typo
Fix typo in encryption module message
2015-05-08 09:41:27 +02:00
Jenkins for ownCloud ff0faacf0b [tx-robot] updated from transifex 2015-05-08 01:54:52 -04:00
Frank Karlitschek e9de60f971 8.1.0 beta 1 2015-05-07 18:55:00 -04:00
Arthur Schiwon f2d23d7f02 check optional parameter before using it, fixes #16147 2015-05-07 22:18:29 +02:00
Morris Jobke 5b7e4b3341 Fix typo in encryption module message
* finishes #16021
2015-05-07 18:04:32 +02:00
Jan-Christoph Borchardt 3abaf34709 fix cron errors to only appear in one line instead of introducing another list 2015-05-07 16:19:14 +02:00
Joas Schilling 2b092f2e93 Add a test for getting the versions of an empty path 2015-05-07 16:02:35 +02:00
Joas Schilling 9f2f282191 Merge pull request #16153 from owncloud/CopyEtagHeaderPlugin-noarg
[HHVM] \OC\Connector\Sabre\CopyEtagHeaderPlugin constructor does not take any arguments
2015-05-07 15:38:42 +02:00
Arthur Schiwon 57e8b76f48 drop global file cache support, fixes #15621 2015-05-07 14:52:44 +02:00
Joas Schilling 05fe2006ee Do not run method when the path is empty 2015-05-07 14:31:21 +02:00
Robin Appelman 06a65fab13 use cross storage move when renaming the part file during webdav put 2015-05-07 14:28:31 +02:00
Andreas Fischer 4f6ecd3da6 \OC\Connector\Sabre\CopyEtagHeaderPlugin constructor does not take arguments. 2015-05-07 12:24:06 +02:00
Thomas Müller 2344298954 Merge pull request #16035 from owncloud/issue-15975-occ-encryption-enable-warning-no-module
Display a message when there is a problem with the default module
2015-05-07 12:03:30 +02:00
Joas Schilling 49f94b17f7 Avoid the log entry with the ModuleAlreadyExists exception when enabling the app 2015-05-07 11:00:55 +02:00
Morris Jobke 12b24ee567 Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page
Display the module settings in the list of the encryption modules
2015-05-07 10:44:03 +02:00
Jenkins for ownCloud 3dee907b70 [tx-robot] updated from transifex 2015-05-07 01:56:44 -04:00
Thomas Müller 55eaa165f8 Merge pull request #16119 from owncloud/fix-16056
[HHVM] Throw RunTimeException from OC\AppFramework\App::buildAppNamespace()
2015-05-07 00:20:57 +02:00
Andreas Fischer e418ced656 Check return value of OC_App::getAppPath() and verify info.xml exists. 2015-05-06 17:15:28 +02:00
Morris Jobke cd4b9258fc Merge pull request #16122 from owncloud/fix-15866
Fix broken group presentation in selected groups list
2015-05-06 17:00:31 +02:00
Joas Schilling b4471c2591 Fix the share mail notification when the item is in a folder 2015-05-06 15:44:19 +02:00
Arthur Schiwon 71e6644ec8 fix filter index on selected groups is updated too early 2015-05-06 15:34:44 +02:00
Arthur Schiwon 795a48d45c fix broken group presentation in selected groups list 2015-05-06 15:29:36 +02:00
Björn Schießle 6633514a98 Merge pull request #15628 from owncloud/enc_fix_rename
Encryption - fix moving/copying files between storages
2015-05-06 15:03:59 +02:00
Joas Schilling 892e2a3321 Merge pull request #16099 from labkode/prevent-preview-hooks
Do not trigger preview hooks if enable_previews is false
2015-05-06 14:37:59 +02:00
Joas Schilling aea734aaf1 Fix missing types on doc block and deduplicate the method name 2015-05-06 14:31:10 +02:00
Morris Jobke 193c6a9f98 Merge pull request #16116 from owncloud/encryption-l10n-settings
Add l10n support to encryption settings
2015-05-06 14:30:46 +02:00
Morris Jobke 5a46dad4e0 kill new lines in l10n strings 2015-05-06 14:30:22 +02:00
Bjoern Schiessle e4829a2358 update 'encrypted'-flag in file cache according to the storage settings 2015-05-06 14:20:05 +02:00
Bjoern Schiessle dc39bda870 move/copy from storage 2015-05-06 14:20:02 +02:00
Björn Schießle f2d46693c6 Merge pull request #15880 from owncloud/check_if_encryption_is_enabled
check if encryption is enbaled before we start moving keys
2015-05-06 13:23:55 +02:00
Morris Jobke 5ef4a7606c Add l10n support to encryption settings
* fixes #16111
2015-05-06 12:39:02 +02:00
Bjoern Schiessle 83ed4ee5b6 unit tests 2015-05-06 12:28:15 +02:00
Lukas Reschke 84960feee8 Merge pull request #16098 from owncloud/remove-phpmailer
Remove phpmailer from 3rdparty
2015-05-06 11:44:51 +02:00
Bjoern Schiessle e7a3911c83 check if encryption is enbaled before we start moving keys 2015-05-06 11:35:45 +02:00
Lukas Reschke 9a159372cb Merge pull request #16067 from owncloud/verbosity-in-app-code-check
Add verbosity option to app:check-code
2015-05-06 11:21:23 +02:00
Hugo Gonzalez Labrador 3e647afbd4 Do not trigger preview hooks if enable_previews is false 2015-05-06 10:39:48 +02:00
Morris Jobke 874d35b27a Merge pull request #16070 from owncloud/enc_update_file_cache_on_copy
make sure that we keep the correct encrypted-flag and the (unencrypted)size
2015-05-06 10:28:10 +02:00
Hugo Gonzalez Labrador 3a3a58f248 Do not trigger preview hooks if enable_previews is false 2015-05-06 10:03:18 +02:00
Morris Jobke f1903f61a1 Merge pull request #16072 from owncloud/phpdoc-cache
improve phpdoc of cache classes
2015-05-06 09:38:56 +02:00