Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-05 08:15:54 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity
13,655 Commits 403 Branches 1,015 Tags 5.2 GiB
2d12e52769
Commit Graph

450 Commits

Author SHA1 Message Date
Björn Schießle
fe58e4b1a6 we need to add the owner of the file as parameter in case someone else like the owner edits the file; if $includeOwner is set than add owner also if no other recipient was found. This changes enable all user with write access to the file to edit it and to encrypt it to the right list of users again 2013-04-18 17:48:16 +02:00
Michael Gapczynski
d51a94161e Initialize collectionTypes variable as false 2013-04-08 17:46:52 -04:00
Michael Gapczynski
e704bcd96e Correct undefined variable in post_shared hook, fixes #2592 2013-04-07 20:05:54 -04:00
Sam Tuke
ff6f52d5ec Merge branch 'master' into files_encryption 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/keymanager.php
 2013-03-28 18:39:12 +01:00
itheiss
568c256aff Fix #2499 
The mail domain can now be configured in config.php and get´s used in function getDefaultEmailAddress.

e.g. 'mail_domain' => 'example.com'
 2013-03-22 10:07:06 +01:00
Frank Karlitschek
3cb016d478 add a searchbymime to the public api. Please all remember that access to internal oc classes will be disabled for all app for ownCloud 6. So please port yur stuff to the public api :-) 2013-03-19 14:27:02 +01:00
Bernhard Posselt
1e20067c00 Merge pull request #2183 from owncloud/fix-shared-statuses-again 
Fix #2080 and fix #2141
 2013-03-11 02:43:16 -07:00
Björn Schießle
2d00d13a5d use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated 2013-03-08 15:13:00 +01:00
Michael Gapczynski
6e5e8c6b46 Fix #2080 and fix #2141 2013-03-07 22:30:12 -05:00
Michael Gapczynski
4826564344 Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
 2013-03-07 17:14:34 -05:00
Michael Gapczynski
a5cab28bea Fix fetching source path of shared files 2013-03-07 11:12:59 -05:00
Michael Gapczynski
4dcbaa1d7b Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/appinfo/app.php
 2013-03-05 21:54:32 -05:00
Michael Gapczynski
ee0c38bb51 Fix group post_shared hook 2013-03-04 19:43:56 -05:00
Thomas Mueller
6019cdd5bd adding test case for getDefaultEmailAddress() + fixing #1844 again 2013-03-04 21:10:18 +01:00
Thomas Mueller
6c304fa5c0 validate the generated email address and fall back to localhost.localdomain in case it is not valid 
fixes #1844
 2013-03-01 22:24:19 +01:00
Michael Gapczynski
b5989c933f Merge branch 'master' into shared-folder-etags 
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
 2013-02-28 10:39:23 -05:00
Michael Gapczynski
9a2ca0ae64 Check resharing setting 2013-02-26 13:31:15 -05:00
Michael Gapczynski
8983465210 Correct parent folders' ETags for all users with access to a shared file 2013-02-26 01:21:48 -05:00
Frank Karlitschek
9ee5069f2a Merge pull request #1856 from owncloud/fix_error_handling_stream_copy 
don't use the number of written bytes as indicator if streamCopy() was successful
 2013-02-25 02:04:12 -08:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Björn Schießle
d8137fdf66 return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied 2013-02-22 16:43:11 +01:00
Björn Schießle
40efeb9187 isSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly either you get a list of users or not 2013-02-22 16:02:27 +01:00
Bart Visscher
ffae6f4b84 Style-fix: Breakup long lines 2013-02-14 08:38:37 +01:00
Bart Visscher
2d6d0a4ad4 Whitespace indent fixes 2013-02-14 08:36:26 +01:00
Bart Visscher
cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Bart Visscher
d3ef967993 Fix indentation style 2013-02-14 08:36:26 +01:00
Björn Schießle
5005195db0 create keypair for ownCloud with empty passphrase, will be used for public link shares 2013-02-13 17:57:45 +01:00
Björn Schießle
9356f9a6bf add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared 2013-02-13 17:23:27 +01:00
Björn Schießle
4952dfe956 add post_unshare hook, also add public link shares to the list of user with access to a file 2013-02-13 14:56:39 +01:00
Björn Schießle
a692264fa4 add option to keep duplicates in the list of users with access to a file, e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share 2013-02-12 17:00:33 +01:00
Björn Schießle
d1bbb30385 also find users with access to the file if a folder above the actual file was already shared 2013-02-12 16:48:04 +01:00
Björn Schießle
8eef919a75 take group shares into account if we retrieve the list a all recipients 2013-02-12 12:08:34 +01:00
Sam Tuke
92f06243be Implementing sharing support 
New file-specific methods in lib/public/share
Changes to how keyfiles are stored
 2013-02-11 10:21:23 +00:00
Sam Tuke
b3e59ca1e3 Work on post_share hook for files_encryption 
New method in OCP\Share{}:: getUsersSharingFile()
Development shapshot
 2013-02-09 18:39:32 +00:00
Bart Visscher
ed1dc3e064 Fix files router download links 2013-02-08 22:05:13 +01:00
Thomas Müller
1158447499 missing comma in sql statement 2013-02-08 13:49:26 +01:00
Frank Karlitschek
223f538bb8 Merge pull request #1500 from chriskoch/patch-1 
Update lib/public/util.php
 2013-02-06 13:00:10 -08:00
Bart Visscher
a4d3cc798f Correct lib/public/contacts.php tests 2013-02-06 17:37:47 +01:00
Christian Koch
a4f909cefd Update lib/public/util.php 
The call of \OC_MAIL::send() overrides all optional parameters. This is not necessary. But if you want to have html mail templates (what I'm thinking about) it is a real problem
 2013-02-06 17:22:07 +01:00
Björn Schießle
9e08f85c5e port already approved bugfix to master, https://github.com/owncloud/core/pull/1479 2013-02-06 14:19:32 +01:00
Thomas Müller
74157902d7 Merge pull request #1476 from owncloud/disable-error-handler-while-running-phpunit 
disable error handler while running phpunit
 2013-02-05 14:35:11 -08:00
Thomas Mueller
10ea45c916 fix failing test cases due to wrong typing 2013-02-05 20:19:54 +01:00
Sam Tuke
fd90b82acd Merge github.com:owncloud/core 2013-02-05 13:44:45 +00:00
Thomas Müller
3b8c071df4 Merge pull request #1234 from owncloud/fix-issue-192 
Fix sharing issue with collection and children mismatches
 2013-02-04 11:52:20 -08:00
Stefan Herbrechtsmeier
ab2b79cda6 add multiple domains reverse proxy support 
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).

As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
 2013-01-31 18:42:31 +01:00
Sam Tuke
31e723a907 Merge github.com:owncloud/core 
Conflicts:
	lib/public/share.php
 2013-01-31 16:30:37 +00:00
Robin Appelman
207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Björn Schießle
022a7b13b8 prepare user table to show and edit display names 2013-01-28 13:12:44 +01:00
Björn Schießle
a606e8d944 use display name to show share_width and owner information 2013-01-25 17:40:23 +01:00
Björn Schießle
b4291f1e8e allow to get the display name from an abitrary user 2013-01-25 13:00:17 +01:00
Björn Schießle
4271430e60 get all display names from users in a given group 2013-01-25 11:48:03 +01:00
Björn Schießle
9bb8e05839 get all display names 2013-01-25 11:05:00 +01:00
Björn Schießle
d16574f070 new branch which introduces display names 
first commit with some infrastructure code
 2013-01-24 13:07:59 +01:00
Sam Tuke
14d0903a28 Merge branch 'master' of github.com:owncloud/core 2013-01-23 12:52:53 +00:00
Robin Appelman
83d6221322 merge master into filesytem 2013-01-20 03:11:04 +01:00
Michael Gapczynski
316eef3ded Fix sharing issue with collection and children mismatches 2013-01-19 01:50:02 -05:00
Michael Gapczynski
cd8d8360b0 Disable fancy folder sharing for now 2013-01-18 23:57:13 -05:00
Michael Gapczynski
5df6f9d14d Fix merge 2013-01-18 23:56:47 -05:00
Thomas Müller
31cc9aa80d Merge pull request #986 from owncloud/fixing-784-master 
the maximum upload size is now part of the response of the upload and de...
 2013-01-18 14:06:00 -08:00
Thomas Mueller
5ff29b4348 fixing indent 2013-01-18 20:09:03 +01:00
Robin Appelman
5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Bart Visscher
a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Thomas Müller
4668f8c86e Merge pull request #1178 from owncloud/return_true_because_of_ponies 
Remove uneeded return
 2013-01-15 14:01:48 -08:00
Thomas Mueller
388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
Lukas Reschke
cc00c54f6a Remove uneeded returns 2013-01-14 20:18:08 +01:00
Sam Tuke
de0ed634f2 Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryption 2013-01-14 17:05:47 +00:00
Thomas Mueller
23896a7290 Merge branch 'master' into fixing-784-master 
Conflicts:
	apps/files/js/files.js
 2013-01-11 09:53:12 +01:00
Jörn Friedrich Dreyer
42e3eaf45a add more linebreaks, replace SQL LIMIT with param 2013-01-09 13:57:51 +01:00
Michael Gapczynski
e8b195bf10 Almost fix Shared scanner... 2013-01-07 20:52:51 -05:00
Robin Appelman
e8d08d4930 merge master into filesystem 2013-01-07 00:16:10 +01:00
Thomas Mueller
a21da9f9fd fixing returns 2013-01-06 23:59:02 +01:00
Thomas Mueller
1093cdd823 fixing returns 2013-01-06 23:57:27 +01:00
Thomas Mueller
19edb29cc3 add missing return 2013-01-06 23:54:18 +01:00
Thomas Mueller
cdd28fcc46 fixing undefined variable $where 2013-01-06 23:48:04 +01:00
Thomas Mueller
bae1755184 Merge branch 'master' into fixing-784-master 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
	lib/helper.php
 2013-01-06 22:40:35 +01:00
Michael Gapczynski
0b13b41189 Merge pull request #1053 from owncloud/ocs_api 
External API for ownCloud based on OCS
 2013-01-04 17:18:58 -08:00
Robin Appelman
e40be93e87 merge master into filesystem 2013-01-03 15:59:17 +01:00
Robin Appelman
54f6f1e6b7 phpdoc fixes for public api 2013-01-02 16:38:20 +01:00
Michael Gapczynski
f4e4a06826 Forgot to select storage from filecache 2013-01-01 12:17:54 -05:00
Tom Needham
6eb194b702 Merge branch 'master' into ocs_api 
Conflicts:
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot
 2012-12-31 15:47:15 +00:00
Michael Gapczynski
cfc3526b25 Fix data for shared root folder 2012-12-29 11:45:13 -05:00
Michael Gapczynski
1910057900 Fix shared statuses inside folders 2012-12-26 16:20:10 -05:00
Robin Appelman
7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +01:00
Thomas Müller
986f5d9f3e fixing variable name 2012-12-21 00:04:58 +01:00
Thomas Müller
39d874cd90 the maximum upload size is now part of the response of the upload and delete operation. 
the maximum upload size is updated within the browser once an upload or delete operation has been finished
 2012-12-20 17:16:53 +01:00
Randolph Carter
d2828bab07 fixes default email sender address 2012-12-19 01:09:14 +01:00
Tom Needham
3c98f36121 Merge branch 'master' into ocs_api 2012-12-16 22:29:00 +00:00
Michael Gapczynski
bf05ff351f Initial support for file sharing with filesystem branch 2012-12-15 19:44:59 -05:00
Robin Appelman
946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Bart Visscher
68562dafb4 More whitespace fixes 2012-12-15 00:43:46 +01:00
Tom Needham
5fe6129698 Merge master into ocs_api, fix conflicts. 2012-12-14 15:15:05 +00:00
blizzz
680ff3a51b Merge pull request #584 from wardragon/ldap_access_userExists_fix 
Really fix OCP\Share::shareItem with LDAP users
 2012-12-12 16:59:43 -08:00
Thomas Mueller
8ed0ce7801 [contacts_api] IAddressBook moved to OCP as it's used by apps to provide access to their contact data 2012-12-11 17:42:09 +01:00
Thomas Mueller
4cc895aa0a [contacts_api] move addressbook to it's own file 2012-12-08 16:42:54 +01:00
Lorenzo M. Catucci
15afbfd198 Add an $excludingBackend optional parameter 
to the userExists method both in OCP\User and in OC_User.
 2012-12-07 17:19:26 +01:00
Thomas Mueller
889e55fdac [contacts_api] update documentation 2012-12-06 23:51:35 +01:00
Thomas Mueller
35e55214e2 [Contacts API] example for searching added 2012-12-02 11:54:30 +01:00
Robin Appelman
d33f697a5f merge master into filesystem 2012-11-30 00:18:42 +01:00
Thomas Mueller
f99497a05a test for search and unregister added 2012-11-28 23:10:30 +01:00
Thomas Mueller
2d597c2238 first unit tests implemented 2012-11-28 23:10:00 +01:00
Thomas Mueller
5b1dea56e5 change name to IAddressBook 2012-11-28 23:08:15 +01:00
Thomas Mueller
fba8c776e1 plugin mechanism implemented 2012-11-28 23:07:09 +01:00
Jörn Friedrich Dreyer
eaa625c9bc Merge pull request #401 from owncloud/share_hooks 
Create functions to install standard hooks
 2012-11-28 04:35:52 -08:00
Jörn Friedrich Dreyer
995b5c0739 readd fallback code for pre token links 2012-11-23 15:51:57 +01:00
Robin Appelman
97380f3485 merge master into filesystem 2012-11-21 22:37:14 +01:00
Jörn Friedrich Dreyer
d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
Thomas Müller
d91c841f73 Merge pull request #383 from owncloud/contacts_api 
Proposal for a public contacts api
 2012-11-19 05:42:01 -08:00
Robin Appelman
bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Bart Visscher
530f3f8be9 Create functions to install standard hooks 
Also use these in tests that needs them
Fix #151
 2012-11-13 23:45:17 +01:00
Thomas Mueller
33a4dfa087 function isEnabled() added 2012-11-13 20:59:47 +01:00
Frank Karlitschek
5b44714f4c first version of the new previewer lib. It currently only created previews/thumbnails for images. It get´s more interesting when we add PDFs, movies, mp3, text files and more... 2012-11-13 15:11:02 +01:00
Thomas Tanghus
268a48479d Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-12 23:36:59 +01:00
Thomas Mueller
c3825112a0 public contacts api as discussed here https://github.com/owncloud/apps/issues/113 2012-11-12 23:25:32 +01:00
blizzz
e0fdb8272b Merge pull request #371 from butonic/sql_and_error_log_fixes 
add missing sql backticks, check sharing for error and add log
 2012-11-12 03:37:43 -08:00
Jörn Friedrich Dreyer
ba91f9a237 add missing sql backticks, check sharing for error and add log 2012-11-12 12:04:46 +01:00
Thomas Tanghus
82e010c51c Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-12 00:37:40 +01:00
Thomas Tanghus
56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Thomas Tanghus
7f0c69eb0e Added CRUDS permissions to the OCP namespace. Implements issue #345 2012-11-11 23:09:54 +01:00
Robin Appelman
961ff01a93 merge master into filesystem 2012-11-07 17:18:56 +01:00
Thomas Tanghus
1147dc9774 Merge branch 'master' of github.com:owncloud/core into vcategories_db 
Conflicts:
	lib/vcategories.php
 2012-11-05 12:06:59 +01:00
Felix Moeller
a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Robin Appelman
4b940955dd merge master into filesystem 2012-11-04 21:12:18 +01:00
Felix Moeller
bc4382c5c5 Checkstyle: fix the last NoSpaceAfterEquals 2012-11-04 18:31:44 +01:00
Thomas Tanghus
e6a7bba095 Merge branch 'master' of github.com:owncloud/core into vcategories_db 
Conflicts:
	lib/vcategories.php
 2012-11-04 12:31:06 +01:00
Felix Moeller
afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Thomas Tanghus
5550cde03b Merge branch 'master' of github.com:owncloud/core into vcategories_db 
Fix conflicts:
	core/ajax/vcategories/add.php
	core/ajax/vcategories/delete.php
 2012-10-30 06:53:49 +01:00
Tom Needham
bcdf3a23db Merge master into ocs_api 2012-10-28 11:16:04 +00:00
Tom Needham
07111ff672 Allow apps to pass defaults and requirements for their API calls 2012-10-28 11:04:23 +00:00
Robin Appelman
38371d1275 Merge branch 'master' into filesystem 2012-10-27 14:28:24 +02:00
Robin Appelman
5bfff6c56e use absolute paths when resolving mount points 2012-10-27 12:17:35 +02:00
Jakob Sack
d0bbd9416b Add BackgroundJob::setExecutionType() to public API 2012-10-27 10:15:39 +02:00
Robin Appelman
cbc71784c0 Merge branch 'master' into filesystem 2012-10-27 10:02:26 +02:00
Florian Hülsmann
a48734bcb5 fixed user/group sharing hooks 2012-10-26 23:15:37 +02:00
Robin Appelman
6db81afab9 move some stuff to the new api 2012-10-26 23:05:02 +02:00
Robin Appelman
4b616764e8 Merge branch 'master' into filesystem 2012-10-26 22:32:44 +02:00
Florian Hülsmann
b7bf28d1c7 Hook emission on sharing stuff 2012-10-26 20:53:32 +02:00
Robin Appelman
77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Thomas Tanghus
8cd268fc82 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-17 00:16:37 +02:00
Michael Gapczynski
c00f5d164f Fix unshareAll() 2012-10-16 16:27:23 -04:00
Michael Gapczynski
012ea1ed83 Add unshareAll() function to Share API 2012-10-16 15:38:52 -04:00
Thomas Tanghus
9c9f5ef2d6 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-15 21:41:38 +02:00
Bart Visscher
4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Thomas Tanghus
7a30f46543 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-10 23:00:46 +02:00
Robin Appelman
aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +02:00
Björn Schießle
003241e847 fix for bug #1942: Allow user to share with every group if "allow users to share with anyone" is set 2012-10-09 10:36:24 +02:00
Björn Schießle
8357754ff1 added "uid_owner" to select statement 2012-10-08 13:22:08 +02:00
Michael Gapczynski
5f462ec6f7 Fix - "Correct checking item source for share from same owner when generating item target" 2012-10-06 18:13:11 -04:00
Thomas Tanghus
2c1c7eadaf Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-02 23:24:54 +02:00
Michael Gapczynski
68c8faf39c Correct checking item source for share from same owner when generating item target 2012-10-02 16:37:39 -04:00