Commit Graph

15185 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt b678766c7d remove bold from legend, table header, label - less obtrusive 2013-11-18 17:32:06 +01:00
Jörn Friedrich Dreyer 5da2929180 fix filtering number like filenames in filelist
forward port of 847ad6c40b
2013-11-18 17:18:31 +01:00
Thomas Müller c8cf3320a4 Merge pull request #5922 from owncloud/fix-time-inputs
fix input type time fields, have them use the default styles
2013-11-18 07:17:09 -08:00
Jan-Christoph Borchardt 463b054530 adjust input CSS to multiline, coding guidelines 2013-11-18 16:14:13 +01:00
Jan-Christoph Borchardt f2d18867af change bold 'deleted files' button to normal for less focus 2013-11-18 15:06:38 +01:00
Jan-Christoph Borchardt 8dd50dc9a6 fix input type time fields, have them use the default styles 2013-11-18 14:51:43 +01:00
Vincent Petry 44c2f9aad2 Merge pull request #5915 from owncloud/fix_apps_versioncheck
Fix apps versioncheck
2013-11-18 05:48:17 -08:00
Vincent Petry d306f5c4cf Merge pull request #5908 from owncloud/fix_errorpage_call
[encryption] fix redirectToErrorPage() call
2013-11-18 05:17:28 -08:00
Morris Jobke a2e3821b87 Merge pull request #5914 from owncloud/fix_5832
Check which permissions are possible to re-share a file
2013-11-18 05:16:05 -08:00
Vincent Petry 7e6f3817d0 SMB ignore connection errors when NetBIOS is disabled
When NetBIOS is blocked or disabled, a smb::look() call can still get
the list of shares from smbclient, even though the name resolution at
the end of the command fails.

This fix makes it ignore the connection error if we already got the list
of shares.

Fixed #5860
2013-11-18 12:31:55 +01:00
Frank Karlitschek 385a296864 one tab less 2013-11-18 12:19:16 +01:00
Frank Karlitschek e5994f9c1a fix the version check for downloaded apps. Fixes https://github.com/owncloud/apps/issues/1485 2013-11-18 12:16:03 +01:00
Bjoern Schiessle 7f3d717037 Check which permissions are possible to re-share a file 2013-11-18 11:58:42 +01:00
Bjoern Schiessle 82f30d37ca call error page with session as parameter 2013-11-17 13:23:07 +01:00
Jenkins for ownCloud c3746e866a [tx-robot] updated from transifex 2013-11-15 22:56:31 -05:00
hkjolhede 3e2d4c1bc1 Fixed error-checking error in sftp.php 2013-11-15 21:10:09 +01:00
Vincent Petry 68f278025c Merge pull request #5894 from owncloud/readd_sharing_token
readd sharing token to public template
2013-11-15 09:25:46 -08:00
blizzz cb968c77d1 Merge pull request #5772 from owncloud/fix5741
LDAP Wizard: introduce configuration status indicator, fixes #5741
2013-11-15 08:52:41 -08:00
Björn Schießle 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
Vincent Petry 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
Bjoern Schiessle f36ee69855 tests added 2013-11-15 16:49:50 +01:00
Jörn Friedrich Dreyer 11425d142d readd sharing token to public template
necessary for https://github.com/owncloud/apps/pull/1476
2013-11-15 16:27:41 +01:00
Frank Karlitschek fa44c699f7 Merge pull request #5889 from owncloud/extstorage-smb-brokenfseek
Fix for smb4php fseek
2013-11-15 07:00:36 -08:00
Bart Visscher 368342a085 Update error messages 2013-11-15 14:46:00 +01:00
Vincent Petry 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
Bart Visscher 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
Bart Visscher bcf56b0407 Use \Patchwork\Utf8\Bootup::initLocale 2013-11-15 13:06:35 +01:00
Frank Karlitschek 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
Frank Karlitschek 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
Thomas Müller 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
Thomas Müller 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
Morris Jobke 926b274200 Movie preview - use frame after 5 seconds 2013-11-15 01:46:51 +01:00
Morris Jobke 6ef39931cb Merge pull request #5767 from owncloud/moviepreviewfallback
Added ffmpeg fallback when avconv is not available
2013-11-14 16:39:39 -08:00
Morris Jobke 57a3141cb1 Merge pull request #5867 from owncloud/users-groupadmindropdown
Users groupadmindropdown
2013-11-14 13:28:05 -08:00
Thomas Müller 617dc0e468 Merge branch 'master' into moviepreviewfallback
Conflicts:
	lib/private/preview/movies.php
2013-11-14 20:57:29 +01:00
Thomas Müller 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
Thomas Müller 2bb4c266a6 Merge pull request #5862 from owncloud/files-singledotdirs
Files singledotdirs
2013-11-14 11:40:21 -08:00
Bjoern Schiessle 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
Thomas Müller 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
Frank Karlitschek 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
ringmaster bd3ead0d31 Compare dirname() results to DIRECTORY_SEPARATOR, not '/' 2013-11-14 09:42:56 -05:00
ringmaster ca675d7b08 Alias the aggregate columns so SQL Server doesn't combine them. 2013-11-14 09:41:55 -05:00
Thomas Müller 7e63722534 make use of data providers 2013-11-14 15:37:30 +01:00
Vincent Petry d9ab964ff9 Added missing test with leading backslash 2013-11-14 15:36:03 +01:00
Thomas Müller 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
Vincent Petry f670d74634 Added min-height in case of empty multi-select 2013-11-14 14:26:48 +01:00
Vincent Petry 55355ba28e Fixed multiselect to not set the button's height on itself after select
Fixes #5841
2013-11-14 14:18:22 +01:00
Vincent Petry 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
Vincent Petry 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
Bjoern Schiessle 2624a6cb32 remove debug output 2013-11-14 12:13:22 +01:00