Morris Jobke
248eed16a6
fix defaults.php doc
2013-11-25 14:26:26 +01:00
Thomas Müller
a0a665ea45
handle duplicate slashes in case of reverse proxy configuration
2013-11-25 14:21:51 +01:00
Morris Jobke
7f47cc062c
fix defaults.php doc
2013-11-25 14:13:58 +01:00
Morris Jobke
b7ddc78626
fix db.php doc
2013-11-25 14:06:25 +01:00
Robin Appelman
317d421874
provide more cli friendly error messages
2013-11-25 13:04:23 +01:00
Thomas Müller
993fea2f05
fix appframework routing
2013-11-25 11:36:33 +01:00
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
Arthur Schiwon
6085878966
Avatar: accept OC_Image as in setParameter
2013-11-22 23:57:23 +01: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
Arthur Schiwon
8ccac86c98
Enable user backends to provide avatar images
2013-11-22 13:25:20 +01: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
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
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
tomneedham
1449437c9e
Merge multiple failed third party responses when returning the result
2013-11-14 01:21:54 +00:00
tomneedham
bb182bbfb2
Merge multiple shipped failures before responding.
2013-11-14 01:19:46 +00:00
tomneedham
ca5c39a3a1
Return failed shipped responses over succedded shipped responses
2013-11-14 01:14:37 +00:00
tomneedham
a39f3fdbf9
Return result object when only one successful response is returned
2013-11-14 01:10:56 +00:00
tomneedham
790055571d
Update lib/private/api.php after merge conflict
2013-11-14 01:00:14 +00:00
tomneedham
b06682b7fb
Merge branch 'ocs_api_fix_success_code' into oc_api_tests
2013-11-14 00:41:04 +00:00
tomneedham
00944a376a
Merge branch 'master' into oc_api_tests
2013-11-14 00:40:57 +00:00
tomneedham
f19caeed33
Remove OC_App dependancy from OC_API::mergeResponses()
2013-11-13 22:46:24 +00:00
Morris Jobke
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
Vincent Petry
3fa651f2b1
Merge pull request #5447 from owncloud/fixing-5117-master
...
No data corruption duriing parallel upload
2013-11-13 02:59:34 -08:00
Tom Needham
17e45e2002
Pick any none 100 status code before defaulting to 100
2013-11-13 00:45:49 +00:00
Thomas Tanghus
ec51825d31
Use dedicated OC_Image loader methods
...
This prevents excessive logging and disk access
2013-11-13 00:36:42 +01:00
Vincent Petry
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
Vincent Petry
1a65e3a725
Now calling parent method when path is not root
2013-11-12 16:15:44 +01:00
Robin Appelman
32a703ab36
Do not use -1 as the size for the root folder of the home storage
2013-11-12 16:15:43 +01:00
Robin Appelman
abc428916c
Fix fatal error when trying to open a non existing public link
2013-11-12 15:38:00 +01:00
Georg Ehrke
49cd5dad24
add trash bin and file versions delete hooks in OC::registerPreviewHooks
2013-11-12 14:08:55 +01:00
Oliver Gasser
53f17a71d1
treat numeric as an alias for decimal
2013-11-12 13:55:20 +01:00
Oliver Gasser
4b01eaf6cc
changed type to decimal
2013-11-12 13:47:47 +01:00
Bart Visscher
dcca887f18
Don't set a default value when there isn't a default specified
2013-11-11 17:58:25 +01:00
Bjoern Schiessle
68f3f2e691
make it possible to detect transferID part
2013-11-11 17:47:46 +01:00
Vincent Petry
99ee95d46c
Added missing escaping
2013-11-11 15:41:03 +01:00
Morris Jobke
55331479cd
Merge pull request #5701 from owncloud/sharing-updateownerfoldersizes
...
Fixed watcher to also update the owner's folder sizes
2013-11-11 06:16:51 -08:00
Oliver Gasser
b278356eb9
DB: Set correct default value for numeric types
...
Set 0 as default value for columns with numeric data type instead of the
empty string ''. Otherwise the database complains about an invalid
default value for this column.
To reproduce put the following in your ````appinfo/database.xml````:
````
<field>
<name>modified</name>
<type>decimal</type>
<default/>
<notnull>true</notnull>
<length>15</length>
</field>
````
See owncloud/mozilla_sync#14
2013-11-10 14:15:33 +01:00
Vincent Petry
df288605d4
Fixed undefined variable error when using avconv
2013-11-10 11:46:46 +01:00
Thomas Müller
841c622085
Merge pull request #5687 from owncloud/fixing-5659-master
...
display the exception instead of meaningless message
2013-11-09 23:14:52 -08:00
Thomas Müller
a8f6a2446c
Merge pull request #5759 from owncloud/fixing-5757-master
...
adding proper htaccess commands for Apache 2.4
2013-11-09 23:13:17 -08:00
Jenkins for ownCloud
3428c03b80
[tx-robot] updated from transifex
2013-11-09 01:45:32 -05:00
Thomas Müller
b5e013973b
implementing solution using <ifModule mod_authz_core>
2013-11-08 17:29:14 +01:00
Bart Visscher
a6d8854d2a
Make working en_US.UTF-8 locale a hard requirement
2013-11-08 14:30:08 +01:00
Vincent Petry
4b5083e3ca
Fixed the rebellous space, replaced with a tab
2013-11-08 12:27:53 +01:00
Vincent Petry
0c6af55112
Added ffmpeg fallback when avconv is not available
...
On some distros, avconv isn't available yet.
This fix adds a fallback to ffmpeg.
When none is found, no error message is displayed in the console any
more.
Fixes #5745
Also, this now uses exec() instead of shell_exec() to be able to get the
return code.
The binary path found with "which" is now used to prevent further FS
binary lookup when running the commands.
Moved the "-ss" parameter before "-i" for ffmpeg.
2013-11-08 12:19:32 +01:00
Thomas Müller
f93dcc5d77
the filesystem has to be initialized once we know the user
2013-11-08 11:24:19 +01:00
Thomas Müller
9c8b1e1775
adding proper htaccess commands for Apache 2.4
2013-11-08 10:45:35 +01:00
Morris Jobke
4459d964d6
Merge pull request #5747 from owncloud/scanner-post-hooks
...
Add post hooks for filesystem scanner
2013-11-07 12:44:23 -08:00
Vincent Petry
013444813e
Now removing stray old cookies from 5.0.12
...
Cookies from 5.0.12 seemed to have an extra slash in the path.
Firefox doesn't allow to remove them if the trailing slash isn't
there,
thus making it impossible to logout correctly.
This fix adds extra code to delete such stray cookies.
Ported from stable5 branch 99e5c6f7eb
2013-11-07 18:49:50 +01:00
Robin Appelman
d6845babd6
Add post hooks for filesystem scanner
2013-11-07 16:22:29 +01:00
kondou
bcd776b0c0
Fix a regression (Tags→TagManager)
2013-11-07 12:51:03 +01:00
kondou
4ac05e071a
Remove duplicate getAvatarManager()
2013-11-07 12:48:41 +01:00
kondou
507325dd50
Add public API for \OC\Avatar
2013-11-07 12:48:40 +01:00