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

9407 commits

Author SHA1 Message Date
Robin Appelman
5a646477a5 Fetch all appconfig values for an app at once and cache the results 2013-12-18 15:10:12 +01:00
Thomas Müller
277ae28171 Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes 
Fixed download file from URL error messages
 2013-12-18 06:03:50 -08:00
Thomas Müller
a90342b781 Merge pull request #6461 from owncloud/check-xcache-varsize 
Do not use xcache variable cache if cache size is 0.
 2013-12-18 05:36:40 -08:00
Thomas Müller
9c5a620c4f Merge pull request #6256 from owncloud/session-preserver-thirdparty 
preserve 3rd party values in  in the Session destructor
 2013-12-18 05:20:06 -08:00
Robin Appelman
e7a5c90cab Replace static usage of OC_Config and OC_Preferences with the injected \OC\ConfigAll 2013-12-18 13:03:19 +01:00
Robin Appelman
a6c1b3ece3 fix the config option to remove the ability for users to set their displayname 2013-12-18 13:03:19 +01:00
Oliver Gasser
3b0d0e2b1f DB: Support DECIMAL(precision,scale) syntax in XML 
Add support for specifying the precision and scale of a decimal data
type to the XML description language.

See owncloud/core#6475
 2013-12-17 22:46:45 +01:00
Frank Karlitschek
1d0af242b9 Merge pull request #6436 from owncloud/allconfig-defaults 
Add default parameter to OC\AllConfig/OCP\IConfig's getValue's
 2013-12-17 05:09:58 -08:00
Thomas Müller
275d666d26 Merge pull request #6438 from owncloud/core-logexceptionfix 
Do not use L10n when logging exceptions
 2013-12-17 00:53:03 -08:00
Andreas Fischer
dfeb04a574 Do not use xcache variable cache if cache size is 0. 
This is possible because it is possible to only use xcache as an opcode cache
but not a variable cache.
 2013-12-17 02:40:16 +01:00
Bart Visscher
8f0c56c1b2 Merge branch 'master' into fix-5388-master 2013-12-16 22:38:22 +01:00
Thomas Tanghus
a3fbad43c1 Use DEBUG instead of ERROR when favourites not found. Fix #6419 2013-12-16 17:07:22 +01:00
Georg Ehrke
059c3c8708 fix issue with logging non utf8 chars 2013-12-16 15:38:55 +01:00
Vincent Petry
2a1d6d3106 Do not use L10n when logging exceptions 
In some specific situations, the L10N bundle isn't loadable yet (for
example when there is an issue with the app_config table). In such case,
we still want to be able to log the real exception.

This fixes errors that say "OC_L10N_String::__toString must not throw
exceptions"
 2013-12-16 15:11:13 +01:00
icewind1991
fed63dff06 Merge pull request #6315 from owncloud/ingroup-cache 
cache the result from inGroup
 2013-12-16 06:01:00 -08:00
Robin Appelman
e2efad6ae7 Also add default to the \OCP\IConfig interface 2013-12-16 14:33:03 +01:00
Robin Appelman
59f02066b6 add default parameter for AllConfig->get*Value() 2013-12-16 14:30:01 +01:00
Andreas Fischer
c205d8d1c9 Merge remote-tracking branch 'owncloud/master' into fixing-3417-master 
* owncloud/master: (1989 commits)
  [tx-robot] updated from transifex
  dont try to register background jobs if we haven't upgraded yet
  adjust test
  coding style
  coding style
  On webdav sesssions, loginname was compared to username which does not need to match necessarily
  rely only on php DateTime to parse the db datetime string
  LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
  Fix webroot for update page
  Update 3rdparty ref
  update 3rdparty
  toggle select all checkbox
  remove unneeded ; in comment
  LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283
  Add test for having utf8 filenames in the cache
  fix fallback overwriting result of getHome
  [tx-robot] updated from transifex
  fix smbclient directory listing parser
  cache the home folder of a User
  Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
  ...

Conflicts:
	lib/util.php
 2013-12-14 18:32:48 +01:00
Arthur Schiwon
91d6a6dd7c On webdav sesssions, loginname was compared to username which does not need to match necessarily 2013-12-13 16:58:03 +01:00
Thomas Müller
7b30ffbf23 Merge pull request #6318 from owncloud/gethome-cache 
cache the home folder of a User
 2013-12-13 01:30:43 -08:00
Robin Appelman
8a86837eac remove unneeded ; in comment 2013-12-12 13:59:00 +01:00
Robin Appelman
f23b7a262f fix fallback overwriting result of getHome 2013-12-12 12:57:25 +01:00
Vincent Petry
335b2f40a6 Fixed download file from URL error messages 
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
  OC_L10N_String values
 2013-12-12 10:38:12 +01:00
Robin Appelman
3d29992378 user Group->users as assosiative array 2013-12-11 16:25:41 +01:00
Robin Appelman
366d75e947 cache the home folder of a User 2013-12-11 16:22:26 +01:00
Robin Appelman
b126374780 cache the result from inGroup 2013-12-11 15:47:36 +01:00
Robin Appelman
5c7a08aab4 check if a $_SESSION entry exists before we try to remove it 2013-12-11 12:59:48 +01:00
tomneedham
7afe6b3493 Merge branch 'master' into fix-5388-master 2013-12-11 09:12:47 +00:00
Andreas Fischer
cdd182ce35 Send "SET NAMES utf8" to MySQL for PHP below 5.3.6 2013-12-11 00:19:51 +01:00
Vincent Petry
82bf1f9c8c Added workaround for Android content disposition 
Fixes #5807
 2013-12-10 12:42:41 +01:00
Vincent Petry
409b510889 Moved content disposition code+workarounds to OCP\Response 
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.

Refactored download code to use the new API.

Removed unused trashbin download file.
 2013-12-10 12:42:26 +01:00
Joas Schilling
009e25788f correctly mark app management active 2013-12-09 15:53:31 +01:00
Robin Appelman
a36bf5c2b5 preserve 3rd party values in in the Session destructor 2013-12-09 12:38:27 +01:00
Pellaeon Lin
fc607e6bce Separate PHP upload limit and free space 2013-12-08 22:59:46 +08:00
Morris Jobke
4c4c9096c4 fix plural translation - fixes #6226 2013-12-07 11:38:01 +01:00
blizzz
6a747106db Merge pull request #6150 from owncloud/backgroundjob-log-exception 
Remove background jobs that are giving errors
 2013-12-06 11:56:53 -08:00
Vincent Petry
123bc9921a Merge pull request #6201 from owncloud/backgroundscan-reuse-etag 
reuse etags when doing a background scan
 2013-12-06 10:13:14 -08:00
Bart Visscher
4c8bc61753 XSendfile and encryption don't work together 
The file on disk is encrypted, and not readable on client systems
 2013-12-06 17:59:59 +01:00
Bart Visscher
6aa9daf4e6 Users of getFolderContent are mostly interested in the unecrypted file size 2013-12-06 15:51:49 +01:00
Robin Appelman
01ab15a2b0 reuse etags when doing a background scan 2013-12-05 15:23:34 +01:00
Alexander Bergolth
301d469813 Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning 2013-12-04 18:01:51 +01:00
Morris Jobke
d73875b2b4 Merge pull request #6169 from owncloud/php_version_warning 
PHP version warning
 2013-12-04 01:49:54 -08:00
Frank Karlitschek
61296ed7bb lower required php version to 5.3.3 2013-12-04 10:25:22 +01:00
Frank Karlitschek
8fdbb98899 Merge pull request #6168 from owncloud/extstorage-testtestmethod 
Added unit test for the test() method of ext storage
 2013-12-03 11:00:49 -08:00
Thomas Müller
16eb7c15d2 Merge pull request #6076 from owncloud/fix-6073-master 
Correct property name. It's just 'tableprefix', without the 'db' prefix.
 2013-12-03 08:21:45 -08:00
Vincent Petry
6cf9844e9c Added unit test for the test() method 
This is to make sure that method isn't broken
 2013-12-03 14:35:53 +01:00
Frank Karlitschek
b83e891456 Merge pull request #5929 from owncloud/code_check_on 
switch code checker on by default. apps are not allowed to access
 2013-12-03 01:14:35 -08:00
Robin Appelman
64bfcbee0a check if a directory exists before we try to remove it 2013-12-02 22:44:28 +01:00
Robin Appelman
4f4ad72460 remove background jobs if they are failing 2013-12-02 13:43:26 +01:00
Robin Appelman
35bb6f7e3a Catch exceptions from background jobs and log them 2013-12-02 13:41:47 +01:00
Thomas Mueller
87e795a693 fixing PHPDoc and spelling 2013-12-02 08:42:28 +01: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
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
Andreas Fischer
93b0bd0a9e Use getLastError() everywhere. 2013-11-28 12:05:46 +01:00
Andreas Fischer
904573d0d0 Add getLastError() 2013-11-28 12:04:28 +01:00
Andreas Fischer
955127231a No function as oci_last_error. It's oci_error. 2013-11-28 11:37:29 +01:00
Andreas Fischer
fcf332abbf There is no property such as dbusername. It's 'dbuser'. 2013-11-28 11:33:49 +01:00
Andreas Fischer
b90f88f939 Correct property name. It's 'dbpassword', with the 'db' prefix. 2013-11-28 11:33:43 +01:00
Andreas Fischer
005c98e46c Correct property name. It's just 'tableprefix', without the 'db' prefix. 2013-11-28 11:23:45 +01: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
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
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
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
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
27cc333dfe adding chunked upload handling 2013-11-25 15:35:26 +01:00
Thomas Müller
b9fed935b4 in case uri and script name don't match we better throw an exception 2013-11-25 14:42:34 +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
Simon Könnecke
243f3f0c4c No decimal points for Kilobyte and Byte #5371. 2013-11-25 12:26:03 +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 Mueller
37b07fe6a9 Merge branch 'master' into fix-5388-master 2013-11-24 23:27:44 +01: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
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
Thomas Müller
26e9e68a39 Merge branch 'master' into fix-5388-master 2013-11-22 17:14:15 +01:00
Bart Visscher
9adff4f7f5 Change OC_Migrate from MDB2 to Doctrine 2013-11-22 15:53:56 +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
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
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
Frank Karlitschek
7504fc0aef switch code checker on by default. apps are not allowed to access some of the internal classes where we have a public api for now 2013-11-18 18:42:06 +01: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
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
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
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
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
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
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
Thomas Müller
08c8bf5a7b decode arguments as array 2013-11-05 10:30:18 +01:00
Thomas Müller
3488202f67 Merge pull request #5582 from owncloud/files-previewcaching 
Append file etag to preview URLs
 2013-11-05 01:21:51 -08:00
Thomas Müller
f91fe8d595 Merge pull request #5673 from owncloud/oc6-windows-server-mssql-master 
Oc6 windows server mssql master
 2013-11-05 00:41:11 -08:00
Thomas Müller
d48ba5a5bf Merge pull request #5540 from owncloud/scanner-enhancments-master 
Scanner enhancments master
 2013-11-04 23:58:42 -08:00
Thomas Müller
01f2b7eb3a move to oc6 documentation 2013-11-04 22:50:12 +01:00
Andreas Fischer
8274d9f91c Inherit lastInsertId() from Adapter. 2013-11-04 22:28:41 +01:00
Thomas Müller
c3898061a8 Merge pull request #5544 from owncloud/fixing-3593-2-master 
Add FileId header and switch fileid and instance id
 2013-11-04 04:30:12 -08:00
Thomas Müller
0f266d0f62 set log level to DEBUG 2013-11-04 12:58:30 +01:00
Thomas Mueller
e37047b2a0 WIN: fixing Fatal error: Call to a member function logicToPhysical() on a non-object in C:\jenkins2\workspace\server-stable5-windows\database\mssql\label\WINDOWS\lib\files\storage\mappedlocal.php on line 311 2013-11-02 20:22:12 +01:00
Thomas Mueller
5ecebe211b mssql: fixing lastInsertId() implementation 2013-11-02 20:21:19 +01:00
Thomas Mueller
eb3c5070c0 replace template function link_to_docs() with \OC_Helper::linkToDocs() 2013-11-02 19:11:46 +01:00
Morris Jobke
fad2149e3f Merge pull request #5551 from owncloud/fix-5202-master 
When updating an appstore app, execute a database update
 2013-10-31 11:10:28 -07:00
Jörn Friedrich Dreyer
ae469b67a0 Merge pull request #5637 from owncloud/fix_privatedata 
Fix privatedata
 2013-10-31 10:26:47 -07:00
Jörn Friedrich Dreyer
b4cdac0a60 Merge pull request #5591 from owncloud/home-storage 
Make home folders movable without requiring rescans
 2013-10-31 10:20:03 -07:00
Andreas Fischer
d6ddb12c20 Get rid of the SELECT query. Try UPDATE, on failure INSERT. 2013-10-31 16:04:18 +01:00
Thomas Müller
aae6e76926 fixing undefined index in delete() 2013-10-31 10:24:28 +01:00
Thomas Müller
64d0b0d184 PHPDoc comment updated - checkLoggedIn() removed 2013-10-31 10:21:17 +01:00
Thomas Müller
0cec17ba87 no need to check if the user is logged in 2013-10-31 10:14:06 +01:00
Thomas Müller
47da2ef8db fixing php notice: Undefined index key 2013-10-31 10:02:18 +01:00
Thomas Müller
b2929de0a7 no need to check if the user is logged in - this is already done in the ocs dispatcher itself 
adding @return
 2013-10-31 09:58:18 +01:00
Thomas Müller
64bfd21ccd Merge branch 'master' into fix_privatedata 2013-10-31 09:05:35 +01:00
Thomas Müller
3f42c890be we should check if a user is logged in before we check for admin privilege 2013-10-30 22:59:31 +01:00
Thomas Müller
261cd87efa Merge branch 'master' into home-storage 2013-10-30 22:11:19 +01:00
Lukas Reschke
c1730d241c Merge pull request #5615 from owncloud/fixing-5614-master 
http header OCS-ApiRequest: true is required in case of session based OC...
 2013-10-30 13:12:16 -07:00
Lukas Reschke
cba12e009f Added missing HTTP prefix to the $_SERVER variable 2013-10-30 21:07:19 +01:00
Frank Karlitschek
330d026be7 fix the privatedata key value store 2013-10-30 19:36:29 +01:00
Robin Appelman
c9f3f2874f Merge branch 'master' into update-parent-storage-mtime 
Conflicts:
	lib/private/files/cache/updater.php
 2013-10-30 13:41:10 +01:00
Vincent Petry
de342a5ac7 Merge pull request #5603 from owncloud/fix_file_cache_updater_master 
Fix file cache updater (backport to master of #5513)
 2013-10-30 02:31:08 -07:00
Thomas Müller
3d42e402c5 http header OCS-ApiRequest: true is required in case of session based OCS API calls 2013-10-29 23:07:27 +01:00
Bjoern Schiessle
e1e4c7c214 Merge branch 'master' into fix_file_cache_updater_master 2013-10-29 17:47:33 +01:00
Björn Schießle
e08f38f99b Merge pull request #5605 from owncloud/fix_delete_user 
remove user from cache if he was deleted successfully
 2013-10-29 09:46:21 -07:00
Thomas Müller
e0bc89c87f Merge pull request #5577 from owncloud/fix_urlgenerator_imagepath 
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
 2013-10-29 09:29:29 -07:00
Bjoern Schiessle
0d7d396d80 make sure that also the storage etag gets changed 2013-10-29 16:30:47 +01:00
Bjoern Schiessle
f021dad204 remove user from cache if he was deleted successfully 2013-10-29 15:50:33 +01:00
Bjoern Schiessle
a80ac9c492 make getUidAndFilename() private 2013-10-29 15:10:02 +01:00
Bjoern Schiessle
fcfac51aa1 backport of https://github.com/owncloud/core/pull/5513 2013-10-29 15:08:12 +01:00
Robin Appelman
b3626f34cd Update the parent folders storage_mtime on write and delete to prevent rescans 2013-10-29 14:18:57 +01:00
Andreas Fischer
b3e39dd3d9 Map empty mimetypes to octet-stream for Oracle DBMS. 2013-10-29 14:18:42 +01:00
Andreas Fischer
fa6ae81149 Return early if fileinfo is there. 2013-10-29 13:48:30 +01:00
Andreas Fischer
68d13210bd Reset mimetype to application/octet-stream on empty reply from file command. 2013-10-29 13:29:35 +01:00
Robin Appelman
0e92a4896d dont use the home storage for non-existing users 2013-10-29 13:12:28 +01:00
Andreas Fischer
a04a01d51f Do not calculate $isWrapped if not needed. 2013-10-29 12:54:30 +01:00
Thomas Müller
aaefb64306 Merge pull request #5493 from owncloud/fix-language-detection 
Fix HTTP language detection
 2013-10-28 16:37:12 -07:00
Robin Appelman
e273c14540 use the new home storage backend when no existing local storage backend exists for the user's home 2013-10-29 00:26:35 +01:00
Robin Appelman
f1e6e80eb1 add specialized storage backend for home folders 2013-10-29 00:14:23 +01:00
Bjoern Schiessle
db0fa6c529 use getHome() to delete users data 2013-10-29 18:01:37 +01:00
Jörn Friedrich Dreyer
682d6e8a80 use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace 2013-10-28 14:18:20 +01:00
Vincent Petry
e62ca4ea4f Append file etag to preview URLs 
Fixes #5534
 2013-10-28 14:14:55 +01:00
Morris Jobke
4750fbc226 Merge pull request #5550 from owncloud/fix-4716-master 
'Update to' is shown when there is no update
 2013-10-28 03:33:27 -07:00
Morris Jobke
78971c61e6 update documentation for app update 2013-10-28 11:27:51 +01:00
Arthur Schiwon
466b6c1ee0 local user backend shall search for both username and displayname, fixes #5401 2013-10-25 21:57:12 +02:00
Vincent Petry
ebcd9ae628 Added comment for clarification about fseek() call in quota.php 2013-10-25 16:15:01 +02:00
Bart Visscher
b6c67c4c63 'Update to' is shown when there is no update 
See #4716
 2013-10-25 15:41:59 +02:00
Bart Visscher
310c8400df When updating an appstore app, execute a database update 
See #5202
 2013-10-25 15:38:08 +02:00
Thomas Müller
c455cb989b add header 'OC-FileId' on PUT 2013-10-25 13:20:59 +02:00
Thomas Müller
3bca1519ee switch instance id and file id 2013-10-25 13:20:29 +02:00
Thomas Müller
8253994262 using array_diff_assoc to detect diffs in values as well 2013-10-25 12:40:31 +02:00
Thomas Müller
f619f59f1c cast storage_mtime to int 2013-10-25 12:39:50 +02:00
Vincent Petry
c8df27de73 Fixed quota stream to not wrap read-only fopen calls 2013-10-25 12:33:16 +02:00
Vincent Petry
d8b245490b Fixed quota stream's fseek method 
- Added missing return statement
- Added missing support for SEEK_END
- Fixes #5524
 2013-10-25 12:09:46 +02:00
Thomas Müller
66813e9df6 Merge branch 'master' into fix-language-detection 2013-10-24 19:27:33 +02:00
Thomas Müller
222f1b8da2 Merge pull request #5494 from owncloud/fixing-3593-master 
introducing new dav property {xmlns:oc="http://owncloud.org/ns}id
 2013-10-24 09:41:56 -07:00
Thomas Müller
c5b8963b18 log the data arrays 2013-10-24 18:13:21 +02:00
Thomas Müller
a22f12cfe0 - fixing namespace 
- remove property only if present
 2013-10-24 14:40:43 +02:00
Thomas Müller
88d1e20d56 some logging added .... 2013-10-24 14:24:56 +02:00
Thomas Müller
808e9b0f51 Merge pull request #5402 from owncloud/fixing-5367-master 
fixes chunked upload
 2013-10-24 00:56:46 -07:00
Thomas Müller
db70b18c1d Merge pull request #5496 from owncloud/prefer_png_from_theme_over_core_svg 
prefer logo png from theme over svg from core
 2013-10-23 14:44:43 -07:00
Thomas Müller
caa3a8d784 Merge pull request #5464 from owncloud/fixing-5456-master 
Fixing 5456 master
 2013-10-23 10:50:36 -07:00
Thomas Müller
54e0f1d739 fixing PHPDoc & grammar 2013-10-23 19:06:36 +02:00
Thomas Müller
3d5e229ac5 Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinserts 
Ignore duplicate inserts in file cache and mime type
 2013-10-23 07:47:50 -07:00
Jörn Friedrich Dreyer
0bf034da96 prefer logo png from theme over svg from core 
The logo images are specified in the php templates with eg `image_path('', 'logo-wide.svg')`. If that file exists the correct path will be served to the client in the html template. Then the `SVGSupport()` is checked in https://github.com/owncloud/core/blob/master/core/js/js.js#L701 which will replace `svg` with `png` in img tags and css background definitions.

fixes #5074
partially solves #5421, but not when an svg has been specified in css and is then 'fixed' by js to point to a png which does not exist in the theme but is then might be resolved to an image from core .... well theoretical problem ... might not even be a problem

@karlitschek @jancborchardt please review
 2013-10-23 16:44:56 +02:00
Thomas Müller
b02a485712 handle case where fileid is not set 2013-10-23 16:40:29 +02:00
Thomas Müller
b60ae11db8 introducing new dav property {xmlns:oc="http://owncloud.org/ns}id 2013-10-23 16:03:57 +02:00
Andreas Fischer
06f2ae082e Have to also strtolower() on available language name. Otherwise no match. 2013-10-23 15:39:50 +02:00
Andreas Fischer
daf93c4516 Sort, so 'de' is preferred over 'de_DE' when performing non-exact matching. 2013-10-23 15:38:54 +02:00
Andreas Fischer
c14b470ea2 Apply substring on the correct value. 2013-10-23 15:38:22 +02:00
VicDeo
959b0f9125 Merge pull request #5458 from owncloud/fixing-5222-master 
php 5.3 compatibility regarding OC\DB\Connection fixed
 2013-10-23 05:35:33 -07:00
Vincent Petry
a542c57a7b Catch duplicate insertion errors while scanning files 
When two scanning processed run at the same time, for example when
scan.php and list.php were called at the same time on an external
storage mountpoint, duplicate insertion errors can occurs.

These errors are now logged and ignored.

Since both scans are running in parallel transactions, they don't see
each other's changes directly in the DB which can cause duplicate
insertion errors for mime types as well, but those mime types can't be
selected yet. The solution to this is to force-reload the mimetypes list
after the transaction is finished.

Fixes #5199
 2013-10-23 13:00:46 +02:00
Andreas Fischer
4c76dd3871 Better variable names. 2013-10-23 12:56:51 +02:00
Andreas Fischer
207f6d55ce Fix coding style for else. 2013-10-23 12:39:12 +02:00
Thomas Müller
3c710696e8 add missing file header 2013-10-23 12:27:54 +02:00
Andreas Fischer
9d1b425b62 Correct indentation for default language. 2013-10-23 12:25:48 +02:00
Björn Schießle
2d14daf36b Merge pull request #5472 from owncloud/enc_init_status_on_enable 
Encryption set init status on enable
 2013-10-23 01:02:45 -07:00
Thomas Müller
4bf37f72b2 Merge pull request #5482 from owncloud/fix_weird_http_namespace 
Fix namespace for OCP\Appframework\Http
 2013-10-23 00:40:30 -07:00
Thomas Müller
cf61b1a977 Merge pull request #5391 from owncloud/undefined-property-in-schema-master 
removing pointless calls on quoteIdentifier() - reason: name on $tableDi...
 2013-10-22 22:46:43 -07:00
Thomas Tanghus
ad017285e1 Fix namespace for OCP\Appframework\Http 
To avoid having to use OCP\Appframework\Http\Http in the public - and stable
- API OCP\Appframework\Http is now both a class and a namespace.
 2013-10-23 05:57:34 +02:00
Thomas Müller
064fd5ae53 Merge pull request #5451 from owncloud/reuse-session-ocs-master 
Support existing sessions within OCS API calls
 2013-10-22 14:41:21 -07:00
Thomas Müller
09903aa36c - delete properties on node delete 
- move properties on node move
 2013-10-22 19:41:26 +02:00
Bjoern Schiessle
bd450d6f6b add post_enable hook if a app gets enabled 2013-10-22 16:15:19 +02:00
Thomas Müller
6e0e621218 creating and deleting of file and folder 'Shared' in root is not allowed 2013-10-22 11:10:07 +02:00
Thomas Müller
cadd71ec8a Merge pull request #5455 from owncloud/fixing-2423-master 
introduce link_to_docs() and migrate links
 2013-10-22 01:28:43 -07:00
Thomas Müller
9d976013da Merge pull request #5437 from owncloud/create-custom-logfile 
Try to create custom log file before falling back to default.
 2013-10-22 01:17:31 -07:00
Thomas Müller
7f1432600c fixing php 5.3.3 error: 
Undefined variable: this
lib/private/appframework/dependencyinjection/dicontainer.php:92
 2013-10-22 09:29:17 +02:00
Thomas Müller
87a09156f8 use OC_Helper::linkToDocs() in lib/private/config.php 2013-10-21 23:08:09 +02:00
Thomas Müller
e30e4ea1cc php 5.3 compatibility regarding OC\DB\Connection fixed 2013-10-21 22:51:56 +02:00
Thomas Müller
408e0022dd Merge pull request #5249 from owncloud/activities-api 
[OC6] Activities api
 2013-10-21 13:21:17 -07:00
Thomas Müller
124984905e introduce OC_Helper::linkToDocs() 2013-10-21 22:01:27 +02:00
Victor Dubiniuk
97aff7c64e Use quoteIdentifier with proper objects 2013-10-21 22:31:57 +03:00
Thomas Müller
148d2616e5 introduce link_to_docs() and migrate links 2013-10-21 21:29:45 +02:00
Thomas Müller
66a2f3b0b9 New OCS route: 
/ocs/cloud/user
Response:
 <?xml version="1.0"?>
 <ocs>
  <meta>
   <status>ok</status>
   <statuscode>100</statuscode>
   <message/>
  </meta>
  <data>
   <id>thomas</id>
   <display-name>DeepDiver</display-name>
   <email>no-response@domain.tld</email>
  </data>
 </ocs>
 2013-10-21 20:14:18 +02:00
Thomas Müller
581cd9bb9c Support existing sessions within OCS API calls 2013-10-21 18:58:46 +02:00
Thomas Müller
2628601e79 adding oc-mtime handling to chunked upload 2013-10-21 15:00:28 +02:00
Thomas Müller
3cb666ad77 chunked files are assembled into a part file on the target storage followed by an atomic rename operation. 2013-10-21 13:21:39 +02:00
Andreas Fischer
5978ddbec6 Try to create custom log file before falling back to default. 2013-10-20 23:58:07 +02:00
Arthur Schiwon
701009bd72 dispayNamesInGroup(s) should always return uid as key in the result attr, fixes #5209 2013-10-20 20:55:27 +02:00
Frank Karlitschek
9e99f9d13d the logfile shoudn't be world readable. 2013-10-18 17:15:02 +02:00
Morris Jobke
1f1fcc6129 Remove "link" shares right after disabling the "allow_link_share" setting 2013-10-18 11:37:13 +02:00
Vincent Petry
5c5621d84e Merge pull request #5395 from owncloud/more_check_options 
add options to disable the check for a working .htaccess file in data
 2013-10-18 01:23:20 -07:00
Vincent Petry
11cfb9dc48 Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeout 
Added timeout for WebDAV post setup check
 2013-10-18 01:10:04 -07:00
Vincent Petry
b1f72edc57 Fixed spaces 2013-10-17 23:22:19 +02:00
Thomas Müller
d2d2c9a46d fixes #5367 2013-10-17 20:20:13 +02:00
Frank Karlitschek
6a60a47d59 add options to disable the check for a working .htaccess file in data and for a working WebDAV server. This are advanced settings that are needed in special situations where our check fail and the user runs into an http timeout. 2013-10-17 16:27:43 +02:00
Thomas Müller
c3c27b3e58 Merge pull request #5394 from owncloud/sabre-server-location 
Move OC_Connector_Sabre_Server to expected location.
 2013-10-17 07:11:50 -07:00
Andreas Fischer
5ee74b656c Move OC_Connector_Sabre_Server to expected location. 2013-10-17 16:04:59 +02:00
Georg Ehrke
4c5959e1f5 fix comment 2013-10-17 15:19:15 +02:00
Thomas Müller
e55d2359b1 removing pointless calls on quoteIdentifier() - reason: name on $tableDiff doesn't exist and my design the name cannot be changed 
adding PHPDoc
 2013-10-17 14:54:37 +02:00
Georg Ehrke
521277b8b6 only call shell_exec if enabled 2013-10-17 14:31:07 +02:00
Morris Jobke
9c8d1190c0 Merge pull request #5385 from owncloud/generate-sql-migration-master 
new console command to generate sql migration scripts
 2013-10-17 04:53:18 -07:00
Frank Karlitschek
d2b1a361cc Merge pull request #5379 from owncloud/undefined-shipped 
fix undefined "shipped"
 2013-10-17 04:37:40 -07:00
Thomas Müller
6e1881dbe4 new console command to generate sql migration scripts 2013-10-17 12:51:30 +02:00
Morris Jobke
793ccfd1df fix undefined "shipped" 2013-10-17 11:35:13 +02:00
Thomas Müller
b70d67d49a Merge pull request #5237 from owncloud/coverage-on-windows-master 
PHP Code Coverage on windows master
 2013-10-17 02:23:15 -07:00
Frank Karlitschek
186c6a56d1 Merge pull request #4949 from owncloud/improve_unknown_preview_backend 
use svg to generate filetype icon if imagick available
 2013-10-17 01:48:34 -07:00
Morris Jobke
04783da829 Merge pull request #5276 from owncloud/fixing-5170-master 
only text/plain is now used to generate text previews
 2013-10-16 14:21:40 -07:00
Thomas Müller
221a650815 Merge branch 'master' into activities-api 
Conflicts:
	lib/private/server.php
 2013-10-16 21:15:25 +02:00
Thomas Müller
fdeef5e874 Merge branch 'master' into fixing-appframework-master 
Conflicts:
	lib/private/appframework/middleware/security/securitymiddleware.php
	tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
 2013-10-16 15:45:55 +02:00
Thomas Müller
c3f7d22adc Merge pull request #5067 from owncloud/urlParams_fix 
Get urlParams registered before Request is instantiated
 2013-10-16 06:42:09 -07:00
Thomas Müller
8c2b0b1394 Merge branch 'master' into activities-api 2013-10-16 15:36:35 +02:00
Thomas Müller
aca66270c7 accept text/markdown as well 2013-10-16 15:31:43 +02:00
Thomas Müller
d8a7b1e537 Merge branch 'master' into fixing-5170-master 2013-10-16 14:48:55 +02:00
Thomas Müller
fa3a65aea7 Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend 
file system is now initialized with apache authentication as well
 2013-10-16 04:23:45 -07:00
Vincent Petry
52e31405f7 Added timeout value to WebDAV post setup check 
Fixes #5357
 2013-10-16 12:34:22 +02:00
Vincent Petry
7037f9c6f8 Added DAV client wrapper that support timeout values 
Since SabreDAV does not support passing a timeout value to curl, this
commit adds a subclass for it that will set the timeout value to
curlRequest().
 2013-10-16 12:32:42 +02:00
Björn Schießle
ada94fb558 Merge pull request #5333 from owncloud/avater_with_encryption 
avatars should also work with encryption after pr #5332 was merged
 2013-10-16 01:34:05 -07:00
Vincent Petry
5f249e1a54 Prevent renaming/deleting mount points 
Fixed permissions returned for mount points to not include update and
delete permissions.

Fixes #5291
 2013-10-15 14:58:58 +02:00
Bjoern Schiessle
25320f19df Merge branch 'master' into avater_with_encryption 2013-10-15 11:53:51 +02:00
Vincent Petry
fa341e49a8 Merge pull request #5341 from owncloud/fix-logout-link-html 
Fix logout link HTML.
 2013-10-15 00:33:00 -07:00
Thomas Müller
e3489b36ff any preview requiring the which command will not be used on Windows 2013-10-15 00:15:45 +02:00
Andreas Fischer
06f9b7b862 Fix logout link HTML. 
<a id="logout" href=/projects/owncloud/core/index.php?logout=true>
 2013-10-14 22:31:13 +02:00
Thomas Müller
6df5c7ebd5 streamCopy() should return proper structure. 
Callers of streamCopy() expect an array to be returned containing count and result.
 2013-10-14 21:33:23 +02:00
Bjoern Schiessle
3380bd650f avatars should also work with encryption after pr #5332 was merged 2013-10-14 17:30:24 +02:00
Thomas Müller
c97b52090e Merge pull request #4867 from owncloud/fixing-4546-master 
Adding detection of aborted uploads for chunked uploads
 2013-10-14 06:39:32 -07:00
Thomas Müller
5318df3b3c there shall be tabs 2013-10-14 14:51:25 +02:00
Thomas Müller
fb3829e8b8 file system is now initialized with apache authentication as well 2013-10-14 14:46:43 +02:00
Georg Ehrke
71601a7c6f implement previews for markdown 2013-10-14 14:10:47 +02:00
Frank Karlitschek
258ccdfabe case insensitive sort 2013-10-14 11:15:04 +02:00
Frank Karlitschek
a201a66878 fix style 2013-10-14 10:57:00 +02:00
Thomas Müller
a5e808defc Merge branch 'master' into fixing-4546-master 
Conflicts:
	lib/private/connector/sabre/file.php
 2013-10-14 10:56:50 +02:00
Frank Karlitschek
f06df170cb finally fix the app sorting 2013-10-14 10:54:38 +02:00
Tom Needham
14617682c8 Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-error 2013-10-12 09:15:59 +01:00
Thomas Müller
dc58195c7f Merge pull request #5207 from owncloud/fixing-4011-part2-master 
[OC6] file upload exception handling
 2013-10-11 10:35:17 -07:00
Tom Needham
cf7ea4bec5 Handle ownCloud logging when data dir not created 2013-10-11 17:16:37 +01:00
Georg Ehrke
e28f7f8a33 remove php and js previews 2013-10-11 11:43:26 +02:00
Thomas Tanghus
d75d80ba13 OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller 2013-10-11 10:07:57 +02:00
Thomas Müller
51e6565aab only text/plain is now used to generate text previews 
blacklist implementation remove because no longer needed
 2013-10-11 00:25:34 +02:00
Thomas Müller
19ea4f79da resize svg without loosing quality 2013-10-11 00:12:37 +02:00
VicDeo
26c0007a5f Merge pull request #5263 from owncloud/fixing-5255-master 
Proper behavior of resolvePath()
 2013-10-10 09:27:45 -07:00
Thomas Müller
bc6e352ccd the path need to be normalized before putting it into resolvePath() 
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
 2013-10-10 16:06:26 +02:00
Robin Appelman
1378af838c merge master into hooks-view-same-start 2013-10-10 11:34:30 +02:00
VicDeo
1cb47bf777 Merge pull request #5221 from owncloud/fixing-5217-master 
fixing php 5.3 compatibility
 2013-10-10 01:55:18 -07:00
Björn Schießle
6053007768 Merge pull request #5210 from owncloud/sharing_search_users_fix 
find users which are in the same group
 2013-10-10 01:50:51 -07:00
Frank Karlitschek
1a899ac4c3 Merge pull request #5232 from owncloud/fixing-webdav-touch-master 
due to internal implementations touch will always be successful - $mtime...
 2013-10-10 01:49:59 -07:00
Robin Appelman
7f8eeb0474 ensure the view's root is a subfolder of the the default root, not only starting the same 2013-10-09 20:46:43 +02:00
Robin Appelman
38c563dcdc don't trigger the create hooks when if the file already exists for file_put_contents 2013-10-09 20:34:18 +02:00
Thomas Müller
8e97752bf7 adding OC6 public API for activities 2013-10-09 18:06:21 +02:00
Thomas Müller
926b3c9b7b Merge branch 'master' into activities-api 2013-10-09 17:53:57 +02:00
Thomas Müller
27738fc4f5 due to internal implementations touch will always be successful - $mtime will be stored in the cache 
from desktop client perspective it is necessary to set the mtime under every condition
 2013-10-09 15:35:09 +02:00
Björn Schießle
b4df4cc61d Merge pull request #5219 from owncloud/catch_wrong_timezone 
catch unknown timezone and fall-back to UTC
 2013-10-09 01:59:09 -07:00
Bjoern Schiessle
c1e5725db9 changed default time format to ISO8601 2013-10-09 10:40:20 +02:00
Andreas Fischer
fe64f7b900 Merge pull request #5032 from owncloud/fixing-5006-master 
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.

* owncloud/fixing-5006-master:
  Use strict comparison === instead of ==.
  Adjust return value tests for checkPassword() to what OC_User_Example says.
  Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
  Use parent:: in Test_User_Database::getUser().
  Test_User_Backend::getUser() does not return an array, it returns a string.
  Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
 2013-10-08 23:17:51 +02:00
Thomas Müller
7bd5352509 php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainer 2013-10-08 23:14:08 +02:00
Thomas Müller
51b581a84d php 5.3 compatibility for \OC\Files\Storage 2013-10-08 23:00:41 +02:00
Thomas Müller
24e99016a9 Merge pull request #5188 from owncloud/master-delete-user 
User::delete should return bool
 2013-10-08 13:28:19 -07:00
Thomas Müller
6f3c49dabb fixing php 5.3 compatibility 
PHP Fatal error: Can't inherit abstract function OCP\ISession::set() (previously declared abstract in OC\Session\Session)
 2013-10-08 21:52:54 +02:00
Bjoern Schiessle
3cf4c46c43 catch unknown timezone and fall-back to UTC 2013-10-08 20:42:35 +02:00
Andreas Fischer
75588fc0b6 Use strict comparison === instead of ==. 2013-10-08 20:03:16 +02:00
Andreas Fischer
6eab36a89b Make OC_User_Dummy::checkPassword() compatible with OC_User_Example. 
The user id has to be returned.
 2013-10-08 19:57:37 +02:00
Björn Schießle
76bdd6bc81 Merge pull request #5173 from owncloud/set_timezone_for_log 
let admin specify timezone for log file entries
 2013-10-08 09:27:13 -07:00
Bjoern Schiessle
835f36cb09 find users which are in the same group 2013-10-08 16:43:23 +02:00
Frank Karlitschek
92d9263e24 Merge pull request #5146 from guruz/cache_enabled_apps_list 
OC_App: Cache list of enabled apps
 2013-10-08 07:17:36 -07:00
Thomas Müller
3f27fefdbe fixing status code and formatting 2013-10-08 15:40:42 +02:00
Thomas Müller
e7e53363ac Merge pull request #5194 from owncloud/fixing-5172-master 
adding check isDeletable() on $sourcePath
 2013-10-08 06:18:29 -07:00
Thomas Müller
caa27824a9 catch specific file exceptions and convert them to proper http status code via webdav 2013-10-08 15:04:31 +02:00
Thomas Müller
053b55721d Merge branch 'master' into fixing-appframework-master 2013-10-08 12:13:24 +02:00
Bjoern Schiessle
6c45fab037 part file needs to have .part extension 2013-10-08 12:00:32 +02:00
Thomas Müller
c77f74e1de adding check isDeletable() on $sourcePath 2013-10-08 11:43:44 +02:00
Bjoern Schiessle
dd202d9ad3 updating a existing large file creates new file chunks. Therefore createFile() needs to check not only if we can write to the parent folder but also if we can update the existing file" 2013-10-08 11:27:08 +02:00
Bjoern Schiessle
0293d8e04f If a existing file in Shared/ with update permissions gets updated we need to write the .part file to a different place because we can't create new files in the Shared folder 2013-10-08 11:26:49 +02:00
Morris Jobke
2123ef57d8 Merge pull request #5181 from owncloud/fixing-chunked-upload-master 
Fixing broken chunked upload due to #4974
 2013-10-07 13:20:43 -07:00
Victor Dubiniuk
77f43c357c User::delete should return bool 2013-10-07 22:30:15 +03:00
Bart Visscher
6a93994a01 Merge pull request #4796 from owncloud/config-no-catch 
Remove the exception catch in OC_Config, this should be handled by a higher layer
 2013-10-07 11:45:13 -07:00
Thomas Müller
61a534fb60 moving createFileChunked() to OC_Connector_Sabre_File 2013-10-07 17:49:21 +02:00
Thomas Müller
5e397d89c4 Merge branch 'master' into fixing-4546-master 
Conflicts:
	lib/private/connector/sabre/directory.php
 2013-10-07 17:47:54 +02:00
Thomas Müller
f496609085 the path for reassembling was created the wrong way 2013-10-07 17:34:21 +02:00
Bjoern Schiessle
6a411833b9 let admin specify timezone for log file entries 2013-10-07 15:34:48 +02:00
Thomas Müller
b48dffa9a3 Merge pull request #5072 from owncloud/apache-auth-master 
OC6 Apache Authentication
 2013-10-07 06:29:56 -07:00
Thomas Müller
730c80ff9c adding additional exceptions for special cases where creating a file might not be allowed 2013-10-07 15:11:47 +02:00
Morris Jobke
2b3c351601 Merge pull request #5162 from owncloud/fixing-l10n-master-2 
Fixing l10n master 2
 2013-10-07 05:07:47 -07:00
Morris Jobke
be4aea2d1b fix indentation 2013-10-07 13:21:20 +02:00
Georg Ehrke
e078fc3eda fix wrong variable name 2013-10-07 13:19:21 +02:00
Georg Ehrke
3b5dc51be4 fix doc block of OC\Preview\Provider::getThumbnail() 2013-10-07 13:19:21 +02:00
Georg Ehrke
8a35d79a39 check if svg of filetype icon exists 2013-10-07 13:19:21 +02:00
Georg Ehrke
f81053072f use readImage instead of readImageBlob 2013-10-07 13:19:21 +02:00
Georg Ehrke
d410faf11c fix new extension 2013-10-07 13:19:21 +02:00
Georg Ehrke
4ac3ecace2 use svg to generate filetype icon if imagick available 2013-10-07 13:19:20 +02:00
Frank Karlitschek
30faaf92b9 Merge pull request #5142 from owncloud/fix_version_cache_expire 
correctly expire cache if version file changed.
 2013-10-07 03:48:29 -07:00
Frank Karlitschek
3f29e4ebea a few styleguide fixes 2013-10-07 12:27:02 +02:00
Andreas Fischer
47ed6a5135 Move backend finding into its own method. 2013-10-07 12:26:25 +02:00
Thomas Müller
1e47468c53 Merge pull request #4974 from owncloud/fixing-4011-master 
error handling added in case file_put_contents is failing
 2013-10-07 02:58:00 -07:00
Thomas Müller
131d82e41e move call to print_unescaped() to template 2013-10-07 11:49:43 +02:00
Thomas Müller
c3286402a8 removing log(), getTemplate(), getLocalFilePath(), getUrlContent(), getFileInfo() 2013-10-07 11:41:28 +02:00
Thomas Müller
39be4dca67 removing all link/url related calls from API class 2013-10-07 11:38:23 +02:00
Thomas Müller
3ea2dfa5f9 remove getTrans() from API class 2013-10-07 11:36:38 +02:00
Thomas Müller
4e0c4c8f34 move l10n factory into private 2013-10-07 10:00:23 +02:00
Thomas Müller
dbdf34402c remove outdated translation files 2013-10-07 09:59:15 +02:00
Morris Jobke
d986495297 Merge pull request #5148 from owncloud/cache-gc-legacy 
Fix loading legacy global filecache gc backgroundjobs
 2013-10-06 16:25:38 -07:00
Thomas Müller
54e77e0e66 fixing typo 2013-10-07 00:40:37 +02:00
Thomas Müller
780280e53f fixing errors regarding wrong function calls / missing parameters 2013-10-07 00:35:05 +02:00
Thomas Müller
f3c6546d5b remove obsolete passesCSRFCheck() 2013-10-07 00:34:23 +02:00
Thomas Müller
e071bfc144 fixing SecurityMiddleware to use OC6 API 2013-10-07 00:33:54 +02:00
Thomas Müller
3829a746a1 moving file to the right location 2013-10-07 00:32:39 +02:00
Bart Visscher
8115c38670 Remove the exception catch, this should be handled by a higher layer 
And is when using index.php as entry point
 2013-10-07 00:09:25 +02:00
Thomas Müller
1f14ba6aed move controller to OCP 2013-10-06 23:16:40 +02:00
Bernhard Posselt
381b76ebd0 Merge pull request #5144 from owncloud/public_middleware 
Make abstract Middleware class public
 2013-10-06 14:12:35 -07:00
Robin Appelman
98ef90ad04 Fix loading legacy global filecache gc backgroundjobs 2013-10-05 23:19:12 +02:00
Markus Goetz
e564a3a266 OC_App: Cache list of enabled apps 
In my test here 1 SELECT instead of 5 (when doing a DAV request,
probably similar for other requests)
 2013-10-05 19:18:18 +02:00
Thomas Tanghus
47b2007228 Remove misleading IMiddleware interface 2013-10-05 19:13:12 +02:00
Thomas Tanghus
0501a947bc Merge pull request #5116 from owncloud/interfaces2 
More Interfaces for the public api
 2013-10-05 08:35:50 -07:00
Thomas Tanghus
c85621a897 Make abstract Middleware class public 
It doesn't make sense for subclasses to have to implement
all methods.
 2013-10-05 16:59:06 +02:00
Frank Karlitschek
72b30e3e45 correctly expire cache if version file changed. Fixes problem that ownCloud only starts upgrading during login 2013-10-05 12:50:36 +02:00
Frank Karlitschek
a82211220c Merge pull request #5125 from owncloud/fixing-5122-master 
upload abortion detection only for PUT
 2013-10-05 02:25:45 -07:00
Frank Karlitschek
4bce2f8b85 Merge pull request #5123 from owncloud/cache_mimetypes 
Load all mimetypes in one go
 2013-10-05 02:24:38 -07:00
Victor Dubiniuk
8da1aac1d0 Check result only once 2013-10-04 23:24:38 +03:00
Thomas Müller
414b2eb4b6 upload abortion detection only for PUT 
e.g. LOCK would break with this approach
 2013-10-04 20:20:33 +02:00
Bart Visscher
21cbef0d2c passesCSRFCheck added to OCP\IRequest 2013-10-04 18:13:04 +02:00
Bart Visscher
61a9098b7d Add Helper and URLGenerator interfaces to server container 2013-10-04 18:11:02 +02:00
Bart Visscher
ce9436c051 OC_Defaults is only used in error reporting 2013-10-04 18:11:02 +02:00
Bart Visscher
9f777fba98 Add L10N interface to server container 2013-10-04 18:11:02 +02:00
Bart Visscher
bae121b16d Merge pull request #5068 from owncloud/improved_request 
Improved request
 2013-10-04 09:05:20 -07:00
Victor Dubiniuk
ef65037211 Make mimetypes static. Jenkis will be happy 2013-10-04 18:09:42 +03:00
Victor Dubiniuk
65750cb244 Load all mimetypes in one go 2013-10-04 16:17:19 +03:00
Vincent Petry
48a4c67d48 Merge pull request #5087 from owncloud/templatefunction-relativedate 
Added dateOnly argument to relative_modified_date
 2013-10-04 05:53:13 -07:00
Thomas Müller
aebc330f26 Merge branch 'master' into fixing-4011-master 2013-10-04 14:06:42 +02:00
Markus Goetz
800bf0769f Merge pull request #5091 from guruz/webdav_connector_use_cache_for_etag 
DAV: Use fileinfo_cache for ETag
 2013-10-04 04:27:28 -07:00
Bjoern Schiessle
51295e9a6b Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
	apps/files/templates/index.php
 2013-10-04 12:30:49 +02:00
Frank Karlitschek
47666796a7 ups. remove debug 2013-10-04 09:42:38 +02:00
Frank Karlitschek
e49ee47e7b use Filesystem::isIgnoredDir 2013-10-04 09:28:46 +02:00
Frank Karlitschek
f0a98cc923 fix typo 2013-10-04 09:25:54 +02:00
Frank Karlitschek
6d95436695 add public static 2013-10-04 09:24:07 +02:00
Frank Karlitschek
e40afbebc6 make it possible to prepopulate a new user gome with a skeleton 2013-10-03 23:22:11 +02:00
Markus Goetz
7f7718888d DAV: Use fileinfo_cache for ETag 2013-10-03 17:09:08 +02:00
Vincent Petry
006799616d Fixed missing default values 
Added default value for $fromTime to prevent missing argument errors and
keep backward compatible.
 2013-10-03 14:21:41 +02:00
Vincent Petry
b0bb64c3ee Added unit tests for relative_modified_date, changed method signature 
Changed method signature of relative_modified_date template method to
make it possible to add a fromTime to compare with, mostly to make it
possible to test it.

Added unit test for date and time cases.
 2013-10-03 13:55:05 +02:00
Thomas Tanghus
aedc427ffd Fix fix of POST :P 2013-10-03 03:56:37 +02:00
Thomas Tanghus
8a018d7a59 Fix POST decoding 2013-10-03 01:43:33 +02:00
Thomas Müller
9c23c3449b Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	core/css/share.css
 2013-10-02 23:33:50 +02:00
Thomas Tanghus
965ce5719f Modified PUT behaviour 
Now only non-parable PUT requests return a stream resource.
 2013-10-02 22:13:40 +02:00
Bart Visscher
a90ea2c069 Merge remote-tracking branch 'origin/master' into setup 2013-10-02 18:23:59 +02:00
Vincent Petry
ed14541aea Removed stray debug log write 2013-10-02 16:44:38 +02:00
Vincent Petry
31e1c15db7 Added dateOnly argument to relative_modified_date 
Improved the template function relative_modified_date by adding an
optional dateOnly argument which will output "today" or "yesterday" or
"x days ago".
 2013-10-02 15:52:44 +02:00
Andreas Fischer
aa34438d06 Also replace ApacheBackend with Authentication\IApacheBackend in user. 2013-10-02 15:11:49 +02:00
Thomas Müller
621ab1c7ee fixing various PHPDoc comments 2013-10-02 15:04:42 +02:00
Thomas Müller
78c60c25c8 only perform files upgrade in case there are actually entries in the old fscache table 2013-10-02 13:00:05 +02:00
Bjoern Schiessle
8b08b1b455 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/private/util.php
 2013-10-02 10:11:18 +02:00
Bart Visscher
b35b22977c Move legacy file to correct location 2013-10-02 09:15:31 +02:00
Bart Visscher
46b5202f4a Merge branch 'master' into convert-oc_appconfig 2013-10-02 07:42:06 +02:00
Thomas Müller
4cecede13d code cleanup - remove special case for webdav in handleApacheAuth() 2013-10-02 00:55:35 +02:00
Thomas Müller
7e9e23f210 Merge branch 'master' into apache-auth-master 2013-10-02 00:21:11 +02:00
Thomas Müller
9eab8b39df Merge branch 'master' into fixing-4620-master 2013-10-01 22:57:46 +02:00
Thomas Tanghus
0f13ffb773 Remove JSON request parsing from Server 2013-10-01 20:15:04 +02:00
Thomas Tanghus
973bcccd7c Implement PUT an PATCH support 2013-10-01 20:13:13 +02:00
Thomas Tanghus
cd2e1d0cfe Add patch method to OC_Route 2013-10-01 20:13:13 +02:00
Thomas Tanghus
bdad7697ac Check if accessor matched request method. 
It's easier to find errors in the code if an exception is thrown.
 2013-10-01 20:13:13 +02:00
Thomas Tanghus
8603f956ab Get urlParams registered before Request is instantiated 2013-10-01 19:03:34 +02:00
Thomas Müller
e2fe71b6e7 Merge branch 'master' into lib-private-master-2 2013-10-01 16:11:59 +02:00
Thomas Müller
02d6976263 Merge branch 'master' into lib-private-master-2 2013-09-30 21:29:58 +02:00
Thomas Müller
8e0060405d reorganize file in lib 2013-09-30 16:39:03 +02:00
Thomas Müller
9c9dc276b7 move the private namespace OC into lib/private - OCP will stay in lib/public 
Conflicts:
	lib/private/vcategories.php
 2013-09-30 16:36:59 +02:00