summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into files_encryption-style-fixesSam Tuke2013-02-0517-1410/+1716
|\
| * 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
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' into files_encryption-style-fixesSam Tuke2013-02-05291-1535/+5149
|\| | | | |
| * | | | | [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
| | * | | | | | [files_trashbin] Add CSRF tokenLukas Reschke2013-02-031-3/+2
| | |/ / / / /
| * | | | | | Merge pull request #1229 from owncloud/from_live_to_onThomas Müller2013-02-035-16/+15
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into from_live_to_onThomas Mueller2013-01-31164-1310/+4003
| | |\ \ \ \ \ \
| | * | | | | | | attach on to filelist instead of individual td elements for file link behaviourJörn Friedrich Dreyer2013-01-301-1/+1
| | * | | | | | | replace live() with on() in core jsJörn Friedrich Dreyer2013-01-305-15/+15
| * | | | | | | | Merge pull request #1340 from owncloud/fixing-js-errors-public-link-masterThomas Müller2013-02-033-1/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | call ajax scan only if a user is logged in - otherwise we'll get a 500Thomas Mueller2013-01-311-0/+4
| | * | | | | | | | Merge branch 'master' into fixing-js-errors-public-link-masterThomas Mueller2013-01-31176-1305/+4159
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | call ajax scan only if a user is logged in - otherwise we'll get a 500Thomas Mueller2013-01-281-5/+7
| | * | | | | | | | include keyboardshortcuts.jsThomas Mueller2013-01-281-0/+1
| | * | | | | | | | fixing href for foldersThomas Mueller2013-01-281-1/+1
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0415-35/+135
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #1422 from TheSFReader/masterThomas Müller2013-02-031-1/+2
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-02-0271-37/+299
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-02-0169-11/+452
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Correct itTheSFReader2013-02-011-1/+2
| * | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0346-204/+260
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #1415 from owncloud/ldap_fix_settingsLukas Reschke2013-02-012-20/+32
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | remove ugly whitespaceArthur Schiwon2013-02-011-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-19 18:53:03 +0000