Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15025 from rullzer/ocs_respect_enforced_date | Thomas Müller | 2015-03-19 | 1 | -0/+35 |
|\ | | | | | Ocs respect enforced date | ||||
| * | Added unit test | Roeland Jago Douma | 2015-03-19 | 1 | -0/+35 |
| | | | | | | | | | | Tests added to make sure that removing an expire date when this is enforced is not allowed. | ||||
* | | Merge pull request #14704 from owncloud/storage-wrapper-mount | Robin Appelman | 2015-03-19 | 2 | -0/+63 |
|\ \ | | | | | | | pass mountpoint to storage wrapper callback | ||||
| * | | fix test | Robin Appelman | 2015-03-16 | 1 | -2/+2 |
| | | | |||||
| * | | fix factory test | Robin Appelman | 2015-03-11 | 2 | -6/+5 |
| | | | |||||
| * | | Allow setting the watcher policy as mount option | Robin Appelman | 2015-03-11 | 1 | -0/+9 |
| | | | |||||
| * | | Copy mount options to the storage | Robin Appelman | 2015-03-11 | 1 | -0/+10 |
| | | | |||||
| * | | Add test for storage factory | Robin Appelman | 2015-03-11 | 1 | -0/+45 |
| | | | |||||
* | | | Merge pull request #14980 from owncloud/fix-fileglobalgc | Thomas Müller | 2015-03-19 | 1 | -0/+34 |
|\ \ \ | |_|/ |/| | | Fix fileglobalgc unlink parameter warnings | ||||
| * | | Add unit tests for gc() for \OC\Cache\FileGlobalGC | Robin McCorkell | 2015-03-18 | 1 | -0/+34 |
| | | | |||||
* | | | Merge pull request #14995 from owncloud/remove-unrequired-backtick-removal | Vincent Petry | 2015-03-18 | 1 | -0/+22 |
|\ \ \ | | | | | | | | | Remove unrequired backtick removal | ||||
| * | | | Add test for backticks in path and etag | Joas Schilling | 2015-03-18 | 1 | -0/+22 |
| |/ / | |||||
* / / | Soft fail in custom properties backend | Vincent Petry | 2015-03-18 | 1 | -0/+28 |
|/ / | | | | | | | | | This makes it possible for clients to still receive a file list (minus the broken files) instead of getting no list at all | ||||
* | | Merge pull request #14968 from owncloud/files-reallowsinglequote | Thomas Müller | 2015-03-17 | 1 | -0/+26 |
|\ \ | | | | | | | Reallow single quote in file names | ||||
| * | | Add positive test for path verification | Vincent Petry | 2015-03-17 | 1 | -0/+26 |
| | | | |||||
* | | | Cache \OC\URLGenerator::imagePath | Lukas Reschke | 2015-03-17 | 1 | -5/+12 |
|/ / | | | | | | | \OC\URLGenerator::imagePath is a really expensive operation due to all the I/O handling and can really benefit from caching. | ||||
* | | Merge pull request #14927 from oparoz/raw-mimetypes | Thomas Müller | 2015-03-17 | 1 | -1/+90 |
|\ \ | | | | | | | Introducing the Raw media types | ||||
| * | | Introducing the Raw mimetypes | Olivier Paroz | 2015-03-16 | 1 | -1/+90 |
| | | | |||||
* | | | Merge pull request #14931 from ↵ | Lukas Reschke | 2015-03-17 | 1 | -0/+160 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/issue/14881-closures-for-navigation-entries Issue/14881 closures for navigation entries | ||||
| * | | | Add tests for the navigation manager (closure) behaviour | Joas Schilling | 2015-03-16 | 1 | -0/+160 |
| | | | | |||||
* | | | | Merge pull request #12085 from owncloud/add-swift-mailer | Lukas Reschke | 2015-03-17 | 6 | -111/+457 |
|\ \ \ \ | |/ / / |/| | | | Migrate OC_Mail to SwiftMailer | ||||
| * | | | Add debug log message back | Lukas Reschke | 2015-03-16 | 1 | -1/+6 |
| | | | | |||||
| * | | | Show more detailed error message | Lukas Reschke | 2015-03-16 | 2 | -23/+3 |
| | | | | |||||
| * | | | Adjust unit test | Lukas Reschke | 2015-03-16 | 1 | -1/+6 |
| | | | | |||||
| * | | | Incorporate review changes | Lukas Reschke | 2015-03-16 | 2 | -40/+22 |
| | | | | |||||
| * | | | Use new IMailer and add unit-tests for lostcontroller | Lukas Reschke | 2015-03-16 | 1 | -9/+92 |
| | | | | |||||
| * | | | Migrate to SwiftMail | Lukas Reschke | 2015-03-16 | 6 | -102/+393 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly. Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014 Conflicts: 3rdparty lib/private/server.php lib/public/iservercontainer.php tests/lib/mail.php tests/settings/controller/mailsettingscontrollertest.php Conflicts: 3rdparty lib/private/mail.php lib/private/server.php lib/public/iservercontainer.php settings/ajax/lostpassword.php settings/application.php | ||||
* | | | Merge pull request #14883 from owncloud/imagepng_expects_resource_issue | Thomas Müller | 2015-03-16 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | validate resource's integrity before using it | ||||
| * | | | validate resource's integrity before using it | Georg Ehrke | 2015-03-16 | 1 | -0/+5 |
| |/ / | |||||
* | | | Merge pull request #14766 from owncloud/fix-insertifnotexists-poc | Morris Jobke | 2015-03-16 | 2 | -14/+126 |
|\ \ \ | | | | | | | | | Allow specifying the compare-array for insertIfNotExists() | ||||
| * | | | Add test for UniqueConstraintViolationException on wrong key | Joas Schilling | 2015-03-10 | 1 | -0/+32 |
| | | | | |||||
| * | | | let insertIfNotExist() throw the native DBALException - no need to hide the ↵ | Thomas Müller | 2015-03-09 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | real exception | ||||
| * | | | Adding unit test which shows insertIfNotExists to fall apart in certain ↵ | Thomas Müller | 2015-03-09 | 2 | -11/+91 |
| | | | | | | | | | | | | | | | | situations | ||||
* | | | | Merge pull request #14644 from owncloud/trash-expire-command | Thomas Müller | 2015-03-16 | 1 | -7/+30 |
|\ \ \ \ | | | | | | | | | | | Expire files from the trash in the background | ||||
| * | | | | Allow running the async commands from unit tests | Robin Appelman | 2015-03-02 | 1 | -7/+30 |
| | | | | | |||||
* | | | | | Merge pull request #14776 from owncloud/fix-14629-master | Thomas Müller | 2015-03-16 | 1 | -0/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | verify the file name length not to exceed 255 characters + verify path d... | ||||
| * | | | | | verify the file name length not to exceed 255 characters + verify path ↵ | Thomas Müller | 2015-03-12 | 1 | -0/+10 |
| | |_|/ / | |/| | | | | | | | | | | | | | during rename | ||||
* | | | | | Merge pull request #14848 from owncloud/kill-curl-fallback-master | Thomas Müller | 2015-03-16 | 1 | -47/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | drop any fallback code related to curl | ||||
| * | | | | | drop any fallback code related to curl - refs ↵ | Thomas Müller | 2015-03-12 | 1 | -47/+1 |
| |/ / / / | | | | | | | | | | | | | | | | https://github.com/owncloud/core/pull/14838#issuecomment-78586447 | ||||
* | | | | | No user no avatar easy as that | Joas Schilling | 2015-03-13 | 1 | -6/+5 |
| | | | | | |||||
* | | | | | Fix order of expected and actual on assertEquals() calls | Joas Schilling | 2015-03-13 | 1 | -19/+19 |
| | | | | | |||||
* | | | | | Fix getting the avatar of a non-existing user | Joas Schilling | 2015-03-13 | 1 | -5/+22 |
|/ / / / | |||||
* | | | | Fix the avatarcontroller cache needing the cache dir | Roeland Jago Douma | 2015-03-11 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | This was removed in 82254ad5efb65e8650567f49343ec37eb55e2f3e and unfortunatly missed by jenkins before mering into master. | ||||
* | | | | Merge pull request #14705 from rullzer/avatarcontroller | Lukas Reschke | 2015-03-11 | 2 | -1/+364 |
|\ \ \ \ | |_|_|/ |/| | | | Move AvatarController to AppFramework | ||||
| * | | | Avatar controller moved to AppFrameWork | Roeland Jago Douma | 2015-03-11 | 2 | -1/+364 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Original avatarcontroller migrated to the appframework * Added DataDisplayResponse that show data inline in the browser (used to retrun the image) * Removed some unneeded code * Added unit tests for the avatarcontroller | ||||
* | | | | Merge pull request #13839 from ↵ | Morris Jobke | 2015-03-11 | 1 | -0/+51 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/issue/13678-improve-remote-domain-detection-in-sharedropdown Better finding the remote URL from user input in share dropdown | ||||
| * | | | | Extract the remote host from user input in share dropdown | Joas Schilling | 2015-02-23 | 1 | -0/+51 |
| | | | | | | | | | | | | | | | | | | | | Fix #13678 | ||||
* | | | | | Merge pull request #13513 from owncloud/repair-legacystoragenofatalfail | Morris Jobke | 2015-03-11 | 1 | -9/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | Do not abort when meeting unfixable legacy storages | ||||
| * | | | | | Fixed expected warning count on repair fail | Vincent Petry | 2015-02-27 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Detect that the done flag was not set after repair fail | Vincent Petry | 2015-02-27 | 1 | -2/+2 |
| | | | | | |