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

24778 Commits

Author SHA1 Message Date
Arthur Schiwon 795a48d45c fix broken group presentation in selected groups list 2015-05-06 15:29:36 +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
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
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
Björn Schießle 2ce01ee0bf Merge pull request #15938 from owncloud/enc_update_recovery_share_key 
[encryption] check recovery key setting for the correct user
 2015-05-05 10:48:09 +02:00
Bjoern Schiessle 8f1e504d79 adjust wording and add button to confirm encryption 2015-05-05 10:38:09 +02:00
Jan-Christoph Borchardt a7deba74a7 Merge pull request #16031 from owncloud/fix-15953-master 
No clickable app for local apps
 2015-05-05 09:27:47 +02:00
Joas Schilling 87787a3af4 Fix the "app-id" parameter description of app:check-code 2015-05-05 08:23:59 +02:00
Jenkins for ownCloud b60dcd91bb [tx-robot] updated from transifex 2015-05-05 01:55:36 -04:00
Jan-Christoph Borchardt fa6a67ccc1 Merge pull request #15544 from rullzer/fix_15263 
[WIP] Only show SSL table header if there are certificates
 2015-05-04 20:27:40 +02:00
Lukas Reschke 044ee7ead5 Merge pull request #16048 from owncloud/fix-mb-string 
Check `mbstring.func_overload` only if the mb module is installed.
 2015-05-04 20:19:11 +02:00
Roeland Jago Douma a9a9adc217 Only show SSL table header if there are certificates 2015-05-04 19:08:43 +02:00
Lukas Reschke d9746d8abd Fix PHPDoc for the ext. share controller 2015-05-04 18:06:16 +02:00
Björn Schießle ed16127a8d Merge pull request #16026 from owncloud/enc_ux_improvements 
[encryption] some small ux improvements
 2015-05-04 17:40:05 +02:00
Lukas Reschke 7c5558327d Check `mbstring.func_overload` only if the mb module is installed. 
Fixes https://github.com/owncloud/core/issues/14670
 2015-05-04 17:13:25 +02:00
Lukas Reschke 64393b4c03 Remove PHP 5.4 warning in checkSetup 
This is catched in index.php as older PHP versions will never execute the code path until there due to 5.4 syntax changes.
 2015-05-04 17:11:17 +02:00