summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix undefined variableLukas Reschke2013-01-261-5/+0
* 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 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
| * | | | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-2260-935/+984
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-223-103/+508
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removed unnecessary lineSam Tuke2013-01-101-1/+0
| * | | | | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-104-175/+110
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into files_encryptionSam Tuke2013-01-063-48/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-0518-593/+833
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into files_encryptionSam Tuke2013-01-0233-960/+1430
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into files_encryptionSam Tuke2012-12-12130-1855/+4063
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Reverted temporary changes to core lib filesSam Tuke2012-12-112-5/+5
| * | | | | | | | | | | | | | | Added library phpseclibSam Tuke2012-12-114-13/+14
| * | | | | | | | | | | | | | | all unit files_encryption crypt unit tests now passing after mergeSam Tuke2012-10-172-16/+22
| * | | | | | | | | | | | | | | Merged branch 'master'Sam Tuke2012-10-16146-3636/+8930
| * | | | | | | | | | | | | | | Development snapshot; encryption stream wrapper now successfully writes files...Sam Tuke2012-10-101-0/+3
| * | | | | | | | | | | | | | | urldecode private- and public-keyBjoern Schiessle2012-08-271-2/+2
| * | | | | | | | | | | | | | | provide ocs calls and keymanager functions to get/set both keys (private, pub...Bjoern Schiessle2012-08-151-0/+53
| * | | | | | | | | | | | | | | check if user has write access to a given file before updating the filekeyBjoern Schiessle2012-08-131-1/+1
| * | | | | | | | | | | | | | | set default dependencies in keymanager.phpBjoern Schiessle2012-08-081-10/+10
| * | | | | | | | | | | | | | | OCS api calls cleanupBjoern Schiessle2012-08-031-102/+70
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 07:43:02 +0000