Commit Graph

21226 Commits

Author SHA1 Message Date
Morris Jobke 2023878d53 Merge pull request #10966 from owncloud/storage-root-share-permissions
Dont' use mountpoint permissions as share permissions for external storages
2014-11-10 13:11:22 +01:00
Morris Jobke 8afb623f08 Merge pull request #12070 from owncloud/accessibility-fixes
Accessibility fixes
2014-11-10 13:06:46 +01:00
Morris Jobke 3c030e5059 Merge pull request #12069 from owncloud/clean-l10n
Remove *.pot
2014-11-10 12:59:56 +01:00
Vincent Petry 9b99c1d6f0 Merge pull request #12072 from owncloud/sabre-convertstoragenotavailableexception-secondtry
Convert StorageNotAvailableException to SabreDAV exception
2014-11-10 12:52:52 +01:00
Vincent Petry 676b911b22 Merge pull request #12027 from owncloud/cleanup_exceptions
[encryption] clean up encryption exceptions
2014-11-10 12:46:53 +01:00
Vincent Petry cccedf6f30 Convert StorageNotAvailableException to SabreDAV exception
Convert \OCP\Files\StorageNotAvailableException to
\Sabre\DAV\Exception\ServiceUnavailable for every file/directory
operation happening inside of SabreDAV.

This is necessary to avoid having the exception bubble up to remote.php
which would return an exception page instead of an appropriate response.
2014-11-10 12:01:24 +01:00
Thomas Müller be212ce91e Remove *.pot 2014-11-10 11:33:20 +01:00
Jan-Christoph Borchardt 0d00e247c3 Merge pull request #12065 from owncloud/loginname-username
Login Name -> Username in user management
2014-11-10 11:16:10 +01:00
Morris Jobke 311566b96d Login Name -> Username in user management 2014-11-10 10:52:47 +01:00
Jenkins for ownCloud c3e3432662 [tx-robot] updated from transifex 2014-11-10 01:54:30 -05:00
Jenkins for ownCloud 46010655d2 [tx-robot] updated from transifex 2014-11-09 01:54:30 -05:00
Lukas Reschke 62882579e6 Merge pull request #12050 from owncloud/use-proper-array-name
Use proper array key
2014-11-08 15:46:21 +01:00
Lukas Reschke 230fb75a4f Merge pull request #12038 from sebomoto/fix-user-dropdown
changed default dropdown content
2014-11-08 14:46:57 +01:00
Lukas Reschke b0f57d6ef8 Use proper array key
Fixes https://github.com/owncloud/core/issues/12047
2014-11-08 14:27:20 +01:00
Jenkins for ownCloud da14a605d5 [tx-robot] updated from transifex 2014-11-08 01:54:35 -05:00
Jan-Christoph Borchardt 45a877c3a7 use proper tabindex order: 1. app menu, 2. search, 3. user menu 2014-11-08 01:47:46 +01:00
Sebastian Bolt cc19d05ae7 changed default dropdown content
to fix issue #11959
2014-11-07 21:56:48 +01:00
Craig Morrissey 541344d880 logging changes 2014-11-07 12:45:42 -05:00
Björn Schießle 68a522a8fa Merge pull request #11736 from owncloud/enc_get_fileinfo_from_real_file
if we read a .part file we try to get the file info from the real file
2014-11-07 16:20:42 +01:00
Bjoern Schiessle 2af7256267 only set the values we need and make sure that we write the file info for both
the real file and the part file, because some information from the part file
might be needed later
2014-11-07 15:20:52 +01:00
Bjoern Schiessle f27b6b0ab8 don't scan part files 2014-11-07 15:20:51 +01:00
Bjoern Schiessle 3d19bb2e51 also try to get file info from part file 2014-11-07 15:17:24 +01:00
Robin Appelman fa3b6192ec Merge pull request #11575 from owncloud/cache-watcher-propagate
Propagate etag changes when the watcher finds a changed file
2014-11-07 14:42:17 +01:00
Bjoern Schiessle a10ae2816e clean up encryption exceptions 2014-11-07 13:48:31 +01:00
Robin Appelman d26a427f92 Also propagate etag changes when the watcher finds a changed file 2014-11-07 12:56:09 +01:00
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
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