Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge master into filesystem | Robin Appelman | 2013-01-28 | 4 | -9/+8 |
|\ | |||||
| * | Fix phpdoc | Robin Appelman | 2013-01-28 | 1 | -2/+2 |
| * | Merge pull request #1313 from owncloud/updater-CSP | Lukas Reschke | 2013-01-28 | 1 | -2/+4 |
| |\ | |||||
| | * | Merge branch 'master' into updater-CSP | Thomas Mueller | 2013-01-28 | 8 | -10/+36 |
| | |\ | |||||
| | * | | Move update inline JS | Lukas Reschke | 2013-01-25 | 1 | -0/+1 |
| | * | | Move checkMaintenance and checkUpgrade | Lukas Reschke | 2013-01-25 | 1 | -2/+3 |
| * | | | Merge pull request #1318 from j-ed/master | Thomas Müller | 2013-01-28 | 1 | -0/+2 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Update lib/mail.php | j-ed | 2013-01-26 | 1 | -0/+2 |
| * | | | Merge pull request #1321 from owncloud/csp-fixes | Thomas Müller | 2013-01-28 | 1 | -5/+0 |
| |\ \ \ | |||||
| | * | | | Fix undefined variable | Lukas Reschke | 2013-01-26 | 1 | -5/+0 |
* | | | | | add oc:// streamwrapper to provide access to ownCloud's virtual filesystem | Robin Appelman | 2013-01-28 | 2 | -0/+130 |
* | | | | | Move streamwrappers to seperate files and put them in a namespace | Robin Appelman | 2013-01-28 | 6 | -129/+165 |
* | | | | | Merge branch 'master' into filesystem | Robin Appelman | 2013-01-28 | 2 | -1/+6 |
|\| | | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-27 | 2 | -1/+6 |
* | | | | | Filesystem: use the updated Mount::findById in getPath to ensure we get the c... | Robin Appelman | 2013-01-28 | 1 | -3/+11 |
* | | | | | Filesystem: return all matching mounts in Mount::findById | Robin Appelman | 2013-01-28 | 1 | -3/+4 |
* | | | | | Filesystem: also add getPath to \OC\Filesystem | Robin Appelman | 2013-01-27 | 1 | -0/+12 |
* | | | | | Filesystem: add View->getPath to the cache api | Robin Appelman | 2013-01-27 | 1 | -0/+15 |
* | | | | | Cache: add function to get storage id and internal path of a file by id | Robin Appelman | 2013-01-27 | 1 | -0/+24 |
* | | | | | Filesystem: add Mount::findById | Robin Appelman | 2013-01-27 | 1 | -1/+17 |
* | | | | | Don't check for updates for sub storages, these scans should be done in the b... | Michael Gapczynski | 2013-01-26 | 1 | -3/+0 |
* | | | | | Filesystem: move mount management to it's own class | Robin Appelman | 2013-01-26 | 2 | -79/+191 |
* | | | | | Fix OC_Helper and change deprecated methods | Michael Gapczynski | 2013-01-26 | 1 | -3/+3 |
* | | | | | merge master into filesystem | Robin Appelman | 2013-01-26 | 18 | -63/+189 |
|\| | | | | |||||
| * | | | | Merge pull request #1320 from owncloud/implements-1316-master | Lukas Reschke | 2013-01-26 | 1 | -1/+8 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | lookup for OCA classes in all apps folders | Thomas Mueller | 2013-01-26 | 1 | -1/+8 |
| * | | | | Merge pull request #1059 from owncloud/fixing-998-master | Thomas Müller | 2013-01-26 | 1 | -0/+19 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-19 | 2 | -0/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 54 | -934/+961 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-11 | 6 | -277/+611 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 16 | -553/+766 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 7 | -159/+194 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | moving storage calculation code to OC_Helper::getStorageInfo() | Thomas Mueller | 2013-01-02 | 1 | -0/+19 |
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-26 | 2 | -2/+3 |
| * | | | | | | | | | Remove the CSP header for Firefox | Lukas Reschke | 2013-01-25 | 1 | -1/+0 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into no-inline-js | Lukas Reschke | 2013-01-25 | 5 | -8/+20 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-25 | 1 | -0/+1 |
| | * | | | | | | | | Merge pull request #1286 from owncloud/ocs_api | Thomas Müller | 2013-01-24 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Code style update | Tom Needham | 2013-01-23 | 1 | -1/+1 |
| | | * | | | | | | | | Check that api methods return the correct result type | Tom Needham | 2013-01-16 | 1 | -0/+3 |
| | * | | | | | | | | | Merge pull request #1265 from j-ed/master | Lukas Reschke | 2013-01-24 | 1 | -2/+8 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Update lib/mail.php | j-ed | 2013-01-22 | 1 | -2/+8 |
| | * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-24 | 2 | -6/+8 |
| * | | | | | | | | | | Initialize router also if ownCloud isn't installed | Lukas Reschke | 2013-01-25 | 1 | -16/+18 |
| * | | | | | | | | | | Allow the loading of external images | Lukas Reschke | 2013-01-25 | 1 | -1/+1 |
| * | | | | | | | | | | Notice about changing the standard policy | Lukas Reschke | 2013-01-23 | 1 | -0/+1 |
| * | | | | | | | | | | Allow admins to change the CSP policy in the config file | Lukas Reschke | 2013-01-23 | 1 | -1/+1 |
| * | | | | | | | | | | update to jquery-ui 1.10.0 | Thomas Mueller | 2013-01-23 | 1 | -2/+2 |
| * | | | | | | | | | | Merge master... | Lukas Reschke | 2013-01-23 | 11 | -19/+42 |
| |\| | | | | | | | | | |||||
| | * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-23 | 4 | -0/+4 |