7f3d717037
Check which permissions are possible to re-share a file
2013-11-18 11:58:42 +01:00
82f30d37ca
call error page with session as parameter
2013-11-17 13:23:07 +01:00
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
3e2d4c1bc1
Fixed error-checking error in sftp.php
2013-11-15 21:10:09 +01:00
68f278025c
Merge pull request #5894 from owncloud/readd_sharing_token
...
readd sharing token to public template
2013-11-15 09:25:46 -08:00
cb968c77d1
Merge pull request #5772 from owncloud/fix5741
...
LDAP Wizard: introduce configuration status indicator, fixes #5741
2013-11-15 08:52:41 -08:00
3ad546002f
Merge pull request #5833 from owncloud/encryption_fixes
...
[encryption] preserve timestamps and etags during encryption/decryption
2013-11-15 08:47:22 -08:00
6355af162c
Merge pull request #5880 from owncloud/replace_etmp_files
...
write encryption tmp files to the cache folder
2013-11-15 07:53:23 -08:00
f36ee69855
tests added
2013-11-15 16:49:50 +01:00
11425d142d
readd sharing token to public template
...
necessary for https://github.com/owncloud/apps/pull/1476
2013-11-15 16:27:41 +01:00
fa44c699f7
Merge pull request #5889 from owncloud/extstorage-smb-brokenfseek
...
Fix for smb4php fseek
2013-11-15 07:00:36 -08:00
368342a085
Update error messages
2013-11-15 14:46:00 +01:00
f9a64d2b27
Fix for smb4php fseek
...
The stream_fseek function must return a boolean which will be mapped
to 0 for success and -1 for failure for the caller.
This patch fixes stream_fseek of smb4php to also respect this
convention.
Since the encryption app is relying on fseek to detect whether a file is
encrypted by reading the last bit of data, this will fix #5023
2013-11-15 14:23:24 +01:00
630e46f60a
Merge pull request #5789 from ogasser/db_fix_default_for_numeric
...
DB: Set correct default value for numeric types
2013-11-15 04:19:33 -08:00
bcf56b0407
Use \Patchwork\Utf8\Bootup::initLocale
2013-11-15 13:06:35 +01:00
16dce51917
increase version number to trigger a DB migration to get more testers for the new indexes.
2013-11-15 10:30:04 +01:00
54364f172e
Merge pull request #5814 from owncloud/add-indexes
...
Add some more indexes to tables to improve db queries
2013-11-15 01:25:59 -08:00
1e863cd959
Merge pull request #5700 from owncloud/ldapWizSetDisplayNames
...
LDAP Wizard: do not forget to set display name attributes for user and g...
2013-11-15 01:12:54 -08:00
49e9f771ff
Merge pull request #5813 from owncloud/fix-4736-master
...
Don't set a default value when there isn't a default specified
2013-11-15 01:06:38 -08:00
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
faa08da944
instead of writing etmp files we write the dummy file to data/user/cache to avoid that etmp files show up in the users files list
2013-11-14 17:32:21 +01: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
bd3ead0d31
Compare dirname() results to DIRECTORY_SEPARATOR, not '/'
2013-11-14 09:42:56 -05:00
ca675d7b08
Alias the aggregate columns so SQL Server doesn't combine them.
2013-11-14 09:41:55 -05: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
2624a6cb32
remove debug output
2013-11-14 12:13:22 +01:00
2df3763675
test encryptAll() and decryptAll() to make sure that mtime and etag stay the same
2013-11-14 12:11:21 +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
Bjoern Schiessle
Jenkins for ownCloud
hkjolhede
Vincent Petry
blizzz
Björn Schießle
Jörn Friedrich Dreyer
Frank Karlitschek
Bart Visscher
Morris Jobke
ringmaster
tomneedham