summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | 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
| | * | | | | | | | | | Merge pull request #1113 from owncloud/fix-issue-1085Michael Gapczynski2013-01-223-15/+23
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Make database connection error messages less verboseMichael Gapczynski2013-01-211-2/+3
| | | * | | | | | | | | | returning http status code 503 in case connecting to the database failedThomas Mueller2013-01-211-0/+8
| | | * | | | | | | | | | Move template parameters around so database error page is properly renderedMichael Gapczynski2013-01-073-15/+14
| | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-226-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Allow eval() and send headers for legacy browsersLukas Reschke2013-01-221-2/+6
| * | | | | | | | | | | Allow iframes to external domainsLukas Reschke2013-01-221-2/+2
| * | | | | | | | | | | Move to OC_AppLukas Reschke2013-01-211-0/+66
| * | | | | | | | | | | IndentationLukas Reschke2013-01-211-16/+16
| * | | | | | | | | | | Correct copy paste failLukas Reschke2013-01-211-1/+1
| * | | | | | | | | | | Move requesttoken to oc-requesttoken.jsLukas Reschke2013-01-211-0/+1
| * | | | | | | | | | | Disallow inline JSLukas Reschke2013-01-201-0/+1
| * | | | | | | | | | | Add the default-srcLukas Reschke2013-01-201-2/+2
| * | | | | | | | | | | Add CSP headerLukas Reschke2013-01-201-4/+5
* | | | | | | | | | | | merge master into filesystemRobin Appelman2013-01-222-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1259 from TheSFReader/masterThomas Müller2013-01-221-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Add ebook specific mimetypesTheSFReader2013-01-171-1/+0
| | * | | | | | | | | | Add ebook specific mimetypesTheSFReader2013-01-171-0/+3