Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix mimetype detection, introduce fake etag to identify preview images | Bjoern Schiessle | 2014-03-10 | 1 | -1/+2 |
* | get trash size from file cache | Bjoern Schiessle | 2014-03-10 | 5 | -78/+11 |
* | only enable previews if the encryption is disabled | Bjoern Schiessle | 2014-03-10 | 1 | -1/+5 |
* | if file is not in db, fall back to restore file to the users root | Bjoern Schiessle | 2014-03-10 | 4 | -72/+62 |
* | Merge pull request #7371 from owncloud/core-storagemovedeleteall | Vincent Petry | 2014-02-25 | 2 | -38/+1 |
|\ | |||||
| * | Removed unused deleteAll method on Common storage class | Vincent Petry | 2014-02-24 | 1 | -37/+0 |
| * | Replace deleteAll call with unlink call | Vincent Petry | 2014-02-24 | 1 | -1/+1 |
* | | Merge pull request #6299 from leo-b/ldap_nested_groups | VicDeo | 2014-02-25 | 3 | -10/+72 |
|\ \ | |||||
| * | | replace spaces with tabs | root | 2014-02-21 | 1 | -5/+5 |
| * | | fix coding style to blizzz happy.. ;-) | root | 2014-02-12 | 1 | -8/+10 |
| * | | fix indentation | root | 2013-12-11 | 1 | -42/+42 |
| * | | remove debug output | root | 2013-12-10 | 1 | -3/+0 |
| * | | Merge remote branch 'upstream/master' into ldap_nested_groups | root | 2013-12-10 | 329 | -4807/+8676 |
| |\ \ | |||||
| * | | | move nested group checkbox to directory settings | root | 2013-12-10 | 1 | -1/+1 |
| * | | | combineFilterWithAnd recently moved to Access | root | 2013-12-08 | 1 | -3/+3 |
| * | | | add support for nested groups | root | 2013-12-06 | 3 | -10/+73 |
* | | | | Merge pull request #7374 from owncloud/enc_dont_overwrite_keys | Björn Schießle | 2014-02-25 | 4 | -4/+140 |
|\ \ \ \ | |||||
| * | | | | add test case if a file gets moved out from the shared folder | Bjoern Schiessle | 2014-02-24 | 2 | -0/+125 |
| * | | | | don't overwrite keys if rename was done by a stream copy | Bjoern Schiessle | 2014-02-24 | 2 | -4/+15 |
| | |_|/ | |/| | | |||||
* | | | | Fix case where port is missing | Vincent Petry | 2014-02-25 | 1 | -1/+1 |
* | | | | Merge pull request #7285 from owncloud/mimeicons-svg | Morris Jobke | 2014-02-24 | 6 | -31/+49 |
|\ \ \ \ | |||||
| * | | | | rename url parameter | Robin Appelman | 2014-02-24 | 2 | -2/+2 |
| * | | | | Add url parameter to control whether previews should return 404 when the mime... | Robin Appelman | 2014-02-21 | 2 | -1/+3 |
| * | | | | Merge branch 'master' into mimeicons-svg | Robin Appelman | 2014-02-21 | 20 | -60/+272 |
| |\ \ \ \ | |||||
| * | | | | | Make unit tests expect the svg icons | Robin Appelman | 2014-02-20 | 1 | -2/+6 |
| * | | | | | Merge branch 'master' into mimeicons-svg | Robin Appelman | 2014-02-20 | 231 | -3412/+2134 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix svg icons for public shares and external/shared files | Robin Appelman | 2014-02-19 | 2 | -4/+5 |
| * | | | | | | Show svg mime icons when no preview is available | Robin Appelman | 2014-02-19 | 4 | -26/+37 |
* | | | | | | | Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1 | Morris Jobke | 2014-02-24 | 4 | -3/+79 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Added oc_defaults stub in specHelper.js | Vincent Petry | 2014-02-24 | 1 | -0/+1 |
| * | | | | | | | Merge branch 'master' into GuillaumeAmat-patch-1 | Robin Appelman | 2014-02-21 | 44 | -187/+540 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | code style: else on same line | Jan-Christoph Borchardt | 2014-02-21 | 1 | -2/+1 |
| * | | | | | | | | fix intendation | Morris Jobke | 2014-02-20 | 1 | -3/+3 |
| * | | | | | | | | Fixed trashbin title | Vincent Petry | 2014-02-20 | 2 | -22/+46 |
| * | | | | | | | | Fixed title format | Vincent Petry | 2014-02-20 | 1 | -1/+8 |
| * | | | | | | | | Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-pa... | Vincent Petry | 2014-02-20 | 2 | -3/+48 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Uses OC.basename instead of custom code | Guillaume AMAT | 2014-02-19 | 1 | -2/+2 |
| | * | | | | | | | | Gets the page title from oc_defaults in Files app | Guillaume AMAT | 2014-02-13 | 1 | -1/+1 |
| | * | | | | | | | | Adds OC_Defaults values in javascript config | Guillaume AMAT | 2014-02-13 | 1 | -0/+17 |
| | * | | | | | | | | Update page title when navigating through directories | Guillaume AMAT | 2014-02-12 | 1 | -3/+31 |
* | | | | | | | | | | Merge pull request #7344 from owncloud/add-js-config-vars | icewind1991 | 2014-02-24 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into add-js-config-vars | Robin Appelman | 2014-02-21 | 17 | -41/+282 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Allow apps to add/modify config js output via hook. | ringmaster | 2014-02-20 | 1 | -3/+6 |
* | | | | | | | | | | Merge pull request #7305 from owncloud/extstorage-configclass | Lukas Reschke | 2014-02-22 | 2 | -1/+32 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into extstorage-configclass | Robin Appelman | 2014-02-21 | 236 | -3344/+2173 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Added extra checks for ext storage class | Vincent Petry | 2014-02-20 | 2 | -1/+32 |
* | | | | | | | | | | | Merge pull request #7259 from owncloud/overwritehost-always | Lukas Reschke | 2014-02-22 | 4 | -15/+50 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add overwritehost config on setup and upgrade | Lukas Reschke | 2014-02-21 | 4 | -15/+50 |
* | | | | | | | | | | | | Merge pull request #7310 from owncloud/no-css-js-delivery-via-php | Morris Jobke | 2014-02-21 | 14 | -234/+95 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | update 3rdparty submodule to current master | Morris Jobke | 2014-02-21 | 1 | -0/+0 |