summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-06147-2668/+1208
* Merge pull request #1476 from owncloud/disable-error-handler-while-running-ph...Thomas Müller2013-02-056-9/+28
|\
| * uncomment failing calls to \OC\Files\Filesystem::file_put_contentsThomas Mueller2013-02-051-3/+3
| * add phpunit configuration for autotest withou the json listener because this ...Thomas Mueller2013-02-052-1/+15
| * fix failing test cases due to wrong typingThomas Mueller2013-02-051-2/+2
| * disable error handler while running phpunitThomas Mueller2013-02-052-3/+8
* | offer change password only when the action is supported by the user backendArthur Schiwon2013-02-053-1/+25
* | Merge pull request #1474 from samtuke/masterLukas Reschke2013-02-0518-498/+804
|\ \
| * | 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
| * | Minor improvement to commentsSam Tuke2013-02-051-7/+6
| * | Recryption of legacy encrypted files now working on loginSam Tuke2013-02-052-7/+20
| * | Merge github.com:owncloud/coreSam Tuke2013-02-05651-10166/+20996
| |\ \
| * | | 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-31777-22798/+47150
| |\ \ \
| * | | | 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-141-0/+13
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into files_encryptionSam Tuke2013-01-14331-3181/+3552
| | |\ \ \ \ \
| | * | | | | | Added creation of dir for shared file env encryption keysSam Tuke2013-01-142-3/+14
| * | | | | | | Merge branch 'master' of github.com:owncloud/coreSam Tuke2013-01-23898-11054/+17202
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryptionSam Tuke2013-01-141-0/+13
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #1471 from owncloud/temp-storage-call-parent-ctor-masterMichael Gapczynski2013-02-051-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | spell checkThomas Mueller2013-02-051-1/+1
| * | | | | | pass the argument to the ctorThomas Mueller2013-02-051-1/+1
|/ / / / / /
* | | | | | Merge pull request #1469 from owncloud/no-setlocale-on-windowsBart Visscher2013-02-051-0/+12
|\ \ \ \ \ \
| * | | | | | setlocale test is pointless on WindowsThomas Mueller2013-02-051-0/+5
| * | | | | | new function \OC_Util::runningOnWindows()Thomas Mueller2013-02-051-0/+7
* | | | | | | Merge pull request #1452 from owncloud/fix-breadcrumbMichael Gapczynski2013-02-051-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove undefined crumb variable from home breadcrumbMichael Gapczynski2013-02-041-1/+1
* | | | | | | Merge pull request #1429 from owncloud/fix_addNavigationJan-Christoph Borchardt2013-02-052-7/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove superfluous appendThomas Tanghus2013-02-051-1/+0
| * | | | | | | remove superfluous enabled-app class againJan-Christoph Borchardt2013-02-052-6/+1
| * | | | | | | Merge branch 'master' into fix_addNavigationJan-Christoph Borchardt2013-02-05112-937/+1494
| |\| | | | | |
| * | | | | | | Make app icon linkable when enabling app.Thomas Tanghus2013-02-031-0/+1
* | | | | | | | Merge pull request #1460 from owncloud/login-buttonJan-Christoph Borchardt2013-02-051-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | line up 'remember' text with checkboxJan-Christoph Borchardt2013-02-051-1/+1
| * | | | | | | form detail on log in button, better shapeJan-Christoph Borchardt2013-02-051-1/+1
| | |/ / / / / | |/| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 03:36:00 +0000