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

5311 commits

Author SHA1 Message Date
Thomas Müller
a999350f69 Merge pull request #6158 from owncloud/rmdir-check 
check if a directory exists before we try to remove it
 2013-12-02 15:14:41 -08:00
Jenkins for ownCloud
83ec234f53 [tx-robot] updated from transifex 2013-12-02 17:28:29 -05:00
Robin Appelman
64bfcbee0a check if a directory exists before we try to remove it 2013-12-02 22:44:28 +01:00
Thomas Müller
832be7c908 Merge pull request #6052 from owncloud/datetime-doctrine 
Get rid of date strings for DB. Completely use Doctrine and DateTime.
 2013-12-01 01:29:35 -08:00
Jenkins for ownCloud
1b18c5a047 [tx-robot] updated from transifex 2013-11-29 14:10:40 -05:00
Frank Karlitschek
3c62de90fd Merge pull request #6129 from owncloud/chunking-fixtouchafterassemble 
Fixed touch after chunk assembling
 2013-11-29 09:19:51 -08:00
Vincent Petry
80d2371f97 Fixed touch after chunk assembling 
Fixed touch after chunk assembling which was using the wrong path,
resulting in the creation of an extra file.

Fixes #6007
 2013-11-29 16:29:35 +01:00
Frank Karlitschek
7ca0de9bd3 make 5.3.8 the minimum supported version. This fixes several issues with broken PHP versions like: https://github.com/owncloud/core/issues/5734 
Also make the version compare clearer. It was pure luck that floatval on a php version returned the correct value.
 2013-11-29 15:46:10 +01:00
Frank Karlitschek
a03ba06dcd Merge pull request #6077 from owncloud/fix-api-documentation 
API doc for contacts manager, server container and share
 2013-11-29 03:24:19 -08:00
Morris Jobke
41a1a32e5a Merge pull request #6099 from owncloud/fix_source_not_found_warnings 
make sure that we don't try to access an already deleted files
 2013-11-28 12:59:24 -08:00
Morris Jobke
0cbe9d79ba Merge pull request #6106 from owncloud/fix_preview_creation 
Fix preview creation
 2013-11-28 12:48:19 -08:00
Bjoern Schiessle
466ed01e5d correctFolder() already resolves the dirname internally 2013-11-28 19:25:49 +01:00
Bjoern Schiessle
bdfef554c4 add PHPDoc for setMimetype() 2013-11-28 19:05:43 +01:00
Bjoern Schiessle
eeb31420fe we need to be able to set the mimetype manually 2013-11-28 18:52:58 +01:00
Bjoern Schiessle
eaedda2116 make sure that we don't try to access an already deleted files, fixes some file source not found warnings 2013-11-28 13:31:08 +01:00
Frank Karlitschek
dab3629ff5 Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename 
Redetect mime type whenever extension is renamed
 2013-11-28 03:46:42 -08:00
Frank Karlitschek
d2567129a1 Merge pull request #6072 from owncloud/mssql-fix-schema-migration-oc6 
on mssql the schema migration sometimes fails due to an already existing...
 2013-11-28 02:16:16 -08:00
Thomas Müller
f23d641b82 Merge pull request #6084 from owncloud/fix-app-routing 
fix custom routes defined by apps
 2013-11-28 00:00:09 -08:00
Vincent Petry
43b1cf7988 Redetect mime type whenever extension is renamed 2013-11-27 21:34:51 +01:00
Robin Appelman
885d04bc86 Fix getRawPathInfo for the '/' edge case 2013-11-27 21:28:54 +01:00
Morris Jobke
39f9e16f20 Merge pull request #6086 from owncloud/incognito_mode 
return false if user is in incognito mode
 2013-11-27 09:11:18 -08:00
Jenkins for ownCloud
4a78f12682 [tx-robot] updated from transifex 2013-11-27 12:10:54 -05:00
Bjoern Schiessle
6deda1b9f6 return false if user is in incognito mode 2013-11-27 16:52:30 +01:00
Robin Appelman
c47e46fda0 fix custom routes defined by apps 2013-11-27 15:35:49 +01:00
Morris Jobke
a81909097c Merge pull request #6027 from owncloud/public-api-restful-routing-oc6 
fix appframework routing
 2013-11-27 01:55:52 -08:00
Morris Jobke
7755e69af0 add PHPDoc for urlParams 2013-11-27 10:55:06 +01:00
Morris Jobke
b910524acb add comment from @DeepDiver 2013-11-27 10:32:48 +01:00
Morris Jobke
7c88736292 API doc for contacts manager, server container and share 2013-11-27 00:35:36 +01:00
Thomas Mueller
4fbc2774ef on mssql the schema migration sometimes fails due to an already existing transaction - error: 'New transaction is not allowed because there are other threads running in the session.' 
The solution is to simple reconnect to the database to start with a fresh connection
 2013-11-26 22:39:01 +01:00
blizzz
4f15282bc9 Merge pull request #6058 from owncloud/ldap2avatar 
Set Avatar for LDAP users automatically (if a picture is available)
 2013-11-26 12:05:32 -08:00
Björn Schießle
1fef97f6a5 Merge pull request #6060 from owncloud/fix-6050-oc6 
fixing getRawPathInfo() once more
 2013-11-26 10:13:58 -08:00
Thomas Müller
52941341fd fixing failing unit test 2013-11-26 16:52:33 +01:00
Jenkins for ownCloud
fb7aa2f014 [tx-robot] updated from transifex 2013-11-26 10:47:07 -05:00
Thomas Müller
2a93720f3f fixes #6050 2013-11-26 14:13:33 +01:00
Robin Appelman
10d84f6e9b Add a (currently) empty system for running common repair steps 2013-11-26 14:12:48 +01:00
Bjoern Schiessle
62afe7fe7a remove passwords from logfile 2013-11-26 12:26:32 +01:00
Andreas Fischer
3bbaba1eca Use the Doctrine to convert date string to DateTime object. 2013-11-26 12:21:31 +01:00
Andreas Fischer
a330b2ef9b Use DateTime object instead of fixed format date string. 
Use a DateTime object and have conversion handled by Doctrine instead of using
a date string with a fixed format.
 2013-11-26 12:00:31 +01:00
Andreas Fischer
9fb1da2811 Use bindValue() instead of passing parameters in execute(). 2013-11-26 11:50:14 +01:00
Jenkins for ownCloud
dc67c7efa9 [tx-robot] updated from transifex 2013-11-26 04:04:05 -05:00
Robin Appelman
9fbccc83e3 merge master into single-user-mode 2013-11-25 21:25:04 +01:00
Owen Winkler
844b4785f1 Merge pull request #6034 from owncloud/fix-api-documentation 
Fix api documentation
 2013-11-25 11:17:16 -08:00
Jörn Friedrich Dreyer
4b67d4258d Merge pull request #6035 from owncloud/fixing-rawpath-reverseproxy-oc6 
Fixing rawpath reverseproxy oc6
 2013-11-25 08:21:33 -08:00
Thomas Müller
a42d152ac3 Merge pull request #6037 from owncloud/fix-6007-oc6 
adding chunked upload handling
 2013-11-25 08:16:45 -08:00
Thomas Müller
1fdd2ac7ee adding documentation for registerRoutes() 2013-11-25 17:15:08 +01:00
Morris Jobke
b3e7e54c8d fix some capital letters 2013-11-25 16:42:28 +01:00
Morris Jobke
4e0fa85307 page level doc blocks and class descriptions 2013-11-25 16:39:01 +01:00
Morris Jobke
bc8cc9142e AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixes 2013-11-25 16:28:24 +01:00
Thomas Müller
27cc333dfe adding chunked upload handling 2013-11-25 15:35:26 +01:00
Robin Appelman
71c1327691 Add "single user mode" which restricts access to users in the admin group 
This can be enabled by setting 'singleuser' to true in config.php
 2013-11-25 15:08:24 +01:00