mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
24,792 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

24792 Commits

Author SHA1 Message Date
Joas Schilling 05fe2006ee Do not run method when the path is empty 2015-05-07 14:31:21 +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
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
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
Morris Jobke c3fb021acf Merge pull request #16017 from owncloud/proper-update-notification 
Use OC.Notification for update notifications
 2015-05-06 09:28:42 +02:00
Jörn Friedrich Dreyer 4c0d1b0460 Merge pull request #16050 from owncloud/add-workaround-for-populate-raw-post-data 
Don't display errors and log them
 2015-05-06 08:55:46 +02:00
Joas Schilling e768b3b138 Remove phpmailer from 3rdparty 2015-05-06 08:34:15 +02:00
Jenkins for ownCloud 910146824e [tx-robot] updated from transifex 2015-05-06 01:55:19 -04:00
Jan-Christoph Borchardt 952a90f2e3 Merge pull request #16037 from owncloud/enc_dont_disable_encryption 
don't let the the user disable encryption once it was activated
 2015-05-05 18:53:01 +02:00
Bjoern Schiessle 7089af96f2 make sure that we keep the correct encrypted-flag and the (unencrypted)size if a file gets copied 2015-05-05 16:17:14 +02:00
Robin Appelman e0d151505f improve phpdoc of cache classes 2015-05-05 16:06:28 +02:00
blizzz 6783699501 Merge pull request #16069 from owncloud/fix-15933 
Fix: user login filter does not take username into account
 2015-05-05 15:17:13 +02:00
Jan-Christoph Borchardt 2aaafc134c Merge pull request #16064 from owncloud/fix-empty-mail-address 
Allow user to set an empty email address
 2015-05-05 14:51:53 +02:00
Arthur Schiwon 0e7fd82e89 cleanup 2015-05-05 14:21:12 +02:00
Arthur Schiwon 1c791e6000 not only send them back but also apply defaults to a new configuration. Fixes #15933 2015-05-05 14:20:58 +02:00
Morris Jobke 767cf2774a Merge pull request #16065 from owncloud/check-binaryops-in-code-checker 
Check usage of != and ==
 2015-05-05 14:07:25 +02:00
Morris Jobke 56b1c93a79 Add verbosity option to app:check-code 
* by default only lists files with errors
* option -v lists all files even if there are no errors
 2015-05-05 13:57:23 +02:00
Joas Schilling d36d14366b Add test for setEmailAddress 2015-05-05 13:53:00 +02:00
Morris Jobke 493844eda4 add positive tests for operator in code checker 2015-05-05 13:09:12 +02:00
Thomas Müller aae098c24a Check usage of != and == - refs #16054 2015-05-05 12:59:33 +02:00
Lukas Reschke 11310355ed Don't depend on always_populate_raw_post_data 2015-05-05 12:36:15 +02:00
Lukas Reschke 9530e819eb Don't display errors and log them 
Fixes https://github.com/owncloud/core/issues/16014
 2015-05-05 12:34:22 +02:00
Morris Jobke 5fd849f545 Allow user to set an empty email address 
* fixes #16057
 2015-05-05 11:58:19 +02:00
Thomas Müller 5aa3525479 Merge pull request #16045 from owncloud/reduce-autotest-hhvm 
Combine autotest-hhvm.sh with autotest.sh
 2015-05-05 11:48:20 +02:00
Morris Jobke a1b9444643 Don't highlight disabled labels on hover 2015-05-05 11:17:48 +02:00
Morris Jobke 624c25313e fix label reference 2015-05-05 11:12:56 +02:00
Morris Jobke 179472aeef Merge pull request #16058 from owncloud/fix-app-check-code-parameter-description 
Fix the "app-id" parameter description of app:check-code
 2015-05-05 10:56:03 +02:00
Joas Schilling efce8ff905 Merge pull request #16052 from owncloud/fix-phpdoc-sharecontroller 
Fix PHPDoc for the ext. share controller
 2015-05-05 10:52:28 +02:00