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
Arthur Schiwon
7fa418c81a
LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520
2013-10-24 18:21:02 +02:00
Vincent Petry
a555e00e2c
Merge pull request #5512 from owncloud/css-fixleftcontentrightcontent
...
Fix leftcontent/right content, fixes contacts app
2013-10-24 09:18:08 -07:00
Vincent Petry
c3f62d983f
Removed old webdav endpoint
2013-10-24 18:07:55 +02:00
Christian Berendt
dd82481f59
add configuration parameter to manually set the timeout of HTTP requests
2013-10-24 16:19:17 +02:00
Thomas Müller
a22f12cfe0
- fixing namespace
...
- remove property only if present
2013-10-24 14:40:43 +02:00
Arthur Schiwon
20f46602bd
LDAP: when multiline values are passed as array, do not try to preg_split them. Fixes #5521
2013-10-24 14:27:33 +02:00
Arthur Schiwon
6284e95e2b
typo, fixes #5517
2013-10-24 14:16:58 +02:00
Vincent Petry
2102ab8fec
Fix leftcontent/right content, fixes tasks app
...
Tasks app layout was broken since the controls bar is higher now.
This change should hopefully fix other apps using the same layout.
2013-10-24 12:28:28 +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
535bc7b664
Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename
...
prevent user from creating or renaming sth. to an existing filename
2013-10-23 13:45:27 -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
30cf7fee11
Merge pull request #5492 from owncloud/admin-forcesslwrongid
...
Fixed wrong id when reading checkbox value for force SSL setting
2013-10-23 10:37:52 -07:00
Thomas Müller
54e0f1d739
fixing PHPDoc & grammar
2013-10-23 19:06:36 +02:00
Thomas Müller
e95ad29d90
Merge pull request #5435 from owncloud/share-improvements
...
Share improvements
2013-10-23 09:56:24 -07: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
Frank Karlitschek
c7621badf3
beta 1
2013-10-23 18:14:07 +02:00
Vincent Petry
88c2646f7e
Fixed share dropdown checkbox wrapping
...
The "show cruds" button is now embedded into the last label/checkbox
group and wraps with it.
Added ellipsis to prevent long names to exceed the dropdown's width.
2013-10-23 17:58:27 +02:00
Thomas Müller
1909288fcb
Merge branch 'master' into fix-sharing-code
2013-10-23 17:16:16 +02:00
Jörn Friedrich Dreyer
4991a7bd06
fix translations
2013-10-23 17:02:41 +02:00
Jan-Christoph Borchardt
a2e9c0f81a
better wording for share input field and share link
2013-10-23 17:57:06 +03: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
Vincent Petry
9aa164f381
Renamed current placeholder jquery plugin to imageplaceholder
...
This is to prevent conflicts with jquery libs that handle text
placeholders in IE8
2013-10-23 16:47:25 +02: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
Bjoern Schiessle
2221aa9ca4
run first getUsersItemShared() with the owner
2013-10-23 16:34:26 +02:00
Bjoern Schiessle
60e219da43
update etags for user we haven't checked yet
2013-10-23 16:34:03 +02:00
Bjoern Schiessle
6ae761d946
keep a list of users we already checked to avoid loops
2013-10-23 16:33:44 +02:00
Bjoern Schiessle
dd972f65a8
fix infinite loop while updating etags, fix for #4365
2013-10-23 16:33:28 +02:00
Bjoern Schiessle
efdbcbddef
Merge branch 'master' of github.com:owncloud/core
2013-10-23 16:29:17 +02:00
Markus Goetz
af58360434
files_encryption: Fix getFileSize()
...
For certain file sizes, we rounded to the wrong chunk number
and the returned bogus results. This should fix
https://github.com/owncloud/mirall/issues/1009
Conflicts:
apps/files_encryption/tests/util.php
2013-10-23 16:28:43 +02:00
Vincent Petry
9656280252
Added left padding to notCreatable message
2013-10-23 16:20:53 +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
8166aaf82c
Some tests for OC_L10N::findLanguage()
2013-10-23 15:41:15 +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
Vincent Petry
5aeafab9ab
Fixed wrong id when reading checkbox value for force SSL setting
...
Fixes #5488
2013-10-23 15:21:18 +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
Johannes Twittmann
76f831979b
Update CONTRIBUTING.md
...
Gave more info on how to search issues.
2013-10-23 14:21:28 +02:00
blizzz
32e02c24a2
Merge pull request #5404 from owncloud/ldap_settings_wizard
...
Ldap settings wizard
2013-10-23 05:12:47 -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
