Commit Graph

9374 Commits (70d937cb29e2b1310e20f6cb8bf8d6fd53acf767)
 

Author SHA1 Message Date
Sam Tuke 70d937cb29 Fixed syntax bug 12 years ago
Sam Tuke d9631aebfc Merge branch 'master' into files_encryption 12 years ago
Sam Tuke a8c0e3612c Removed call to depreciated isUserVerified() 12 years ago
Jan-Christoph Borchardt 09a4424b1f Merge pull request #1497 from owncloud/collapse-usermenu 12 years ago
Jan-Christoph Borchardt 5f84f4b4fd Merge pull request #1496 from owncloud/custom_clients 12 years ago
Sam Tuke a3289d3991 Merge branch 'master' into files_encryption 12 years ago
Sam Tuke 6870add18f Development snapshot 12 years ago
Jan-Christoph Borchardt 8ea6398e48 collapse user menu when inside one of the settings sections 12 years ago
Thomas Müller efdaea4557 Merge pull request #1357 from owncloud/alternative-loging-master 12 years ago
Thomas Müller 58a3a6a573 Merge pull request #1487 from owncloud/fix-1420-master 12 years ago
Sam Tuke 16a5ace434 Fixed bug causing encrypted files to be doubly encrypted at login 12 years ago
Georg Ehrke 0a16d25724 make it possible to modify the links to the clients 12 years ago
Jan-Christoph Borchardt 964ff88f71 move inline style to CSS file, fix details 12 years ago
Björn Schießle 9e08f85c5e port already approved bugfix to master, https://github.com/owncloud/core/pull/1479 12 years ago
Björn Schießle 2fdf8ff3e7 Merge pull request #1490 from schiesbn/user_displayname 12 years ago
Björn Schießle e68d0c7398 make strings translatable 12 years ago
Björn Schießle 9d73e7eb1e let the user change his display name, if supported by the back-end 12 years ago
Bart Visscher 0e548283fc Replace OC_FileCache usage in files_versions 12 years ago
Jenkins for ownCloud 335b6cd060 [tx-robot] updated from transifex 12 years ago
Thomas Müller 74157902d7 Merge pull request #1476 from owncloud/disable-error-handler-while-running-phpunit 12 years ago
Thomas Mueller cbf6b28f45 uncomment failing calls to \OC\Files\Filesystem::file_put_contents 12 years ago
Thomas Mueller c0263173d2 add phpunit configuration for autotest withou the json listener because this pollutes the console 12 years ago
Thomas Mueller 10ea45c916 fix failing test cases due to wrong typing 12 years ago
Arthur Schiwon 5221ee0c5a offer change password only when the action is supported by the user backend 12 years ago
Lukas Reschke e6400b3059 Merge pull request #1474 from samtuke/master 12 years ago
Sam Tuke 20b1d12cbf Fixed comment typo, wrapped return value conditional on var assignment in session{} 12 years ago
Sam Tuke 4ba0ab7f65 Added missing translation wrapping 12 years ago
Sam Tuke b84e83261e Added notice to personal settings indicating what filetypes are not encrypted 12 years ago
Sam Tuke 680c5b3dad Removed debugging output 12 years ago
Sam Tuke 221b69dd0e Fixed bug relating to Filesystem{} that prevented webdav logins with files_encryption 12 years ago
Michael Gapczynski 69fd3f42e5 Merge pull request #1471 from owncloud/temp-storage-call-parent-ctor-master 12 years ago
Sam Tuke a1f200c1e5 Cleaned up path formatting with new method stripUserFilesPath() 12 years ago
Thomas Mueller 77369d8164 disable error handler while running phpunit 12 years ago
Sam Tuke 50faddfa40 Minor improvement to comments 12 years ago
Sam Tuke 53248a9b60 Recryption of legacy encrypted files now working on login 12 years ago
Thomas Mueller 9446017821 spell check 12 years ago
Thomas Mueller 1fd807a7d6 pass the argument to the ctor 12 years ago
Bart Visscher 86f4126d2c Merge pull request #1469 from owncloud/no-setlocale-on-windows 12 years ago
Michael Gapczynski 79e6e579e3 Merge pull request #1452 from owncloud/fix-breadcrumb 12 years ago
Thomas Mueller ac11c842e6 setlocale test is pointless on Windows 12 years ago
Thomas Mueller d8084c132e new function \OC_Util::runningOnWindows() 12 years ago
Jan-Christoph Borchardt 9961235c7b Merge pull request #1429 from owncloud/fix_addNavigation 12 years ago
Jan-Christoph Borchardt e61d21f40d Merge pull request #1460 from owncloud/login-button 12 years ago
Sam Tuke fd90b82acd Merge github.com:owncloud/core 12 years ago
Thomas Müller 59ed0e6318 Merge pull request #1456 from owncloud/gitignore-apps 12 years ago
Thomas Tanghus cda0780d4b Remove superfluous append 12 years ago
Jan-Christoph Borchardt 8ae1205b95 line up 'remember' text with checkbox 12 years ago
Jan-Christoph Borchardt 7eaa2d0de1 form detail on log in button, better shape 12 years ago
Jan-Christoph Borchardt 2ec0c491d4 remove superfluous enabled-app class again 12 years ago
Jan-Christoph Borchardt 4059959c5f Merge branch 'master' into fix_addNavigation 12 years ago