926b274200
Movie preview - use frame after 5 seconds
2013-11-15 01:46:51 +01:00
6ef39931cb
Merge pull request #5767 from owncloud/moviepreviewfallback
...
Added ffmpeg fallback when avconv is not available
2013-11-14 16:39:39 -08:00
57a3141cb1
Merge pull request #5867 from owncloud/users-groupadmindropdown
...
Users groupadmindropdown
2013-11-14 13:28:05 -08:00
617dc0e468
Merge branch 'master' into moviepreviewfallback
...
Conflicts:
lib/private/preview/movies.php
2013-11-14 20:57:29 +01:00
ecc7b01cee
Merge pull request #5824 from owncloud/fix-publicshare-non-existing
...
Fix fatal error when trying to open a non existing public link
2013-11-14 11:45:08 -08:00
2bb4c266a6
Merge pull request #5862 from owncloud/files-singledotdirs
...
Files singledotdirs
2013-11-14 11:40:21 -08:00
447e468d1a
Merge pull request #5850 from owncloud/oc_api_tests
...
Add unit tests for OC_API::mergeResponses and fix error with api returning incorrect status codes.
2013-11-14 07:58:51 -08:00
29e9f2833d
Merge pull request #5214 from owncloud/no_extra_slashes
...
Don't double-slash filenames at the root.
2013-11-14 07:53:51 -08:00
7e63722534
make use of data providers
2013-11-14 15:37:30 +01:00
d9ab964ff9
Added missing test with leading backslash
2013-11-14 15:36:03 +01:00
19e03ef77f
Merge pull request #5827 from owncloud/avoid_preview_errors
...
Use dedicated OC_Image loader methods in previews
2013-11-14 05:52:51 -08:00
f670d74634
Added min-height in case of empty multi-select
2013-11-14 14:26:48 +01:00
55355ba28e
Fixed multiselect to not set the button's height on itself after select
...
Fixes #5841
2013-11-14 14:18:22 +01:00
008c3b80d6
Files app backend now normalizes paths before rendering templates
...
Before rendering breadcrumbs or the file list, the paths are now
normalized. This prevents the UI to show "." breadcrumbs in case the
path contains sections with "/./"
Fixes #5848
2013-11-14 13:24:05 +01:00
c06d8bb007
Fixed normalizePath() to strip out single dot dirs
...
Now removing "/./" and trailing "/." from the paths when normalizing.
2013-11-14 13:15:03 +01:00
1449437c9e
Merge multiple failed third party responses when returning the result
2013-11-14 01:21:54 +00:00
bb182bbfb2
Merge multiple shipped failures before responding.
2013-11-14 01:19:46 +00:00
ca5c39a3a1
Return failed shipped responses over succedded shipped responses
2013-11-14 01:14:37 +00:00
5a2d700866
Fix type in unit test
2013-11-14 01:11:22 +00:00
a39f3fdbf9
Return result object when only one successful response is returned
2013-11-14 01:10:56 +00:00
790055571d
Update lib/private/api.php after merge conflict
2013-11-14 01:00:14 +00:00
b06682b7fb
Merge branch 'ocs_api_fix_success_code' into oc_api_tests
2013-11-14 00:41:04 +00:00
00944a376a
Merge branch 'master' into oc_api_tests
2013-11-14 00:40:57 +00:00
959513fdc8
Add tests for OC_API::mergeResponses()
2013-11-14 00:40:09 +00:00
f19caeed33
Remove OC_App dependancy from OC_API::mergeResponses()
2013-11-13 22:46:24 +00:00
8d0d0836ba
Merge branch 'master' of https://github.com/owncloud/core
2013-11-13 19:43:18 +01:00
cd4a816c11
beta 4
2013-11-13 19:42:52 +01:00
58ff8a8673
Merge pull request #5805 from owncloud/shared-storage-copy-folder
...
Use View::copy and View::rename when copying or renaming files in the shared storage
2013-11-13 10:17:37 -08:00
15c4e4ed09
Merge pull request #5806 from owncloud/styles-fix-external_storage
...
Fix spacing issue for checkboxes, vertically center checkboxes on person...
2013-11-13 07:43:59 -08:00
5aae550b11
Merge pull request #5809 from owncloud/fix5753
...
LDAP Wizard: proper behaviour with anonymous bind, fixes #5753
2013-11-13 06:52:07 -08:00
408ce91b25
Merge pull request #5768 from owncloud/quota-workaroundwhenmissingrootsize-home-only
...
Do not use -1 as the size for the root folder of the home storage
2013-11-13 05:57:16 -08:00
ac0e87b1cc
Merge pull request #5831 from owncloud/files-charatissue
...
Fixed total dirs/files message hiding condition
2013-11-13 05:22:48 -08:00
3fa651f2b1
Merge pull request #5447 from owncloud/fixing-5117-master
...
No data corruption duriing parallel upload
2013-11-13 02:59:34 -08:00
5bdfccfc47
Fixed total dirs/files message hiding condition
...
Fixes #5829
2013-11-13 10:53:16 +01:00
17e45e2002
Pick any none 100 status code before defaulting to 100
2013-11-13 00:45:49 +00:00
ec51825d31
Use dedicated OC_Image loader methods
...
This prevents excessive logging and disk access
2013-11-13 00:36:42 +01:00
34c92f6656
Now using HomeStorage for legacy home storage ids
...
Legacy home storage ids with the format "local://path/to/datadir/user1"
are now also wrapped by the HomeStorage.
2013-11-12 18:01:02 +01:00
77429c28fd
rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does
2013-11-12 16:48:24 +01:00
1a65e3a725
Now calling parent method when path is not root
2013-11-12 16:15:44 +01:00
32a703ab36
Do not use -1 as the size for the root folder of the home storage
2013-11-12 16:15:43 +01:00
dc30056025
Merge pull request #5822 from owncloud/delete_hooks_trash_and_versions
...
Implement delete hooks for trashbin and filesversions apps.
2013-11-12 07:03:37 -08:00
abc428916c
Fix fatal error when trying to open a non existing public link
2013-11-12 15:38:00 +01:00
49cd5dad24
add trash bin and file versions delete hooks in OC::registerPreviewHooks
2013-11-12 14:08:55 +01:00
238e4bc3eb
implement delete hooks in file versions lib
2013-11-12 14:06:32 +01:00
90fac1f371
replace $path with '/files_trashbin/files/' . $file
2013-11-12 14:03:50 +01:00
feee4b865b
add delete hook for trash bin app
2013-11-12 14:00:36 +01:00
a745901d50
Merge pull request #5810 from owncloud/disbaledtextareas
...
Disabled textareas should look like they are disabled
2013-11-12 02:34:51 -08:00
c9517c4fc8
new line for css rule
2013-11-12 11:31:58 +01:00
fcbb5d6cb3
missed some replacements... now tests should work
2013-11-12 11:17:34 +01:00
735752f232
Merge pull request #5816 from Wikinaut/patch-1
...
Update config.sample.php
2013-11-12 02:12:06 -08:00
Morris Jobke
Thomas Müller
Frank Karlitschek
Vincent Petry
tomneedham
Tom Needham
Thomas Tanghus
Bjoern Schiessle
Robin Appelman
Georg Ehrke