summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge master...Lukas Reschke2013-01-2394-888/+4201
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-2364-110/+107
| * Merge branch 'master' into files_encryptionSam Tuke2013-01-22195-570/+633
| |\
| * | Added localisation for encryption settingsSam Tuke2013-01-222-27/+114
| * | Merge branch 'master' into files_encryptionSam Tuke2013-01-2235-319/+547
| |\ \
| * | | Removed debugging commentsSam Tuke2013-01-141-49/+0
| * | | Removed old and unnecessary commentsSam Tuke2013-01-101-7/+0
| * | | Removed misleading crypto gen commentSam Tuke2013-01-101-2/+0
| * | | Merge branch 'master' into files_encryptionSam Tuke2013-01-1064-120/+255
| |\ \ \
| * | | | Re-added 'checkAdminUser'Sam Tuke2013-01-101-6/+10
| * | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-063-6/+18
| |\ \ \ \
| * | | | | All in-use unit tests now passing after mergeSam Tuke2013-01-0615-540/+513
| * | | | | Removed debugging lineSam Tuke2013-01-061-1/+1
| * | | | | Made Keymanager::getFileKey() dependencies explicit, fixed client code and te...Sam Tuke2013-01-064-7/+11
| * | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-0552-12/+140
| |\ \ \ \ \
| * | | | | | Development snapshotSam Tuke2013-01-057-77/+95
| * | | | | | Development snapshot, mocking out Session{} for crypt unit testsSam Tuke2013-01-025-20/+35
| * | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-02155-240/+905
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into files_encryptionSam Tuke2012-12-12251-2171/+4062
| |\ \ \ \ \ \ \
| * | | | | | | | Improved formatting of getPublicKeys()Sam Tuke2012-12-111-7/+36
| * | | | | | | | Changing user login pwd now correctly changes encryption key passphraseSam Tuke2012-12-115-111/+128
| * | | | | | | | Replaced phpseclib calls with symmetric re-encryption of user private keySam Tuke2012-12-113-23/+15
| * | | | | | | | Revert "Revert "Development snapshot""Sam Tuke2012-12-1110-74/+227
| * | | | | | | | Revert "Development snapshot"Sam Tuke2012-12-1110-227/+74
| * | | | | | | | Added library phpseclibSam Tuke2012-12-113-15/+88
| * | | | | | | | Development snapshotSam Tuke2012-12-0510-74/+227
| * | | | | | | | Development SnapshotSam Tuke2012-12-045-45/+176
| * | | | | | | | Development snapshotSam Tuke2012-11-287-268/+316
| * | | | | | | | Development snapshotSam Tuke2012-11-221-18/+29
| * | | | | | | | Development snapshotSam Tuke2012-11-222-42/+30
| * | | | | | | | Development snapshotSam Tuke2012-11-223-34/+33
| * | | | | | | | Added unit tests for legacy encryption methodsSam Tuke2012-11-203-7/+117
| * | | | | | | | Development snapshot, lots of fixesSam Tuke2012-11-168-76/+176
| * | | | | | | | Added unit tests for setupServerSide(), key paths, and ready()Sam Tuke2012-11-161-3/+114
| * | | | | | | | Fixing use of splitIvSam Tuke2012-11-152-28/+21
| * | | | | | | | Switched require() for require_once()Sam Tuke2012-11-151-0/+0
| * | | | | | | | Fixed IV generation testSam Tuke2012-11-151-51/+114
| * | | | | | | | Improved documentationSam Tuke2012-11-151-7/+42
| * | | | | | | | Added check if sharing app is enabled, commented out sharing code due to issueSam Tuke2012-11-151-58/+61
| * | | | | | | | Added namespaceSam Tuke2012-11-141-3/+5
| * | | | | | | | Added minor documentationSam Tuke2012-11-143-23/+15
| * | | | | | | | all unit files_encryption crypt unit tests now passing after mergeSam Tuke2012-10-1714-202/+226
| * | | | | | | | Merged branch 'master'Sam Tuke2012-10-161073-178295/+8782
| * | | | | | | | Development snapshotSam Tuke2012-10-162-99/+130
| * | | | | | | | Development snapshot; encryption stream wrapper now successfully writes files...Sam Tuke2012-10-104-50/+225
| * | | | | | | | Development snapshotSam Tuke2012-09-115-83/+301
| * | | | | | | | development snapshotSam Tuke2012-08-233-84/+121
| * | | | | | | | Extensive work on crypto stream wrapper implementationSam Tuke2012-08-235-98/+259
| * | | | | | | | Started rewrite of cryptstream class (renamed to stream)Sam Tuke2012-08-167-217/+361
| * | | | | | | | working on streaming decrypted contentSam Tuke2012-08-155-12/+25
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-27 08:58:19 +0000