summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1506 from owncloud/files_encryptionLukas Reschke2013-02-064-35/+14
|\
| * Merge branch 'master' into files_encryptionSam Tuke2013-02-068-17/+18
| |\
| * | Added commentSam Tuke2013-02-061-1/+1
| * | Removed debugging codeSam Tuke2013-02-062-2/+2
| * | Merge branch 'master' into files_encryptionSam Tuke2013-02-0660-189/+79
| |\ \
| * | | Development snapshotSam Tuke2013-02-063-21/+5
| * | | Fixed bug causing encrypted files to be doubly encrypted at loginSam Tuke2013-02-063-14/+9
* | | | Merge pull request #1498 from schiesbn/delete_trashLukas Reschke2013-02-065-0/+91
|\ \ \ \ | |_|_|/ |/| | |
| * | | copy&paste bug, no fetchAll() needed hereBjörn Schießle2013-02-061-1/+1
| * | | delete debug codeBjörn Schießle2013-02-061-1/+1
| * | | allow to delete single files from the trash bin permanentlyBjörn Schießle2013-02-065-0/+91
* | | | Merge pull request #1472 from owncloud/files_versions-cleanupThomas Müller2013-02-066-12/+13
|\ \ \ \
| * | | | Only calculate md5 of local file onceBart Visscher2013-02-051-1/+2
| * | | | Change files_versions namespace to OCA\Files_VersionsBart Visscher2013-02-056-11/+11
* | | | | Merge pull request #1428 from owncloud/content_positioningThomas Tanghus2013-02-062-5/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add 'hascontrols' class for content with fixed topbar.Thomas Tanghus2013-02-042-11/+11
| * | | | Files: fix positioning of Trash button and upload progress barRobin Appelman2013-02-042-10/+10
| * | | | Fix leftcontent positioning. Ref #1255Thomas Tanghus2013-02-031-1/+1
* | | | | Merge pull request #1487 from owncloud/fix-1420-masterThomas Müller2013-02-061-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Replace OC_FileCache usage in files_versionsBart Visscher2013-02-061-1/+2
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0658-187/+76
* | | | Merge pull request #1474 from samtuke/masterLukas Reschke2013-02-0516-489/+783
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fixed comment typo, wrapped return value conditional on var assignment in ses...Sam Tuke2013-02-052-3/+5
| * | Added missing translation wrappingSam Tuke2013-02-051-1/+3
| * | Added notice to personal settings indicating what filetypes are not encryptedSam Tuke2013-02-053-48/+23
| * | Removed debugging outputSam Tuke2013-02-052-12/+0
| * | Fixed bug relating to Filesystem{} that prevented webdav logins with files_en...Sam Tuke2013-02-051-50/+52
| * | Cleaned up path formatting with new method stripUserFilesPath()Sam Tuke2013-02-052-20/+22
| * | Recryption of legacy encrypted files now working on loginSam Tuke2013-02-052-7/+20
| * | Merge github.com:owncloud/coreSam Tuke2013-02-05179-405/+2556
| |\ \
| * | | Added debugging output relating to recrypting legacy filesSam Tuke2013-02-012-3/+16
| * | | Improved support for detecting and recrypting legacy files. Bugs remain.Sam Tuke2013-01-314-17/+37
| * | | Fixed compatibility with filecache rewrite mergeSam Tuke2013-01-311-1/+1
| * | | Fixed incompatibilities with filecache rewrite mergeSam Tuke2013-01-312-7/+7
| * | | Merge github.com:owncloud/coreSam Tuke2013-01-31196-1383/+3259
| |\ \ \
| * | | | Fixed handling of keyfile subdir creationSam Tuke2013-01-302-84/+24
| * | | | Working on support for deleting directories (removing all keyfiles)Sam Tuke2013-01-301-13/+19
| * | | | Made encyrption keyfiles be deleted when their parents areSam Tuke2013-01-295-34/+142
| * | | | Fixed many coding guidelines issuesSam Tuke2013-01-2412-177/+282
| * | | | Work on util: findFiles() and encryptAll(); both close to workingSam Tuke2013-01-239-181/+213
| * | | | Merge branch 'files_encryption'Sam Tuke2013-01-238-53/+139
| |\ \ \ \
| | * | | | Adding sharing support: added new method in Keymanager setShareKey()Sam Tuke2013-01-146-50/+125
| | * | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-1435-319/+547
| | |\ \ \ \
| | * | | | | Added creation of dir for shared file env encryption keysSam Tuke2013-01-142-3/+14
* | | | | | | Remove undefined crumb variable from home breadcrumbMichael Gapczynski2013-02-041-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0515-3/+179
* | | | | | Merge pull request #1432 from owncloud/add_requesttokenThomas Tanghus2013-02-042-1/+4
|\ \ \ \ \ \
| * | | | | | [user_webdavauth] add requesttokenLukas Reschke2013-02-032-1/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1434 from owncloud/trashbin_CSRFBjörn Schießle2013-02-041-3/+2
|\ \ \ \ \ \
| * | | | | | OCP\JSON instead of OCP\UserLukas Reschke2013-02-041-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 02:10:45 +0000