Commit Graph

5088 Commits

Author SHA1 Message Date
Bjoern Schiessle db0fa6c529 use getHome() to delete users data 2013-10-29 18:01:37 +01:00
Björn Schießle e08f38f99b Merge pull request #5605 from owncloud/fix_delete_user
remove user from cache if he was deleted successfully
2013-10-29 09:46:21 -07:00
Thomas Müller e0bc89c87f Merge pull request #5577 from owncloud/fix_urlgenerator_imagepath
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
2013-10-29 09:29:29 -07:00
Bjoern Schiessle f021dad204 remove user from cache if he was deleted successfully 2013-10-29 15:50:33 +01:00
Morris Jobke 34c1512466 Merge pull request #5601 from owncloud/fix-mimetype-detection
Fix mimetype detection
2013-10-29 07:47:20 -07:00
Morris Jobke 7223b5acce Merge pull request #5396 from owncloud/fix-sharing-code
Fix sharing error message - id -> file name
2013-10-29 07:33:23 -07:00
Andreas Fischer b3e39dd3d9 Map empty mimetypes to octet-stream for Oracle DBMS. 2013-10-29 14:18:42 +01:00
Andreas Fischer fa6ae81149 Return early if fileinfo is there. 2013-10-29 13:48:30 +01:00
Andreas Fischer 68d13210bd Reset mimetype to application/octet-stream on empty reply from file command. 2013-10-29 13:29:35 +01:00
Andreas Fischer a04a01d51f Do not calculate $isWrapped if not needed. 2013-10-29 12:54:30 +01:00
Jenkins for ownCloud b0b76fe064 [tx-robot] updated from transifex 2013-10-29 07:31:51 -04:00
Thomas Müller aaefb64306 Merge pull request #5493 from owncloud/fix-language-detection
Fix HTTP language detection
2013-10-28 16:37:12 -07:00
Jörn Friedrich Dreyer 682d6e8a80 use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace 2013-10-28 14:18:20 +01:00
Morris Jobke 4750fbc226 Merge pull request #5550 from owncloud/fix-4716-master
'Update to' is shown when there is no update
2013-10-28 03:33:27 -07:00
Morris Jobke 78971c61e6 update documentation for app update 2013-10-28 11:27:51 +01:00
Morris Jobke c61d328ab9 Merge pull request #3889 from owncloud/apps_preload
Don't load the apps when we need to upgrade
2013-10-28 03:17:52 -07:00
Jenkins for ownCloud 8df8211225 [tx-robot] updated from transifex 2013-10-27 07:27:22 -04:00
Jenkins for ownCloud 119ecc6f34 [tx-robot] updated from transifex 2013-10-27 02:32:11 -04:00
Arthur Schiwon 466b6c1ee0 local user backend shall search for both username and displayname, fixes #5401 2013-10-25 21:57:12 +02:00
Vincent Petry ebcd9ae628 Added comment for clarification about fseek() call in quota.php 2013-10-25 16:15:01 +02:00
Bart Visscher b6c67c4c63 'Update to' is shown when there is no update
See #4716
2013-10-25 15:41:59 +02:00
Vincent Petry c8df27de73 Fixed quota stream to not wrap read-only fopen calls 2013-10-25 12:33:16 +02:00
Vincent Petry d8b245490b Fixed quota stream's fseek method
- Added missing return statement
- Added missing support for SEEK_END
- Fixes #5524
2013-10-25 12:09:46 +02:00
Thomas Müller 3917d18980 Merge pull request #5528 from frisco82/changeUpadateNotification
Changed update message to be more instructive
2013-10-24 10:28:17 -07:00
Thomas Müller 66813e9df6 Merge branch 'master' into fix-language-detection 2013-10-24 19:27:33 +02:00
Ramiro Aparicio 3a81c8e3af Changed update message to be more instructive, changed update style to be less aggresive
Fix br tags

Improve english messages
2013-10-24 19:21:40 +02:00
Thomas Müller 54e9d8c306 Merge pull request #5507 from owncloud/webdav-removeredirectfromindex
Remove WebDAV redirect from the root path
2013-10-24 10:05:21 -07:00
Thomas Müller 222f1b8da2 Merge pull request #5494 from owncloud/fixing-3593-master
introducing new dav property {xmlns:oc="http://owncloud.org/ns}id
2013-10-24 09:41:56 -07:00
Thomas Müller a22f12cfe0 - fixing namespace
- remove property only if present
2013-10-24 14:40:43 +02:00
Vincent Petry c186f33428 Remove WebDAV redirect from the root path
This will prevent people mounting the root path.
They should use the full webdav path instead.

Fixes #4923
2013-10-24 10:34:09 +02:00
Thomas Müller 808e9b0f51 Merge pull request #5402 from owncloud/fixing-5367-master
fixes chunked upload
2013-10-24 00:56:46 -07:00
Thomas Müller db70b18c1d Merge pull request #5496 from owncloud/prefer_png_from_theme_over_core_svg
prefer logo png from theme over svg from core
2013-10-23 14:44:43 -07:00
Thomas Müller 291cdbdd98 Merge pull request #5497 from owncloud/ie8-placeholdershim
Ie8 placeholdershim
2013-10-23 13:18:37 -07:00
Thomas Müller caa3a8d784 Merge pull request #5464 from owncloud/fixing-5456-master
Fixing 5456 master
2013-10-23 10:50:36 -07:00
Thomas Müller 54e0f1d739 fixing PHPDoc & grammar 2013-10-23 19:06:36 +02:00
Vincent Petry 086b82bd69 Fixed sharing dropdown placeholders in IE8/9
Added jquery.placeholder shim to handle input field placeholders in IE8/9
2013-10-23 18:51:25 +02:00
Thomas Müller 1317b7c03d pass the name of the item source from the browser to the server - no need to get the data via complicated db queries 2013-10-23 18:39:37 +02:00
Thomas Müller 1909288fcb Merge branch 'master' into fix-sharing-code 2013-10-23 17:16:16 +02:00
Thomas Müller 3d5e229ac5 Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinserts
Ignore duplicate inserts in file cache and mime type
2013-10-23 07:47:50 -07:00
Jörn Friedrich Dreyer 0bf034da96 prefer logo png from theme over svg from core
The logo images are specified in the php templates with eg `image_path('', 'logo-wide.svg')`. If that file exists the correct path will be served to the client in the html template. Then the `SVGSupport()` is checked in https://github.com/owncloud/core/blob/master/core/js/js.js#L701 which will replace `svg` with `png` in img tags and css background definitions.

fixes #5074
partially solves #5421, but not when an svg has been specified in css and is then 'fixed' by js to point to a png which does not exist in the theme but is then might be resolved to an image from core .... well theoretical problem ... might not even be a problem

@karlitschek @jancborchardt please review
2013-10-23 16:44:56 +02:00
Thomas Müller b02a485712 handle case where fileid is not set 2013-10-23 16:40:29 +02:00
Thomas Müller 8c69a5388e Merge pull request #5478 from owncloud/core-logexceptionstacktrace
Expand exception stack trace in log in debug mode
2013-10-23 07:19:14 -07:00
Thomas Müller b60ae11db8 introducing new dav property {xmlns:oc="http://owncloud.org/ns}id 2013-10-23 16:03:57 +02:00
Andreas Fischer 06f2ae082e Have to also strtolower() on available language name. Otherwise no match. 2013-10-23 15:39:50 +02:00
Andreas Fischer daf93c4516 Sort, so 'de' is preferred over 'de_DE' when performing non-exact matching. 2013-10-23 15:38:54 +02:00
Andreas Fischer c14b470ea2 Apply substring on the correct value. 2013-10-23 15:38:22 +02:00
VicDeo 959b0f9125 Merge pull request #5458 from owncloud/fixing-5222-master
php 5.3 compatibility regarding OC\DB\Connection fixed
2013-10-23 05:35:33 -07:00
Vincent Petry c4dee281e6 Added $app parameter to logException 2013-10-23 13:58:42 +02:00
Vincent Petry a542c57a7b Catch duplicate insertion errors while scanning files
When two scanning processed run at the same time, for example when
scan.php and list.php were called at the same time on an external
storage mountpoint, duplicate insertion errors can occurs.

These errors are now logged and ignored.

Since both scans are running in parallel transactions, they don't see
each other's changes directly in the DB which can cause duplicate
insertion errors for mime types as well, but those mime types can't be
selected yet. The solution to this is to force-reload the mimetypes list
after the transaction is finished.

Fixes #5199
2013-10-23 13:00:46 +02:00
Andreas Fischer 4c76dd3871 Better variable names. 2013-10-23 12:56:51 +02:00