Commit Graph

9412 Commits (223f538bb8666c7943784c12f1213384df1a41c0)
 

Author SHA1 Message Date
Frank Karlitschek 223f538bb8 Merge pull request #1500 from chriskoch/patch-1 12 years ago
Lukas Reschke 2dfe67423d Merge pull request #1509 from owncloud/correct-public-contacts-tests 12 years ago
Lukas Reschke e969a78cf9 Merge pull request #1443 from owncloud/use-module-file-info-master 12 years ago
Lukas Reschke 93b1597395 Merge pull request #1506 from owncloud/files_encryption 12 years ago
Lukas Reschke e522872408 Merge pull request #1498 from schiesbn/delete_trash 12 years ago
Lukas Reschke ad644b4e08 Merge pull request #1363 from owncloud/FixPasswordChange 12 years ago
Sam Tuke 2c22619a18 Reverted fix temporarily; another fix by LukasReschke is awaiting merge 12 years ago
Sam Tuke faf6cb0868 Merge branch 'master' into files_encryption 12 years ago
Sam Tuke 954a627483 Added comment 12 years ago
Thomas Müller a26f17c130 Merge pull request #1502 from owncloud/gitignore-cloud9 12 years ago
Jan-Christoph Borchardt 8e006118fb Merge pull request #1501 from owncloud/fix-shorttag 12 years ago
Sam Tuke 2b07afc8ab Removed debugging code 12 years ago
Sam Tuke ae8cfe6569 Added comments 12 years ago
Sam Tuke 81de09711b Fixed bug causing password change related hooks to not be called due to ajax 12 years ago
Sam Tuke 70d937cb29 Fixed syntax bug 12 years ago
Jan-Christoph Borchardt abb3635bd8 gitignore Cloud9IDE system folder 12 years ago
Jan-Christoph Borchardt 4c406c9ab1 fix shorttag issue mentioned in #1357 12 years ago
Thomas Müller 81792448ae Merge pull request #1472 from owncloud/files_versions-cleanup 12 years ago
Frank Karlitschek 7d0b4c2581 Merge pull request #1438 from owncloud/phpunit-tests-win32-master 12 years ago
Bart Visscher a4d3cc798f Correct lib/public/contacts.php tests 12 years ago
Jan-Christoph Borchardt 2130262515 Merge pull request #1459 from owncloud/infield-detail 12 years ago
Christian Koch a4f909cefd Update lib/public/util.php 12 years ago
Thomas Tanghus 3879e5d9c5 Merge pull request #1428 from owncloud/content_positioning 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
Thomas Tanghus 2d77c7c0fd Reduce top position for content below controls. 12 years ago
Björn Schießle fd171a4f34 copy&paste bug, no fetchAll() needed here 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
Björn Schießle 8cc7bab0e5 delete debug code 12 years ago
Björn Schießle e2516a2b65 allow to delete single files from the trash bin permanently 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