Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | let the user change his display name, if supported by the back-end | Björn Schießle | 2013-02-06 | 6 | -3/+70 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-06 | 147 | -2668/+1208 |
| | |||||
* | Merge pull request #1476 from ↵ | Thomas Müller | 2013-02-05 | 6 | -9/+28 |
|\ | | | | | | | | | owncloud/disable-error-handler-while-running-phpunit disable error handler while running phpunit | ||||
| * | uncomment failing calls to \OC\Files\Filesystem::file_put_contents | Thomas Mueller | 2013-02-05 | 1 | -3/+3 |
| | | |||||
| * | add phpunit configuration for autotest withou the json listener because this ↵ | Thomas Mueller | 2013-02-05 | 2 | -1/+15 |
| | | | | | | | | pollutes the console | ||||
| * | fix failing test cases due to wrong typing | Thomas Mueller | 2013-02-05 | 1 | -2/+2 |
| | | |||||
| * | disable error handler while running phpunit | Thomas Mueller | 2013-02-05 | 2 | -3/+8 |
| | | |||||
* | | offer change password only when the action is supported by the user backend | Arthur Schiwon | 2013-02-05 | 3 | -1/+25 |
| | | |||||
* | | Merge pull request #1474 from samtuke/master | Lukas Reschke | 2013-02-05 | 18 | -498/+804 |
|\ \ | | | | | | | Improvements to files_encryption | ||||
| * | | Fixed comment typo, wrapped return value conditional on var assignment in ↵ | Sam Tuke | 2013-02-05 | 2 | -3/+5 |
| | | | | | | | | | | | | session{} | ||||
| * | | Added missing translation wrapping | Sam Tuke | 2013-02-05 | 1 | -1/+3 |
| | | | |||||
| * | | Added notice to personal settings indicating what filetypes are not encrypted | Sam Tuke | 2013-02-05 | 3 | -48/+23 |
| | | | |||||
| * | | Removed debugging output | Sam Tuke | 2013-02-05 | 2 | -12/+0 |
| | | | |||||
| * | | Fixed bug relating to Filesystem{} that prevented webdav logins with ↵ | Sam Tuke | 2013-02-05 | 1 | -50/+52 |
| | | | | | | | | | | | | files_encryption | ||||
| * | | Cleaned up path formatting with new method stripUserFilesPath() | Sam Tuke | 2013-02-05 | 2 | -20/+22 |
| | | | |||||
| * | | Minor improvement to comments | Sam Tuke | 2013-02-05 | 1 | -7/+6 |
| | | | |||||
| * | | Recryption of legacy encrypted files now working on login | Sam Tuke | 2013-02-05 | 2 | -7/+20 |
| | | | |||||
| * | | Merge github.com:owncloud/core | Sam Tuke | 2013-02-05 | 651 | -10166/+20996 |
| |\ \ | |||||
| * | | | Added debugging output relating to recrypting legacy files | Sam Tuke | 2013-02-01 | 2 | -3/+16 |
| | | | | |||||
| * | | | Improved support for detecting and recrypting legacy files. Bugs remain. | Sam Tuke | 2013-01-31 | 4 | -17/+37 |
| | | | | |||||
| * | | | Fixed compatibility with filecache rewrite merge | Sam Tuke | 2013-01-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed incompatibilities with filecache rewrite merge | Sam Tuke | 2013-01-31 | 2 | -7/+7 |
| | | | | |||||
| * | | | Merge github.com:owncloud/core | Sam Tuke | 2013-01-31 | 777 | -22798/+47150 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/public/share.php | ||||
| * | | | | Fixed handling of keyfile subdir creation | Sam Tuke | 2013-01-30 | 2 | -84/+24 |
| | | | | | | | | | | | | | | | | | | | | Improved keyfile subdir deletion (1 bug remains here) | ||||
| * | | | | Working on support for deleting directories (removing all keyfiles) | Sam Tuke | 2013-01-30 | 1 | -13/+19 |
| | | | | | |||||
| * | | | | Made encyrption keyfiles be deleted when their parents are | Sam Tuke | 2013-01-29 | 5 | -34/+142 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Made encryption keyfiles be renamed when their parents are Fixed bugs with encryptAll() execution on login | ||||
| * | | | | Fixed many coding guidelines issues | Sam Tuke | 2013-01-24 | 12 | -177/+282 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Continued work on upgrade path via login hook listener New spec file with notes | ||||
| * | | | | Work on util: findFiles() and encryptAll(); both close to working | Sam Tuke | 2013-01-23 | 9 | -181/+213 |
| | | | | | | | | | | | | | | | | | | | | Ecnryption unit tests are failing, recursion in filecache{} | ||||
| * | | | | Merge branch 'files_encryption' | Sam Tuke | 2013-01-23 | 8 | -53/+139 |
| |\ \ \ \ | |||||
| | * | | | | Adding sharing support: added new method in Keymanager setShareKey() | Sam Tuke | 2013-01-14 | 6 | -50/+125 |
| | | | | | | | | | | | | | | | | | | | | | | | | Added notes in proxy{} and stream{} pointing to share support | ||||
| | * | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-14 | 1 | -0/+13 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-14 | 331 | -3181/+3552 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Added creation of dir for shared file env encryption keys | Sam Tuke | 2013-01-14 | 2 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added comment to use multiKeyEncrypt | ||||
| * | | | | | | | Merge branch 'master' of github.com:owncloud/core | Sam Tuke | 2013-01-23 | 898 | -11054/+17202 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryption | Sam Tuke | 2013-01-14 | 1 | -0/+13 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #1471 from owncloud/temp-storage-call-parent-ctor-master | Michael Gapczynski | 2013-02-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Temp storage call parent ctor master | ||||
| * | | | | | | spell check | Thomas Mueller | 2013-02-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | pass the argument to the ctor | Thomas Mueller | 2013-02-05 | 1 | -1/+1 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/files/storage/temporary.php | ||||
* | | | | | | Merge pull request #1469 from owncloud/no-setlocale-on-windows | Bart Visscher | 2013-02-05 | 1 | -0/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | No setlocale on windows | ||||
| * | | | | | | setlocale test is pointless on Windows | Thomas Mueller | 2013-02-05 | 1 | -0/+5 |
| | | | | | | | |||||
| * | | | | | | new function \OC_Util::runningOnWindows() | Thomas Mueller | 2013-02-05 | 1 | -0/+7 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1452 from owncloud/fix-breadcrumb | Michael Gapczynski | 2013-02-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Remove undefined crumb variable from home breadcrumb | ||||
| * | | | | | | Remove undefined crumb variable from home breadcrumb | Michael Gapczynski | 2013-02-04 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1429 from owncloud/fix_addNavigation | Jan-Christoph Borchardt | 2013-02-05 | 2 | -7/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make app icon linkable when enabling app. | ||||
| * | | | | | | | Remove superfluous append | Thomas Tanghus | 2013-02-05 | 1 | -1/+0 |
| | | | | | | | | |||||
| * | | | | | | | remove superfluous enabled-app class again | Jan-Christoph Borchardt | 2013-02-05 | 2 | -6/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into fix_addNavigation | Jan-Christoph Borchardt | 2013-02-05 | 112 | -937/+1494 |
| |\| | | | | | | |||||
| * | | | | | | | Make app icon linkable when enabling app. | Thomas Tanghus | 2013-02-03 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1460 from owncloud/login-button | Jan-Christoph Borchardt | 2013-02-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Login screen details | ||||
| * | | | | | | | line up 'remember' text with checkbox | Jan-Christoph Borchardt | 2013-02-05 | 1 | -1/+1 |
| | | | | | | | |