Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #7211 from mattcaron/master | Vincent Petry | 2014-02-17 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Consolidate two sections, per code review. Issue #1648 | Matthew Caron | 2014-02-17 | 1 | -6/+2 | |
| * | | | | | | | | | | | | | | | | | Fit shared videos to viewer, just like images. Issue #1648 | Matthew Caron | 2014-02-14 | 1 | -0/+7 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #7231 from owncloud/proper-content-type | Jörn Friedrich Dreyer | 2014-02-17 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Use the proper content-type | Lukas Reschke | 2014-02-17 | 1 | -0/+2 | |
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge pull request #7233 from owncloud/fix_5567 | Jörn Friedrich Dreyer | 2014-02-17 | 3 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | LDAP: improve wizard strings, fixes #5567 | Arthur Schiwon | 2014-02-17 | 3 | -3/+3 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #7132 from owncloud/issue/6920 | Jan-Christoph Borchardt | 2014-02-17 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Do not select input for all text input fields | Joas Schilling | 2014-02-07 | 1 | -4/+0 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #6892 from owncloud/issuetemplate-enhancements | Lukas Reschke | 2014-02-17 | 1 | -16/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Removed quota question | Vincent Petry | 2014-02-17 | 1 | -2/+0 | |
| * | | | | | | | | | | | | | | | | | Added boldening of entries for readability | Vincent Petry | 2014-01-22 | 1 | -13/+18 | |
| * | | | | | | | | | | | | | | | | | Added explicit quota + encryption questions | Vincent Petry | 2014-01-22 | 1 | -1/+5 | |
| * | | | | | | | | | | | | | | | | | Moved steps to reproduce to the top | Vincent Petry | 2014-01-22 | 1 | -5/+5 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #7155 from owncloud/enc_improved_error_handling | Björn Schießle | 2014-02-17 | 8 | -53/+184 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | don't block login forever if we are stuck in the middle of the initial encryp... | Bjoern Schiessle | 2014-02-17 | 5 | -10/+24 | |
| * | | | | | | | | | | | | | | | | | catch errors during decryption | Bjoern Schiessle | 2014-02-17 | 3 | -17/+113 | |
| * | | | | | | | | | | | | | | | | | catch errors during initial encryption | Bjoern Schiessle | 2014-02-17 | 2 | -26/+47 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #7156 from owncloud/backgroundjob-public | Thomas Müller | 2014-02-14 | 12 | -65/+437 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Add unit tests for JobList | Robin Appelman | 2014-02-12 | 4 | -26/+238 | |
| * | | | | | | | | | | | | | | | | Additional phpdoc | Robin Appelman | 2014-02-12 | 3 | -6/+31 | |
| * | | | | | | | | | | | | | | | | Remove internal methods from the public interface | Robin Appelman | 2014-02-12 | 1 | -7/+1 | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' into backgroundjob-public | Robin Appelman | 2014-02-12 | 6 | -1/+37 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Add the background job list to the public server container | Robin Appelman | 2014-02-11 | 9 | -38/+179 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #7207 from owncloud/fileinfo-serializable | Morris Jobke | 2014-02-14 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | remove the JsonSerializable interface from \OC\Files\FileInfo | Robin Appelman | 2014-02-14 | 1 | -5/+1 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #7204 from owncloud/groupexists-duplicate | Thomas Müller | 2014-02-14 | 2 | -10/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Fix test cases for group manager | Robin Appelman | 2014-02-14 | 2 | -4/+37 | |
| * | | | | | | | | | | | | | | | | | | remove duplicate call to groupExists | Robin Appelman | 2014-02-14 | 1 | -6/+4 | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #7206 from owncloud/fix_enc_tests | blizzz | 2014-02-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | fileinfo is no longer a array | Bjoern Schiessle | 2014-02-14 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge pull request #6748 from owncloud/fileinfo | icewind1991 | 2014-02-14 | 8 | -34/+367 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | merge master into fileinfo | Robin Appelman | 2014-01-29 | 125 | -5300/+16010 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Add isReadable, isUpdateable, isDeletable, isShareable | Robin Appelman | 2014-01-24 | 2 | -1/+65 | |
| * | | | | | | | | | | | | | | | | | | undo 3rdparty change | Robin Appelman | 2014-01-20 | 1 | -0/+0 | |
| * | | | | | | | | | | | | | | | | | | undo 3rdparty change | Robin Appelman | 2014-01-20 | 1 | -0/+0 | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-17 | 33 | -85/+269 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | remove more is_array from encryption | Robin Appelman | 2014-01-17 | 3 | -13/+13 | |
| * | | | | | | | | | | | | | | | | | | | Dont use php5.4 only features | Robin Appelman | 2014-01-17 | 1 | -2/+3 | |
| * | | | | | | | | | | | | | | | | | | | Don't use is_array on FileInfo | Robin Appelman | 2014-01-17 | 2 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-14 | 29 | -3395/+101 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | add Support for passing a FileInfo instance to View->putFileInfo | Robin Appelman | 2014-01-13 | 2 | -1/+8 | |
| * | | | | | | | | | | | | | | | | | | | | remove ArrayAccess, JsonSerializable from the public part of FileInfo | Robin Appelman | 2014-01-13 | 2 | -17/+7 | |
| * | | | | | | | | | | | | | | | | | | | | Extends phpdoc for \OCP\File\FileInfo | Robin Appelman | 2014-01-13 | 1 | -4/+37 | |
| * | | | | | | | | | | | | | | | | | | | | Add a FileInfo class which holds all info of a file and return that from getF... | Robin Appelman | 2014-01-13 | 4 | -18/+257 | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #6726 from owncloud/fix_6630 | Vincent Petry | 2014-02-14 | 5 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Fixed double file encoding for previews | Vincent Petry | 2014-01-30 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | remove empty line | Georg Ehrke | 2014-01-30 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | don't urldecode get var, php does this automatically | Georg Ehrke | 2014-01-30 | 3 | -3/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #7183 from owncloud/remove-force-lowercase | Thomas Müller | 2014-02-14 | 1 | -3/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |