wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15119 commits 157 branches 562 tags 714 MiB
Commit graph

5252 commits

Author SHA1 Message Date
Thomas Müller
1a69079139 Merge pull request #6021 from owncloud/show_build 
Show build number
 2013-11-24 15:01:11 -08:00
Thomas Müller
a2d4cd87d0 Merge pull request #5874 from owncloud/fix-5845 
Fix file uploads on Windows with SQL Server
 2013-11-24 14:15:17 -08:00
Thomas Mueller
228f1788fa add new function to generate the human readable version string based on version, channel and build number 2013-11-24 21:26:34 +01:00
Thomas Mueller
6229f457d0 update PHPDoc 2013-11-24 21:18:14 +01:00
Frank Karlitschek
a11192bab3 send the build number too to push the next daily build. This is needed for the new daily build update channel 2013-11-24 16:45:06 +01:00
Frank Karlitschek
2ce850f7db fix overwrite host support and make the code a bit more readable 2013-11-24 12:41:09 +01:00
Vincent Petry
aef34618de Merge pull request #5995 from owncloud/extstorage-isreadablefix 
Return plausible isReadable() default impl for ext storage
 2013-11-24 03:04:33 -08:00
Jenkins for ownCloud
ba0e09adce [tx-robot] updated from transifex 2013-11-24 00:14:51 -05:00
Vincent Petry
c62cce8269 Moved default isReadable/isUpdatable impl into Common class 
Also adjusted all ext storage backends to not override these when the
default behavior is expected.
 2013-11-22 18:21:17 +01:00
Bjoern Schiessle
aeefe48cba Revert "use relative paths to create images from a file. This way it also works if" 
This reverts commit 3488f0b77a.
 2013-11-22 18:01:44 +01:00
Vincent Petry
3b904647b0 Merge pull request #6003 from owncloud/incognito_mode 
Incognito mode
 2013-11-22 06:08:49 -08:00
Bjoern Schiessle
7e4f50d4e3 add incognito mode, allows to hide my user ID. For example, this is useful to access public resources while a user is still logged in 2013-11-22 13:55:38 +01:00
Thomas Müller
c05177b25b Merge pull request #5882 from owncloud/preview-movie-5s 
Movie preview - use frame after 5 seconds
 2013-11-22 04:27:34 -08:00
Raghu Nayyar
c503588827 Merge pull request #6000 from owncloud/use_relative_path_to_create_images 
use relative paths to create images from a file.
 2013-11-22 03:52:40 -08:00
blizzz
2f73db12bb Merge pull request #5040 from owncloud/public_api_avatar_master 
Add public API for \OC\Avatar
 2013-11-22 03:42:28 -08:00
Thomas Müller
92c8672c0f fixing PHPDoc comments and syntax 2013-11-22 12:34:37 +01:00
Bjoern Schiessle
3488f0b77a use relative paths to create images from a file. This way it also works if 
no user is logged in (e.g. public gallery share)
 2013-11-22 12:26:01 +01:00
Thomas Müller
14e7075030 we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB. 
in some cases 1MB was no enough to generate thumbnail
 2013-11-22 12:23:22 +01:00
Thomas Müller
c22019dec5 Working on a chunked video can result in a broken frame index the option -vsync 1 can heal that 2013-11-22 12:20:06 +01:00
Jenkins for ownCloud
60cfdae503 [tx-robot] updated from transifex 2013-11-21 21:07:12 -05:00
Arthur Schiwon
f94a6eb166 Add missing Avatar Interface 2013-11-22 00:43:23 +01:00
Arthur Schiwon
00071401d7 Round out Avatar Public API 2013-11-21 23:40:25 +01:00
Thomas Müller
4a2f9636cf Merge pull request #5773 from owncloud/fix-2152-master 
Make working en_US.UTF-8 locale a hard requirement
 2013-11-21 08:03:21 -08:00
Jenkins for ownCloud
5d9731cef2 [tx-robot] updated from transifex 2013-11-21 10:05:34 -05:00
Vincent Petry
d0265f3388 Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome 
Quota storage wrapper is now used for all users in sharing mode
 2013-11-21 06:59:50 -08:00
Thomas Müller
cd1cf58875 Fixing the warning notifications 2013-11-21 14:44:25 +01:00
Vincent Petry
69e8e7dbd5 Now using the "Home" storage detection approach for quota 
To find out whether to apply a quota, we now try and detect whether the
storage to wrap is a "Home" storage.
 2013-11-21 12:17:47 +01:00
Vincent Petry
356eef0739 Quota storage wrapper is now used for all users in sharing mode 
When accessing a shared folder, the folder's owner appears as mountpoint
but wasn't wrapped by a quota storage wrapper.

This fix makes sure that all home storages are wrapped by a quota
storage wrapper, if applicable, to make sure quotas are respected when
uploading into shared folders.
 2013-11-21 12:04:54 +01:00
Thomas Müller
f2fe47bc21 fixing spelling and restructure sentence 2013-11-21 09:59:21 +01:00
Vincent Petry
a88aec8a5c Merge pull request #5965 from owncloud/mimetype-only-path 
Change default mimetype detection for storage backends to only use filename
 2013-11-20 08:11:41 -08:00
Thomas Müller
51a8172868 always get the right node for the given file path 2013-11-20 16:14:08 +01:00
Robin Appelman
a0d570b4cc Change default mimetype detection for storage backends to only use filename 2013-11-20 15:25:29 +01:00
Vincent Petry
726a202cdb Fixed getLocalFile() condition for x-send-file 
Until now, addSendfileHeader() was called even when no x-send-file
headers were set. Even though the method itself doesn't do anything,
a call to getLocalFile() was done and would trigger a full download
when using external storage.

Additionally, the storage resolution code is wrong and always
returns the local storage of the root filesystem, which caused the code to
be run anyway.

This commit fixes both issues.
 2013-11-20 14:33:59 +01:00
Morris Jobke
4a0d295e4a Merge pull request #5927 from owncloud/quota-excludeextstorage 
External storage space is now not counted in total space
 2013-11-18 14:42:40 -08:00
Vincent Petry
3e2fd9942b Root size for home storage is now size of "files" subdir 
Fixes #4593
 2013-11-18 18:17:25 +01:00
Vincent Petry
614e4d485c External storage space is now not counted in total space 
Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.

Fixes #5924
 2013-11-18 18:09:01 +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
Jenkins for ownCloud
c3746e866a [tx-robot] updated from transifex 2013-11-15 22:56:31 -05:00
Bart Visscher
368342a085 Update error messages 2013-11-15 14:46:00 +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
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
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
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
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