Commit Graph

21255 Commits

Author SHA1 Message Date
Morris Jobke f39cb3fbc9 Migrate multiselect to user_ldap 2014-11-13 00:47:14 +01:00
Vincent Petry e0b797c43c Merge pull request #12087 from AdamWill/google-touch
google: fix touch() when $mtime is set (Google wants RFC3339) #11267
2014-11-12 18:24:57 +01:00
Thomas Müller 6e3a841652 Merge pull request #12139 from owncloud/DoNotTouchMe
Try to read the file only instead of trying to touch
2014-11-12 17:29:56 +01:00
Jan-Christoph Borchardt d5796bbaf9 Merge pull request #12128 from owncloud/drop-formfactor
Drop form_factor that is appended to JS, CSS and template filenames
2014-11-12 16:23:19 +01:00
Lukas Reschke 268906995d Merge pull request #12126 from owncloud/remove-debug-statement
Remove debug statement
2014-11-12 16:11:28 +01:00
Lukas Reschke 49ddaf9489 Try to read the file only instead of trying to touch
The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening.

Fixes https://github.com/owncloud/core/issues/12135
2014-11-12 15:57:19 +01:00
Morris Jobke 952abdc51a Drop form_factor that is appended to JS, CSS and template filenames 2014-11-12 13:07:23 +01:00
Lukas Reschke da31177a8f Remove debug statement
Either we throw an exception or we ignore it. But we should certainly not print this to the end-user...
2014-11-12 11:32:48 +01:00
Thomas Müller 5aaea6961c Merge pull request #12110 from owncloud/fix-12080
add 'namespace' for automatically created navigation divs, fixes #12080
2014-11-12 11:25:42 +01:00
Morris Jobke 710241f056 Merge pull request #12093 from AdamWill/storage-test-touch
storage test: use new file for testTouchCreateFile()
2014-11-12 10:59:41 +01:00
Arthur Schiwon c5c74792d1 add 'namespace' for automatically created navigation divs, fixes #12080 2014-11-12 10:42:44 +01:00
Thomas Müller c998f620d0 Merge pull request #12105 from owncloud/dav-fixcleanpath
Fix root path handling for WebDAV ext storage
2014-11-12 09:16:55 +01:00
Thomas Müller 9aef0421cf Merge pull request #12107 from owncloud/dav-propfindmimetype
Return real mime type on PROPFIND
2014-11-12 09:16:26 +01:00
Jenkins for ownCloud 1846fb0285 [tx-robot] updated from transifex 2014-11-12 01:55:24 -05:00
Morris Jobke 6f2da96698 Merge pull request #12114 from owncloud/fix-pimple
Fix Pimple unset
2014-11-12 01:40:07 +01:00
Bernhard Posselt 6d5a239abf Fix Pimple unset 2014-11-11 22:04:46 +01:00
Thomas Müller 4c1244f50c Merge pull request #11917 from owncloud/fix-11909
Add checkbox to enforce SSL for subdomains
2014-11-11 20:37:50 +01:00
Jan-Christoph Borchardt 3ecb3f16bf Merge pull request #11929 from owncloud/fix-db-center
fixes not centered database chooser on setup page
2014-11-11 17:12:17 +01:00
Vincent Petry 0b2c24081f Return real mime type on PROPFIND
Return the real (insecure) mime type on PROPFIND
2014-11-11 15:42:50 +01:00
Vincent Petry 4b943a4810 Fix root path handling for WebDAV ext storage
Added missing cleanPath() call that converts "/" to "" when calling
SabreDAV. This is needed because SabreDAV will discard its base URL when
passing "/".
2014-11-11 15:20:36 +01:00
Morris Jobke 0de9368ab2 Merge pull request #12100 from owncloud/fix-infinite-loop
Fix infinite loop if count and limit is 0
2014-11-11 13:29:39 +01:00
Morris Jobke 081787d6ae Fix infinite loop if count and limit is 0
* otherwise it will always think it hits the limit and need another round to fetch additional results
2014-11-11 12:15:30 +01:00
Morris Jobke 9368de5a8b Merge pull request #11789 from owncloud/fix-11762
[LDAP] Login: dont fail with 500 if configured display name attribute is not set
2014-11-11 11:16:41 +01:00
Jenkins for ownCloud 664cc4ac0e [tx-robot] updated from transifex 2014-11-11 01:55:23 -05:00
Adam Williamson e0ae87051f storage test: use new file for testTouchCreateFile()
this test would never succeed, because the previous test -
testFOpen() - creates the file 'foo', but testTouchCreateFile()
starts out by asserting it doesn't exist. Change the test to
use a file called 'touch' instead (which does not previously
exist).
2014-11-10 17:49:35 -08:00
Adam Williamson f76419d190 fix touch() when $mtime is set (Google wants RFC3339) #11267
ownCloud passes us a Unix time integer, but the GDrive API wants
an RFC3339-formatted date. Actually it wants a single particular
RFC3339 format, not just anything that complies will do - it
requires the fractions to be specified, though RFC3339 doesn't.

This resolves issue #11267 (and was also noted by PVince81 in
reviewing PR #6989).
2014-11-10 11:56:01 -08:00
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