Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15639 from rullzer/fix_15368 | Morris Jobke | 2015-04-23 | 2 | -2/+99 |
|\ | |||||
| * | Added unit tests | Roeland Jago Douma | 2015-04-17 | 1 | -0/+94 |
| * | moved from html to $('html') to fix unit tests | Roeland Jago Douma | 2015-04-17 | 1 | -2/+1 |
| * | Reset sharedialog values | Roeland Jago Douma | 2015-04-17 | 1 | -0/+4 |
* | | 8.1.0 alpha 2v8.1.0alpha2 | Frank Karlitschek | 2015-04-15 | 1 | -2/+2 |
* | | Merge pull request #15805 from owncloud/fileslist-whitespace | Morris Jobke | 2015-04-22 | 1 | -3/+4 |
|\ \ | |||||
| * | | add whitespace to bottom of files list to correctly show dropdowns, fix #15801 | Jan-Christoph Borchardt | 2015-04-22 | 1 | -3/+4 |
* | | | Merge pull request #15809 from owncloud/view-null-root | Vincent Petry | 2015-04-22 | 2 | -2/+25 |
|\ \ \ | |||||
| * | | | typo | Robin Appelman | 2015-04-22 | 1 | -1/+1 |
| * | | | add unit tests for null handling in view | Robin Appelman | 2015-04-22 | 1 | -2/+19 |
| * | | | dont allow using null as view root | Robin Appelman | 2015-04-22 | 1 | -0/+6 |
* | | | | Merge pull request #15799 from owncloud/fix-enc-folder-move | Thomas Müller | 2015-04-22 | 14 | -267/+168 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fix PHPDoc | Thomas Müller | 2015-04-22 | 1 | -7/+8 |
| * | | | pass KeyStorage via ctor | Thomas Müller | 2015-04-22 | 3 | -43/+12 |
| * | | | calling renameKeys() on directory level as well - fixes #15778 | Thomas Müller | 2015-04-22 | 2 | -9/+18 |
| * | | | add $encryptionModuleId to methods of Keys/IStorage | Thomas Müller | 2015-04-22 | 13 | -218/+140 |
* | | | | Merge pull request #15787 from owncloud/trash-partfiles | Morris Jobke | 2015-04-22 | 2 | -3/+6 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Do not trash part files, delete directly | Vincent Petry | 2015-04-21 | 2 | -3/+6 |
* | | | | Merge pull request #15549 from owncloud/jcf-fix-cache-update | Morris Jobke | 2015-04-22 | 1 | -1/+8 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | clarify the duplication of the $params array | Jens-Christian Fischer | 2015-04-12 | 1 | -1/+2 |
| * | | | don't update identical values | Jens-Christian Fischer | 2015-04-11 | 1 | -1/+7 |
* | | | | Merge pull request #15757 from owncloud/enc-fixfeofforlastblock | Björn Schießle | 2015-04-22 | 4 | -6/+94 |
|\ \ \ \ | |||||
| * | | | | Fix encryption feof to not return too early | Vincent Petry | 2015-04-20 | 4 | -6/+94 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-22 | 102 | -14/+314 |
* | | | | | Merge pull request #15734 from owncloud/add-deprecate-tags | Thomas Müller | 2015-04-21 | 6 | -1/+27 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Add @deprecated to all methods with a proper method in \OCP | Morris Jobke | 2015-04-20 | 6 | -1/+27 |
* | | | | | Merge pull request #15782 from owncloud/hide-modified-multiselect | Morris Jobke | 2015-04-21 | 1 | -1/+10 |
|\ \ \ \ \ | |||||
| * | | | | | hide modified header when multiselect is active, fix #15779 | Jan-Christoph Borchardt | 2015-04-21 | 1 | -1/+10 |
* | | | | | | Merge pull request #15721 from oparoz/fix-readonly-cache | Thomas Müller | 2015-04-21 | 2 | -1/+96 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Renamed class + split methods | Olivier Paroz | 2015-04-21 | 1 | -25/+13 |
| * | | | | | | Tests for read-only cache | Olivier Paroz | 2015-04-18 | 1 | -0/+105 |
| * | | | | | | Thou shalt not corrupt the answer of a cache request | Olivier Paroz | 2015-04-18 | 1 | -1/+3 |
* | | | | | | | Merge pull request #15690 from owncloud/enc_fix_upload | Björn Schießle | 2015-04-21 | 2 | -2/+96 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | get dirname from sharePath | Bjoern Schiessle | 2015-04-21 | 2 | -2/+96 |
* | | | | | | | | Merge pull request #15769 from owncloud/files-emptycontentreadonly | Jan-Christoph Borchardt | 2015-04-21 | 4 | -5/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Added empty content message for empty read-only folders | Vincent Petry | 2015-04-21 | 4 | -5/+16 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #15770 from owncloud/fix-15764 | Morris Jobke | 2015-04-21 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | bring back border in host input field for consistency | Arthur Schiwon | 2015-04-21 | 1 | -1/+0 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #15713 from owncloud/fix-15707-master | Morris Jobke | 2015-04-21 | 4 | -39/+47 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | doc and indent | Thomas Müller | 2015-04-21 | 2 | -4/+8 |
| * | | | | | | Don't pollute the global namespace | Thomas Müller | 2015-04-21 | 3 | -33/+44 |
| * | | | | | | make jshint happy | Thomas Müller | 2015-04-20 | 2 | -14/+17 |
| * | | | | | | use a simple function - OC.Encryption is already defined - fixes #15707 | Thomas Müller | 2015-04-20 | 1 | -23/+13 |
* | | | | | | | Merge pull request #15636 from owncloud/enc2_performance_improvement | Björn Schießle | 2015-04-21 | 1 | -3/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | set size and unencrypted size to zero on fopen | Bjoern Schiessle | 2015-04-20 | 1 | -3/+2 |
* | | | | | | | | Merge pull request #15753 from owncloud/remove-app-version-from-disabled-list | Thomas Müller | 2015-04-21 | 3 | -4/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove the app version from disabled app list | Joas Schilling | 2015-04-20 | 3 | -4/+25 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-21 | 10 | -8/+44 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #15677 from owncloud/enc_reset_private_key_password | Thomas Müller | 2015-04-20 | 5 | -10/+379 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Dont use the old .status way | Joas Schilling | 2015-04-20 | 3 | -24/+12 |