summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | | return a list of all public keys for a given fileBjoern Schiessle2012-08-031-21/+16
| * | | | | | | | | update file encryption key over webdav properties for client side encryptionBjoern Schiessle2012-07-312-4/+30
| * | | | | | | | | url needs to be case sensitive to be able to have files and paths as part of ...Bjoern Schiessle2012-07-301-1/+1
| * | | | | | | | | get/set key files, take shared files into accountBjoern Schiessle2012-07-301-2/+2
| * | | | | | | | | ocs call to get file key for client side enncryptionBjoern Schiessle2012-07-301-17/+21
| * | | | | | | | | write keyfiles to serverBjoern Schiessle2012-07-272-12/+32
| * | | | | | | | | write private/public key from the client to the serverBjoern Schiessle2012-07-261-21/+37
| * | | | | | | | | implemented publicKeyGet() and privateKeyGet() callsBjoern Schiessle2012-07-261-27/+38
| * | | | | | | | | Wrote new methods for testing if a file is encrypted using AES or BlowfishSam Tuke2012-07-241-2/+8
| * | | | | | | | | moved to ocs.php from master and added dummy functions for the keyserverBjoern Schiessle2012-07-241-26/+115
| * | | | | | | | | moved to ocs.php from master and added dummy functions for the keyserverBjoern Schiessle2012-07-241-423/+579
* | | | | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-226-1/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-213-0/+3
| * | | | | | | | | cached queries need to be reset on schema change because they become invalidThomas Mueller2013-01-201-0/+3
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-202-1/+3
* | | | | | | | | | 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