Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-24 | 66 | -82/+44 |
* | Merge pull request #17095 from owncloud/proper-error-handling | Morris Jobke | 2015-06-23 | 3 | -11/+19 |
|\ | |||||
| * | [updater] keep maintenance active on failure and mark failure in red | Morris Jobke | 2015-06-23 | 2 | -2/+3 |
| * | [updater] propagate error case properly | Morris Jobke | 2015-06-23 | 2 | -8/+15 |
| * | Added error message on initMountpoints exception | Morris Jobke | 2015-06-23 | 1 | -1/+1 |
* | | Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-message | Vincent Petry | 2015-06-23 | 2 | -0/+19 |
|\ \ | |||||
| * | | adding correct blocking logic for fff | Clark Tomlinson | 2015-06-22 | 2 | -0/+19 |
* | | | Merge pull request #17045 from owncloud/enc_improvements | Björn Schießle | 2015-06-23 | 3 | -7/+66 |
|\ \ \ | |||||
| * | | | make sure that we always read the header from the original file | Bjoern Schiessle | 2015-06-23 | 2 | -6/+65 |
| * | | | remove files_encryption from database at the end of the migration process | Bjoern Schiessle | 2015-06-19 | 1 | -1/+1 |
* | | | | Merge pull request #17090 from owncloud/upgrade-app-info | Jörn Friedrich Dreyer | 2015-06-23 | 2 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | [upgrade] print update message before running the update code | Morris Jobke | 2015-06-23 | 2 | -0/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #17092 from owncloud/fix-language-experimental | Joas Schilling | 2015-06-23 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Accept this language change at your own risk | Joas Schilling | 2015-06-23 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #17081 from owncloud/issue-17079-risky-test-sabre-objecttree | Lukas Reschke | 2015-06-23 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | Make an assertion in risky test testGetNodeForPathRoot | Joas Schilling | 2015-06-22 | 1 | -1/+2 |
* | | | | Merge pull request #17085 from owncloud/use-trusted-mimetype | Morris Jobke | 2015-06-23 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Use trusted mimetype | Lukas Reschke | 2015-06-22 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-23 | 18 | -16/+78 |
* | | | | Merge pull request #16940 from owncloud/ext-s3-touchmtimefix | Thomas Müller | 2015-06-22 | 1 | -8/+13 |
|\ \ \ \ | |||||
| * | | | | Properly set mtime on S3 for touch operation | Vincent Petry | 2015-06-15 | 1 | -8/+13 |
* | | | | | Merge pull request #17068 from owncloud/fix_16878 | VicDeo | 2015-06-22 | 2 | -0/+6 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | remove whitespace on bottom when no search results, fix laylout, fix #16878 | Jan-Christoph Borchardt | 2015-06-22 | 2 | -2/+6 |
| * | | | | add filter-empty class if no search result in current folder | Bjoern Schiessle | 2015-06-22 | 1 | -0/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #12546 from oparoz/patch-1 | Björn Schießle | 2015-06-22 | 2 | -21/+51 |
|\ \ \ \ | |||||
| * | | | | Remove unneeded returns from private cropping methods | Olivier Paroz | 2015-06-19 | 2 | -20/+15 |
| * | | | | Remove unneeded returns from private cropping methods | Olivier Paroz | 2015-06-18 | 1 | -16/+6 |
| * | | | | Move media type icon preview creation to its own method | Olivier Paroz | 2015-06-18 | 2 | -4/+46 |
| * | | | | Send the mime icon if we can't generate a preview | Olivier Paroz | 2015-06-18 | 1 | -1/+4 |
* | | | | | Merge pull request #16657 from owncloud/view-emit-path | Thomas Müller | 2015-06-22 | 2 | -2/+33 |
|\ \ \ \ \ | |||||
| * | | | | | fix check if hooks should be emited in runHooks | Robin Appelman | 2015-06-15 | 1 | -1/+2 |
| * | | | | | emit hooks from a view as long as the path is inside the default root | Robin Appelman | 2015-06-02 | 2 | -1/+31 |
* | | | | | | Merge pull request #17056 from owncloud/appframework-type-cast | Bernhard Posselt | 2015-06-22 | 2 | -1/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | AppFramework annotation whitespace unit test | Robin McCorkell | 2015-06-21 | 1 | -0/+14 |
| * | | | | | | Allow multiple whitespace in type hints in AppFramework | Robin McCorkell | 2015-06-20 | 1 | -1/+1 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-22 | 4 | -4/+20 |
* | | | | | | | Merge pull request #17025 from owncloud/sftp-rmdir-emptydir | Robin McCorkell | 2015-06-21 | 2 | -1/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Workaround for empty dir deletion for SFTP | Vincent Petry | 2015-06-18 | 2 | -1/+12 |
* | | | | | | | | Merge pull request #17052 from owncloud/fix-phpdoc-groupmgm | Robin McCorkell | 2015-06-21 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use proper type | Lukas Reschke | 2015-06-19 | 2 | -2/+2 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-21 | 16 | -8/+96 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-20 | 28 | -28/+172 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #17041 from owncloud/ocp-since-checker | Morris Jobke | 2015-06-19 | 11 | -1/+146 |
|\ \ \ \ \ \ | |||||
| * | | | | | | move the OCPSinceChecker.php to build/ | Morris Jobke | 2015-06-19 | 2 | -1/+1 |
| * | | | | | | Fix missing @since tags in OCP | Morris Jobke | 2015-06-19 | 9 | -1/+28 |
| * | | | | | | Add tool to check OCP for missing @since tag | Morris Jobke | 2015-06-19 | 2 | -0/+118 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #17024 from owncloud/master-verify-if-path-exists-in-upload | Thomas Müller | 2015-06-19 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Verify if path exists | Lukas Reschke | 2015-06-18 | 1 | -0/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #17040 from owncloud/fix-param-naming | Thomas Müller | 2015-06-19 | 1 | -5/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix naming of param in private/server.php | Morris Jobke | 2015-06-19 | 1 | -5/+5 |
| | |/ / / / | |/| | | | |