Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | 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 | |
| * | | | | | | | | | Merge pull request #1113 from owncloud/fix-issue-1085 | Michael Gapczynski | 2013-01-22 | 3 | -15/+23 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Make database connection error messages less verbose | Michael Gapczynski | 2013-01-21 | 1 | -2/+3 | |
| | * | | | | | | | | | returning http status code 503 in case connecting to the database failed | Thomas Mueller | 2013-01-21 | 1 | -0/+8 | |
| | * | | | | | | | | | Move template parameters around so database error page is properly rendered | Michael Gapczynski | 2013-01-07 | 3 | -15/+14 | |
| | | |_|_|_|/ / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #1259 from TheSFReader/master | Thomas Müller | 2013-01-22 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Add ebook specific mimetypes | TheSFReader | 2013-01-17 | 1 | -1/+0 | |
| | * | | | | | | | | | Add ebook specific mimetypes | TheSFReader | 2013-01-17 | 1 | -0/+3 | |
| * | | | | | | | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-22 | 60 | -935/+984 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-22 | 3 | -103/+508 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Removed unnecessary line | Sam Tuke | 2013-01-10 | 1 | -1/+0 | |
| * | | | | | | | | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-10 | 4 | -175/+110 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-06 | 3 | -48/+56 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-05 | 18 | -593/+833 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-02 | 33 | -960/+1430 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into files_encryption | Sam Tuke | 2012-12-12 | 130 | -1855/+4063 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Reverted temporary changes to core lib files | Sam Tuke | 2012-12-11 | 2 | -5/+5 | |
| * | | | | | | | | | | | | | | | Added library phpseclib | Sam Tuke | 2012-12-11 | 4 | -13/+14 | |
| * | | | | | | | | | | | | | | | all unit files_encryption crypt unit tests now passing after merge | Sam Tuke | 2012-10-17 | 2 | -16/+22 | |
| * | | | | | | | | | | | | | | | Merged branch 'master' | Sam Tuke | 2012-10-16 | 146 | -3636/+8930 | |
| * | | | | | | | | | | | | | | | Development snapshot; encryption stream wrapper now successfully writes files... | Sam Tuke | 2012-10-10 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | urldecode private- and public-key | Bjoern Schiessle | 2012-08-27 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | provide ocs calls and keymanager functions to get/set both keys (private, pub... | Bjoern Schiessle | 2012-08-15 | 1 | -0/+53 | |
| * | | | | | | | | | | | | | | | check if user has write access to a given file before updating the filekey | Bjoern Schiessle | 2012-08-13 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | set default dependencies in keymanager.php | Bjoern Schiessle | 2012-08-08 | 1 | -10/+10 | |
| * | | | | | | | | | | | | | | | OCS api calls cleanup | Bjoern Schiessle | 2012-08-03 | 1 | -102/+70 | |
| * | | | | | | | | | | | | | | | return a list of all public keys for a given file | Bjoern Schiessle | 2012-08-03 | 1 | -21/+16 | |
| * | | | | | | | | | | | | | | | update file encryption key over webdav properties for client side encryption | Bjoern Schiessle | 2012-07-31 | 2 | -4/+30 | |
| * | | | | | | | | | | | | | | | url needs to be case sensitive to be able to have files and paths as part of ... | Bjoern Schiessle | 2012-07-30 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | get/set key files, take shared files into account | Bjoern Schiessle | 2012-07-30 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | ocs call to get file key for client side enncryption | Bjoern Schiessle | 2012-07-30 | 1 | -17/+21 | |
| * | | | | | | | | | | | | | | | write keyfiles to server | Bjoern Schiessle | 2012-07-27 | 2 | -12/+32 | |
| * | | | | | | | | | | | | | | | write private/public key from the client to the server | Bjoern Schiessle | 2012-07-26 | 1 | -21/+37 | |
| * | | | | | | | | | | | | | | | implemented publicKeyGet() and privateKeyGet() calls | Bjoern Schiessle | 2012-07-26 | 1 | -27/+38 | |
| * | | | | | | | | | | | | | | | Wrote new methods for testing if a file is encrypted using AES or Blowfish | Sam Tuke | 2012-07-24 | 1 | -2/+8 | |
| * | | | | | | | | | | | | | | | moved to ocs.php from master and added dummy functions for the keyserver | Bjoern Schiessle | 2012-07-24 | 1 | -26/+115 | |
| * | | | | | | | | | | | | | | | moved to ocs.php from master and added dummy functions for the keyserver | Bjoern Schiessle | 2012-07-24 | 1 | -423/+579 | |
* | | | | | | | | | | | | | | | | Merge branch 'master' into no-inline-js | Lukas Reschke | 2013-01-22 | 6 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-21 | 3 | -0/+3 | |
| * | | | | | | | | | | | | | | | cached queries need to be reset on schema change because they become invalid | Thomas Mueller | 2013-01-20 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-20 | 2 | -1/+3 | |
* | | | | | | | | | | | | | | | | Allow eval() and send headers for legacy browsers | Lukas Reschke | 2013-01-22 | 1 | -2/+6 | |
* | | | | | | | | | | | | | | | | Allow iframes to external domains | Lukas Reschke | 2013-01-22 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | Move to OC_App | Lukas Reschke | 2013-01-21 | 1 | -0/+66 | |
* | | | | | | | | | | | | | | | | Indentation | Lukas Reschke | 2013-01-21 | 1 | -16/+16 |