Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Check return value of OC_App::getAppPath() and verify info.xml exists. | Andreas Fischer | 2015-05-06 | 1 | -11/+14 |
| | |||||
* | Merge pull request #16098 from owncloud/remove-phpmailer | Lukas Reschke | 2015-05-06 | 1 | -0/+0 |
|\ | | | | | Remove phpmailer from 3rdparty | ||||
| * | Remove phpmailer from 3rdparty | Joas Schilling | 2015-05-06 | 1 | -0/+0 |
| | | |||||
* | | Merge pull request #16067 from owncloud/verbosity-in-app-code-check | Lukas Reschke | 2015-05-06 | 2 | -7/+18 |
|\ \ | | | | | | | Add verbosity option to app:check-code | ||||
| * | | Add verbosity option to app:check-code | Morris Jobke | 2015-05-05 | 2 | -7/+18 |
| | | | | | | | | | | | | | | | * by default only lists files with errors * option -v lists all files even if there are no errors | ||||
* | | | Merge pull request #16070 from owncloud/enc_update_file_cache_on_copy | Morris Jobke | 2015-05-06 | 2 | -11/+45 |
|\ \ \ | | | | | | | | | make sure that we keep the correct encrypted-flag and the (unencrypted)size | ||||
| * | | | make sure that we keep the correct encrypted-flag and the (unencrypted)size ↵ | Bjoern Schiessle | 2015-05-05 | 2 | -11/+45 |
| |/ / | | | | | | | | | | if a file gets copied | ||||
* | | | Merge pull request #16072 from owncloud/phpdoc-cache | Morris Jobke | 2015-05-06 | 4 | -30/+139 |
|\ \ \ | | | | | | | | | improve phpdoc of cache classes | ||||
| * | | | improve phpdoc of cache classes | Robin Appelman | 2015-05-05 | 4 | -30/+139 |
| |/ / | |||||
* | | | Merge pull request #16017 from owncloud/proper-update-notification | Morris Jobke | 2015-05-06 | 3 | -4/+36 |
|\ \ \ | | | | | | | | | Use OC.Notification for update notifications | ||||
| * | | | Use OC.Notification for update notifications | Morris Jobke | 2015-05-03 | 3 | -4/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * instead of a static rendering inside PHP use the JS OC.Notification.showTemporary to hide the notification after 7 seconds automatically * fixes #14811 | ||||
* | | | | Merge pull request #16050 from ↵ | Jörn Friedrich Dreyer | 2015-05-06 | 2 | -24/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/add-workaround-for-populate-raw-post-data Don't display errors and log them | ||||
| * | | | | Don't depend on always_populate_raw_post_data | Lukas Reschke | 2015-05-05 | 1 | -19/+0 |
| | | | | | |||||
| * | | | | Don't display errors and log them | Lukas Reschke | 2015-05-05 | 1 | -5/+3 |
| | |/ / | |/| | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16014 | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-06 | 42 | -38/+176 |
| | | | | |||||
* | | | | Merge pull request #16037 from owncloud/enc_dont_disable_encryption | Jan-Christoph Borchardt | 2015-05-05 | 4 | -16/+29 |
|\ \ \ \ | | | | | | | | | | | don't let the the user disable encryption once it was activated | ||||
| * | | | | Don't highlight disabled labels on hover | Morris Jobke | 2015-05-05 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | fix label reference | Morris Jobke | 2015-05-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | adjust wording and add button to confirm encryption | Bjoern Schiessle | 2015-05-05 | 2 | -15/+15 |
| | | | | | |||||
| * | | | | don't let the the user disable encryption once it was activated | Bjoern Schiessle | 2015-05-04 | 3 | -1/+10 |
| | | | | | |||||
* | | | | | Merge pull request #16069 from owncloud/fix-15933 | blizzz | 2015-05-05 | 3 | -2/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix: user login filter does not take username into account | ||||
| * | | | | | cleanup | Arthur Schiwon | 2015-05-05 | 2 | -2/+0 |
| | | | | | | |||||
| * | | | | | not only send them back but also apply defaults to a new configuration. ↵ | Arthur Schiwon | 2015-05-05 | 1 | -0/+1 |
| | |/ / / | |/| | | | | | | | | | | | | | Fixes #15933 | ||||
* | | | | | Merge pull request #16064 from owncloud/fix-empty-mail-address | Jan-Christoph Borchardt | 2015-05-05 | 3 | -5/+81 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Allow user to set an empty email address | ||||
| * | | | | Add test for setEmailAddress | Joas Schilling | 2015-05-05 | 1 | -0/+70 |
| | | | | | |||||
| * | | | | Allow user to set an empty email address | Morris Jobke | 2015-05-05 | 2 | -5/+11 |
| | | | | | | | | | | | | | | | | | | | | * fixes #16057 | ||||
* | | | | | Merge pull request #16065 from owncloud/check-binaryops-in-code-checker | Morris Jobke | 2015-05-05 | 6 | -2/+76 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Check usage of != and == | ||||
| * | | | | add positive tests for operator in code checker | Morris Jobke | 2015-05-05 | 2 | -0/+30 |
| | | | | | |||||
| * | | | | Check usage of != and == - refs #16054 | Thomas Müller | 2015-05-05 | 5 | -2/+46 |
|/ / / / | |||||
* | | | | Merge pull request #16045 from owncloud/reduce-autotest-hhvm | Thomas Müller | 2015-05-05 | 2 | -219/+23 |
|\ \ \ \ | |/ / / |/| | | | Combine autotest-hhvm.sh with autotest.sh | ||||
| * | | | Combine autotest-hhvm.sh with autotest.sh | Andreas Fischer | 2015-05-04 | 2 | -219/+23 |
| | | | | |||||
* | | | | Merge pull request #16058 from owncloud/fix-app-check-code-parameter-description | Morris Jobke | 2015-05-05 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix the "app-id" parameter description of app:check-code | ||||
| * | | | | Fix the "app-id" parameter description of app:check-code | Joas Schilling | 2015-05-05 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #16052 from owncloud/fix-phpdoc-sharecontroller | Joas Schilling | 2015-05-05 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix PHPDoc for the ext. share controller | ||||
| * | | | | | Fix PHPDoc for the ext. share controller | Lukas Reschke | 2015-05-04 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #15938 from owncloud/enc_update_recovery_share_key | Björn Schießle | 2015-05-05 | 8 | -44/+92 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [encryption] check recovery key setting for the correct user | ||||
| * | | | | | | Allow setting protected properties | Joas Schilling | 2015-04-30 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | check recovery setting for the right user | Bjoern Schiessle | 2015-04-30 | 8 | -44/+92 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #16031 from owncloud/fix-15953-master | Jan-Christoph Borchardt | 2015-05-05 | 1 | -9/+9 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | No clickable app for local apps | ||||
| * | | | | | | fix l10n strings | Thomas Müller | 2015-05-04 | 1 | -8/+2 |
| | | | | | | | |||||
| * | | | | | | no link if there is no detailpage property set - fixes #15953 | Thomas Müller | 2015-05-04 | 1 | -1/+7 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-05 | 196 | -474/+420 |
| | | | | | | |||||
* | | | | | | Merge pull request #15544 from rullzer/fix_15263 | Jan-Christoph Borchardt | 2015-05-04 | 1 | -0/+9 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [WIP] Only show SSL table header if there are certificates | ||||
| * | | | | | | Only show SSL table header if there are certificates | Roeland Jago Douma | 2015-05-04 | 1 | -0/+9 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #16048 from owncloud/fix-mb-string | Lukas Reschke | 2015-05-04 | 1 | -7/+13 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Check `mbstring.func_overload` only if the mb module is installed. | ||||
| * | | | | | Check `mbstring.func_overload` only if the mb module is installed. | Lukas Reschke | 2015-05-04 | 1 | -2/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/14670 | ||||
| * | | | | | Remove PHP 5.4 warning in checkSetup | Lukas Reschke | 2015-05-04 | 1 | -9/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is catched in index.php as older PHP versions will never execute the code path until there due to 5.4 syntax changes. | ||||
* | | | | | | Merge pull request #16026 from owncloud/enc_ux_improvements | Björn Schießle | 2015-05-04 | 1 | -3/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | [encryption] some small ux improvements | ||||
| * | | | | | some small ux improvements | Bjoern Schiessle | 2015-05-04 | 1 | -3/+7 |
| |/ / / / | |||||
* | | | | | Merge pull request #16042 from owncloud/fix-output-buffering | Thomas Müller | 2015-05-04 | 2 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove hard-dependency on disabled output_buffering |