Commit Graph

21361 Commits

Author SHA1 Message Date
Lukas Reschke e345697cab Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing
Enc stop uploading if private key is missing
2014-11-07 11:19:04 +01:00
Thomas Müller 88c329b394 Merge pull request #12019 from owncloud/fix-template-shortcuts
second parameter in template shortcuts script() and style() is optional
2014-11-07 11:01:10 +01:00
Jenkins for ownCloud 7d47d50724 [tx-robot] updated from transifex 2014-11-07 01:55:10 -05:00
Lukas Reschke d383c45c13 Merge pull request #12003 from owncloud/password-migration
Use new hashing API for OC_User_Database
2014-11-06 22:43:57 +01:00
Morris Jobke 81e6329c04 second parameter in template shortcuts script() and style() is optional 2014-11-06 21:26:50 +01:00
Morris Jobke e53354bfd7 Merge pull request #12009 from owncloud/make-optional
Make second argument optional
2014-11-06 19:43:11 +01:00
Robin Appelman 0c230fb57e Merge pull request #11945 from owncloud/share-setup-other-user
Setup shared mounts for the correct user when setting up the filesystem
2014-11-06 19:24:24 +01:00
Robin Appelman 0f3fd89f7d Fix sharing tests 2014-11-06 18:31:41 +01:00
Robin Appelman c21d1da01a Support displaynames for dummy user backend 2014-11-06 18:31:40 +01:00
Robin Appelman 7ecd220715 Setup shared mounts for the correct user when setting up the filesystem for the non-logged in user 2014-11-06 18:31:40 +01:00
Robin Appelman 9c79c2fa17 Dont make real users in tests 2014-11-06 18:31:40 +01:00
Lukas Reschke 20cd9a134f Make second argument optional
Equivalent to addVendorScript und addScript from OC_Util
2014-11-06 18:17:21 +01:00
Joas Schilling f2282e4251 Test LargeFileHelperGetFileSize also with ascii only characters
And skip the UTF8 names on Windows as they are not supported
2014-11-06 17:36:36 +01:00
Joas Schilling 216ef617db Do not use uniqid in Group and User tests as it is not unique on windows 2014-11-06 17:36:35 +01:00
Joas Schilling 62047f86f5 Testcase base class 2014-11-06 17:36:34 +01:00
Lukas Reschke 5b8a6b66b5 Load PHPAss via autoloader 2014-11-06 16:32:53 +01:00
Morris Jobke efe209784e Merge pull request #12000 from owncloud/bower-strengthify
bower strengthify
2014-11-06 16:30:44 +01:00
Morris Jobke 7353183d99 bower strengthify 2014-11-06 16:29:34 +01:00
Jan-Christoph Borchardt a410055291 add relevant focus styles to the existing hover styles 2014-11-06 16:22:57 +01:00
Lukas Reschke 8f1fa32e1f Merge pull request #11998 from owncloud/add-get-logger-to-interface
Add getLogger() to IServerContainer
2014-11-06 16:04:54 +01:00
Lukas Reschke c4d7483a0a Use new hashing API for OC_User_Database
This will use the new Hashing API for OC_User_Database and migrate old passwords upon initial login of the user.
2014-11-06 15:42:06 +01:00
Jan-Christoph Borchardt af743efff0 add alt text for file actions, but leave empty since text is directly next to it 2014-11-06 15:33:38 +01:00
Thomas Müller 2090e9b620 Merge pull request #11947 from owncloud/public-hash-api
Add OCP\Security\IHasher
2014-11-06 15:17:12 +01:00
Lukas Reschke 24ca2d858f Add OCP\Security\IHasher
Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference.

Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662
Requires https://github.com/owncloud/3rdparty/pull/136
2014-11-06 15:16:14 +01:00
Morris Jobke 1d6c7e28e9 update to 3rdparty master 2014-11-06 15:02:32 +01:00
Lukas Reschke 5f2a083686 Merge pull request #11883 from owncloud/clear-session-for-setup
Clear session before setup
2014-11-06 14:39:51 +01:00
Lukas Reschke f73d653036 Merge pull request #11972 from owncloud/usermanager-remove-delete
Remove confusingly names \OC\User\Manager::delete and fix the automatic ...
2014-11-06 13:52:25 +01:00
Lukas Reschke bb15028a00 Merge pull request #11993 from owncloud/enc_repeat_password
[encryption] check if the provided password is really the current log-in password
2014-11-06 13:42:00 +01:00
Lukas Reschke 0e3e1e3563 Add getLogger() to IServerContainer
Makes my IDE complaining less ;-)
2014-11-06 13:36:36 +01:00
Thomas Müller f2d17ea771 Merge pull request #11984 from owncloud/bower-md5
bower md5
2014-11-06 13:28:30 +01:00
Jan-Christoph Borchardt 45c6ec8582 introduce h1, use either ownCloud name or current app name 2014-11-06 13:26:38 +01:00
Morris Jobke 73569b29bc md5 now handled via bower 2014-11-06 13:22:16 +01:00
Morris Jobke ae72f0c158 Merge pull request #11985 from owncloud/bower-snap
bower snapjs
2014-11-06 12:44:36 +01:00
Jan-Christoph Borchardt 764f51c976 add missing alt attribute to spinner 2014-11-06 12:09:48 +01:00
Morris Jobke e49b9022a1 bower snapjs 2014-11-06 12:03:57 +01:00
Thomas Müller fd829cb0b5 Merge pull request #11989 from owncloud/bower-zxcvbn
bower zxcvbn
2014-11-06 11:57:33 +01:00
Morris Jobke f816f3df03 bower zxcvbn 2014-11-06 11:55:57 +01:00
Thomas Müller 06b67f7e43 Merge pull request #11981 from owncloud/bower-jcrop
bower jcrop
2014-11-06 11:49:39 +01:00
Bjoern Schiessle 8104a4e24e check if the provided password is really the current log-in password 2014-11-06 11:12:20 +01:00
Morris Jobke 49fbd766c2 bower jcrop 2014-11-06 09:32:34 +01:00
Morris Jobke 3329492766 Merge pull request #11980 from owncloud/bower-select2
bower select2
2014-11-06 09:27:58 +01:00
Morris Jobke 226d43a1cf manage select2 via bower 2014-11-06 09:27:12 +01:00
Vincent Petry afa14d571c Merge pull request #11982 from owncloud/bower-underscore
bower underscore
2014-11-06 08:42:29 +01:00
Jenkins for ownCloud fa4018d36c [tx-robot] updated from transifex 2014-11-06 01:55:04 -05:00
Morris Jobke 86d3476761 Merge pull request #11983 from owncloud/drop-chosen
drop unused library chosen
2014-11-06 00:47:25 +01:00
Morris Jobke 957dee5af1 bower underscore 2014-11-05 23:23:03 +01:00
Morris Jobke 0af5a8db74 drop unused library chosen 2014-11-05 22:41:33 +01:00
Thomas Müller bf0ad7f219 Merge pull request #11970 from owncloud/bower-handlebars
bower handlebars
2014-11-05 16:50:58 +01:00
Morris Jobke 02c7fb8445 bower handlebars 2014-11-05 16:47:46 +01:00
Lukas Reschke 4659b0e6a0 Merge pull request #11936 from owncloud/bower-jquery
Bower jquery
2014-11-05 16:43:24 +01:00