Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7878 from owncloud/quota-extstorageswitch | icewind1991 | 2014-06-05 | 2 | -2/+53 |
|\ | |||||
| * | Added experimental switch to count external storage data in quota | Vincent Petry | 2014-06-04 | 2 | -2/+53 |
* | | Merge pull request #8884 from owncloud/move-flock-to-app | Jörn Friedrich Dreyer | 2014-06-05 | 4 | -564/+0 |
|\ \ | |||||
| * | | remove file locking - code will continue to live in it's own app | Thomas Müller | 2014-06-04 | 4 | -564/+0 |
* | | | Merge pull request #8620 from owncloud/design-navigation-two | Thomas Müller | 2014-06-05 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | hide navigation by default, not only on small screens, first step | Jan-Christoph Borchardt | 2014-06-04 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #8878 from owncloud/update-checkmigrationforapps | Vincent Petry | 2014-06-05 | 5 | -37/+119 |
|\ \ \ | |||||
| * | | | Do not load apps when upgrade is needed | Vincent Petry | 2014-06-04 | 1 | -1/+1 |
| * | | | Removed simulate db update flag and split into separate methods | Vincent Petry | 2014-06-04 | 3 | -23/+47 |
| * | | | Simulate apps database schema update on upgrade | Vincent Petry | 2014-06-04 | 4 | -37/+95 |
* | | | | Merge pull request #8852 from owncloud/kill-permissions-master | Thomas Müller | 2014-06-05 | 10 | -346/+15 |
|\ \ \ \ | |||||
| * | | | | - drop permissions table and related code | Thomas Müller | 2014-06-05 | 10 | -346/+15 |
| |/ / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-05 | 3 | -8/+9 |
* | | | | Merge pull request #8724 from owncloud/update-sabre-2.0 | Thomas Müller | 2014-06-04 | 21 | -176/+156 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface | Thomas Müller | 2014-06-04 | 2 | -10/+1 |
| * | | | Upgrade SabreDAV to 1.8.10 | Thomas Müller | 2014-06-04 | 21 | -176/+165 |
| |/ / | |||||
* | | | Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size | Thomas Müller | 2014-06-04 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | let file cache handle the versions size | Bjoern Schiessle | 2014-06-02 | 1 | -1/+1 |
* | | | Merge pull request #8822 from owncloud/cache-change-propagator | Vincent Petry | 2014-06-04 | 3 | -47/+167 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix size calculation during recursive scan | Robin Appelman | 2014-06-03 | 1 | -7/+3 |
| * | | Fix recursive scanning | Robin Appelman | 2014-06-02 | 1 | -3/+5 |
| * | | propagate changes in the scanner | Robin Appelman | 2014-06-02 | 2 | -1/+21 |
| * | | Split of cache writes in the scanner to their own methods | Robin Appelman | 2014-06-02 | 1 | -39/+43 |
| * | | Add a change propagator class to handle propagating etag and mtime changes | Robin Appelman | 2014-06-02 | 1 | -0/+98 |
* | | | Merge pull request #8701 from owncloud/slide-up-toggle | Bernhard Posselt | 2014-06-04 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | rename to apps.js | Bernhard Posselt | 2014-05-26 | 1 | -1/+1 |
| * | | | add a slideup mechanism | Bernhard Posselt | 2014-05-23 | 1 | -0/+1 |
* | | | | Merge pull request #8853 from owncloud/design-typeface | Jan-Christoph Borchardt | 2014-06-04 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | use Open Sans as typeface | Jan-Christoph Borchardt | 2014-06-03 | 1 | -0/+1 |
* | | | | | Merge pull request #8662 from owncloud/f-lock | Thomas Müller | 2014-06-04 | 11 | -14/+675 |
|\ \ \ \ \ | |||||
| * | | | | | Use ->instanceOfStorage() not instanceof for Storage instances. | ringmaster | 2014-06-04 | 1 | -1/+1 |
| * | | | | | only lock if unlink is called for a file | Bjoern Schiessle | 2014-06-04 | 1 | -1/+3 |
| * | | | | | name the storage wrapper to make sure that we don't apply the wrapper multipl... | Bjoern Schiessle | 2014-06-04 | 3 | -6/+6 |
| * | | | | | Normalize lock exception messages. | ringmaster | 2014-06-04 | 2 | -2/+2 |
| * | | | | | Restore the reference to this used exception class. | ringmaster | 2014-06-04 | 1 | -0/+1 |
| * | | | | | Move Lock to private namespace, add interface. Update PHPDoc. | ringmaster | 2014-06-04 | 3 | -255/+316 |
| * | | | | | Don't error out on console. | ringmaster | 2014-06-04 | 1 | -2/+2 |
| * | | | | | Removed unused vars/declarations, update PHPDoc. | ringmaster | 2014-06-04 | 2 | -3/+3 |
| * | | | | | Fix typo | Lukas Reschke | 2014-06-04 | 1 | -1/+1 |
| * | | | | | Fix typo | Lukas Reschke | 2014-06-04 | 1 | -1/+1 |
| * | | | | | Remove unused methods. | ringmaster | 2014-06-04 | 1 | -14/+0 |
| * | | | | | Respect locked files, surface correct exception. | ringmaster | 2014-06-04 | 2 | -6/+43 |
| * | | | | | Simpler log unique id. | ringmaster | 2014-06-04 | 1 | -1/+1 |
| * | | | | | Add actual locking and log changes necessary for debugging. | ringmaster | 2014-06-04 | 3 | -28/+304 |
| * | | | | | Continued flock work. | ringmaster | 2014-06-04 | 3 | -24/+63 |
| * | | | | | flock changes. Work in progress. | ringmaster | 2014-06-04 | 6 | -0/+259 |
* | | | | | | Merge pull request #8468 from owncloud/remove-infieldlabels | Jan-Christoph Borchardt | 2014-06-04 | 1 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | move to updated version of placeholder | Morris Jobke | 2014-06-03 | 1 | -1/+1 |
| * | | | | | | first step of infield label removal, fix login screen | Jan-Christoph Borchardt | 2014-06-03 | 1 | -1/+0 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-04 | 57 | -258/+2 |
| |/ / / / |/| | | | |