summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2013-01-284-9/+8
|\
| * Fix phpdocRobin Appelman2013-01-281-2/+2
| * Merge pull request #1313 from owncloud/updater-CSPLukas Reschke2013-01-281-2/+4
| |\
| | * Merge branch 'master' into updater-CSPThomas Mueller2013-01-288-10/+36
| | |\
| | * | Move update inline JSLukas Reschke2013-01-251-0/+1
| | * | Move checkMaintenance and checkUpgradeLukas Reschke2013-01-251-2/+3
| * | | Merge pull request #1318 from j-ed/masterThomas Müller2013-01-281-0/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Update lib/mail.phpj-ed2013-01-261-0/+2
| * | | Merge pull request #1321 from owncloud/csp-fixesThomas Müller2013-01-281-5/+0
| |\ \ \
| | * | | Fix undefined variableLukas Reschke2013-01-261-5/+0
* | | | | add oc:// streamwrapper to provide access to ownCloud's virtual filesystemRobin Appelman2013-01-282-0/+130
* | | | | Move streamwrappers to seperate files and put them in a namespaceRobin Appelman2013-01-286-129/+165
* | | | | Merge branch 'master' into filesystemRobin Appelman2013-01-282-1/+6
|\| | | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-272-1/+6
* | | | | Filesystem: use the updated Mount::findById in getPath to ensure we get the c...Robin Appelman2013-01-281-3/+11
* | | | | Filesystem: return all matching mounts in Mount::findByIdRobin Appelman2013-01-281-3/+4
* | | | | Filesystem: also add getPath to \OC\FilesystemRobin Appelman2013-01-271-0/+12
* | | | | Filesystem: add View->getPath to the cache apiRobin Appelman2013-01-271-0/+15
* | | | | Cache: add function to get storage id and internal path of a file by idRobin Appelman2013-01-271-0/+24
* | | | | Filesystem: add Mount::findByIdRobin Appelman2013-01-271-1/+17
* | | | | Don't check for updates for sub storages, these scans should be done in the b...Michael Gapczynski2013-01-261-3/+0
* | | | | Filesystem: move mount management to it's own classRobin Appelman2013-01-262-79/+191
* | | | | Fix OC_Helper and change deprecated methodsMichael Gapczynski2013-01-261-3/+3
* | | | | merge master into filesystemRobin Appelman2013-01-2618-63/+189
|\| | | |
| * | | | Merge pull request #1320 from owncloud/implements-1316-masterLukas Reschke2013-01-261-1/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | lookup for OCA classes in all apps foldersThomas Mueller2013-01-261-1/+8
| * | | | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-261-0/+19
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-192-0/+2
| | |\ \ \
| | * \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1854-934/+961
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-116-277/+611
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-0616-553/+766
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-067-159/+194
| | |\ \ \ \ \ \ \
| | * | | | | | | | moving storage calculation code to OC_Helper::getStorageInfo()Thomas Mueller2013-01-021-0/+19
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-262-2/+3
| * | | | | | | | | Remove the CSP header for FirefoxLukas Reschke2013-01-251-1/+0
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-255-8/+20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-251-0/+1
| | * | | | | | | | Merge pull request #1286 from owncloud/ocs_apiThomas Müller2013-01-241-0/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Code style updateTom Needham2013-01-231-1/+1
| | | * | | | | | | | Check that api methods return the correct result typeTom Needham2013-01-161-0/+3
| | * | | | | | | | | Merge pull request #1265 from j-ed/masterLukas Reschke2013-01-241-2/+8
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Update lib/mail.phpj-ed2013-01-221-2/+8
| | * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-242-6/+8
| * | | | | | | | | | Initialize router also if ownCloud isn't installedLukas Reschke2013-01-251-16/+18
| * | | | | | | | | | Allow the loading of external imagesLukas Reschke2013-01-251-1/+1
| * | | | | | | | | | Notice about changing the standard policyLukas Reschke2013-01-231-0/+1
| * | | | | | | | | | Allow admins to change the CSP policy in the config fileLukas Reschke2013-01-231-1/+1
| * | | | | | | | | | update to jquery-ui 1.10.0Thomas Mueller2013-01-231-2/+2
| * | | | | | | | | | Merge master...Lukas Reschke2013-01-2311-19/+42
| |\| | | | | | | | |
| | * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-234-0/+4