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

5207 commits

Author SHA1 Message Date
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
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
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
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
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
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
Jenkins for ownCloud
263603aa4c [tx-robot] updated from transifex 2013-11-06 21:44:36 -05:00
blizzz
7c89309e26 Merge pull request #5691 from owncloud/switch-to-oc6-documentation 
move to oc6 documentation
 2013-11-05 08:22:26 -08:00
Vincent Petry
e3868ba118 Fixed watcher to also update the owner's folder sizes 
Note that the root folder size is mandatory for quota calculation.
 2013-11-05 13:58:14 +01:00