Jörn Friedrich Dreyer
5cae863408
change architecture from inheritance to composition
2014-06-18 12:53:20 +02:00
Vincent Petry
799205488c
Prevent loadApps on upgrade
...
Moved OC::needUpgrade() to OCP\Util::needUpgrade() to make it accessible
form the router.
Moved maintenance + upgrade check to the router.
2014-06-18 11:10:07 +02:00
Bernhard Posselt
93169eca1e
also handle lowercase headers
2014-06-11 01:20:09 +02:00
Bernhard Posselt
1002281dae
handle http accept headers more gracefully
2014-06-11 00:54:25 +02:00
Vincent Petry
5cebb6fb9b
Merge pull request #4553 from owncloud/update_search_classes
...
Update search classes
2014-06-06 13:24:16 +02:00
Jörn Friedrich Dreyer
aaf0d13171
make search non-static, add ISearch to server container, make legacy a static wrapper for it, move provider and result to public api
2014-06-06 01:17:02 +02:00
Bernhard Posselt
587a8df566
remove controller serializers
2014-06-05 18:00:36 +02:00
Thomas Müller
ec7225da66
remove file locking - code will continue to live in it's own app
2014-06-04 20:11:54 +02:00
ringmaster
54865815f5
Move Lock to private namespace, add interface. Update PHPDoc.
2014-06-04 07:55:45 +02:00
ringmaster
392a1b6662
Removed unused vars/declarations, update PHPDoc.
2014-06-04 07:55:45 +02:00
ringmaster
f9dbdb7c5c
Add actual locking and log changes necessary for debugging.
2014-06-04 07:55:44 +02:00
ringmaster
dc1e3620d2
Continued flock work.
2014-06-04 07:55:44 +02:00
ringmaster
5365ae416e
flock changes. Work in progress.
2014-06-04 07:55:44 +02:00
Morris Jobke
9a67986473
add OCP\Config:deleteSystemValue
2014-06-02 18:31:43 +02:00
Lukas Reschke
c8b5ae675c
Fix PHPDoc
...
- Remove not anymore existing parameters
- Fix typo
2014-06-01 21:46:05 +02:00
Robin Appelman
8c5521fdfc
Add $storage->instanceOfStorage to handle instanceof for storage wrappers
2014-05-29 13:45:50 +02:00
Bart Visscher
a51e9a5cfe
Merge pull request #8136 from owncloud/contactsmanager-register
...
Implement the register function of OC\ContactsManager
2014-05-27 22:35:50 +02:00
Bjoern Schiessle
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
Thomas Müller
8749442fec
no return on register and unregister
2014-05-19 21:39:19 +02:00
Thomas Müller
bb6fac1102
Merge branch 'master' into contactsmanager-register
...
Conflicts:
lib/private/contactsmanager.php
2014-05-19 21:35:13 +02:00
Morris Jobke
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Thomas Müller
95741f3936
Merge pull request #8435 from owncloud/fix-8322-master
...
Expose permission via WebDAV
2014-05-19 16:52:03 +02:00
Joas Schilling
ab7ae004f7
Automatically copy the share expiration date when new shares are created
...
Fix #4823
2014-05-19 01:38:47 +02:00
Björn Schießle
b52cb8f557
Merge pull request #8604 from owncloud/sharing_encforce_password
...
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
Bjoern Schiessle
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
Bernhard Posselt
9e36c33104
use fetch method instead of fetchRow because fetchRow is only an owncloud internal alias that exists purely for compability
2014-05-14 01:09:48 +02:00
Bernhard Posselt
512373fadf
provide a way to detect the language that is being used (e.g. for clientside javascript language selection
2014-05-14 01:09:48 +02:00
Robin McCorkell
f7e777f7d2
Fix various code errors detected by Scrutinizer
...
Fixed:
- An error with a misplaced bracket in lib/private/util.php
- An error with an incorrect function being called in lib/public/contacts.php
2014-05-13 19:09:14 +01:00
Robin McCorkell
87b548ed91
Fix all PHPDoc types and variable names, in /lib
2014-05-13 19:08:14 +01:00
Robin McCorkell
a7ae2e874a
Squash 'a | b' into 'a|b', in /lib
2014-05-13 19:08:14 +01:00
Robin McCorkell
b5bc37d2e4
Fix @return array PHPDocs, in /lib
2014-05-13 19:08:14 +01:00
Robin McCorkell
b653ad164b
Replace @returns with @return, in /lib
2014-05-13 19:08:14 +01:00
Thomas Müller
1d18fd4e6d
Merge pull request #8482 from owncloud/public-logger
...
Make logger available in the container
2014-05-12 16:40:58 +02:00
Morris Jobke
6499995474
Merge pull request #8477 from owncloud/better-controllers
...
Better appframework controllers
2014-05-12 01:07:49 +02:00
Morris Jobke
7a6ff56b13
Merge pull request #8274 from owncloud/appframework-db
...
Port database layer from appframework to core
2014-05-12 00:12:19 +02:00
Bernhard Posselt
1d45239c65
adjust license headers to new mail address
2014-05-11 17:54:08 +02:00
Bernhard Posselt
cb666c18d6
rename formatter to responder, formatResponse to buildResponse
2014-05-11 17:54:08 +02:00
Bernhard Posselt
80648da431
implement most of the basic stuff that was suggested in #8290
2014-05-11 17:54:08 +02:00
Bernhard Posselt
3af30625ab
Make db connection protected
2014-05-11 12:54:44 +02:00
Bernhard Posselt
9a4d204b55
add cors middleware
...
remove methodannotationreader namespace
fix namespace for server container
fix tests
fail if with cors credentials header is set to true, implement a reusable preflighted cors method in the controller baseclass, make corsmiddleware private and register it for every request
remove uneeded local in cors middleware registratio
dont uppercase cors to easily use it from routes
fix indention
comment fixes
explicitely set allow credentials header to false
dont depend on better controllers PR, fix that stuff later
split cors methods to be in a seperate controller for exposing apis
remove protected definitions from apicontroller since controller has it
2014-05-09 23:34:41 +02:00
Bernhard Posselt
b4298c68ca
- make logger available in the container
...
- inject logger class into log
- adding PHPDoc comments and fixing typos
2014-05-09 23:26:20 +02:00
Vincent Petry
390549c286
Merge pull request #8221 from owncloud/type-hinting-sharing
...
Type hinting fixes for sharing
2014-05-08 09:30:50 +02:00
Vincent Petry
4a493c8835
Some expected Sabre exceptions are now logged with DEBUG level
2014-05-07 11:43:50 +02:00
Thomas Müller
c92c577b5e
- Introduce isShared() and isMounted() on FileInfo class
...
- Reuse these methods on determineIcon()
- Generate permission string for the desktop client
- expose {http://owncloud.org/ns }permissions as additional WebDAV property containing the permission string
2014-05-02 17:37:16 +02:00
Bart Visscher
614cc67f88
Correct return type for getFilePath
2014-05-01 18:12:17 +02:00
Bart Visscher
c34659dd89
Better documentation for isValidSource function
2014-05-01 18:11:55 +02:00
Bart Visscher
66b1ad0a9b
Merge branch 'master' into type-hinting-sharing
...
Conflicts:
apps/files_sharing/lib/share/file.php
apps/files_sharing/tests/api.php
lib/private/share/share.php
2014-04-28 17:59:41 +02:00
Bart Visscher
fc9371ae10
Merge branch 'master' into contactsmanager-register
...
Conflicts:
lib/private/contactsmanager.php
2014-04-26 10:55:25 +02:00
Bernhard Posselt
5199e4508a
dont update entity and dont run an update query if an entity wasnt changed at all
2014-04-23 13:43:17 +02:00
Bjoern Schiessle
c4e0fb75a4
add api to get shares from a specific user
2014-04-23 12:54:24 +02:00
Joas Schilling
704b9e6a0d
Merge pull request #8009 from owncloud/feature/add-sharing-target
...
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-23 12:49:06 +02:00
Morris Jobke
0ebb4662ec
Merge pull request #8281 from owncloud/public-responses
...
make download and redirectresponse public
2014-04-22 00:08:04 +02:00
Lukas Reschke
e88731a477
Some more PHPDoc fixes
2014-04-21 15:44:54 +02:00
Bernhard Posselt
7e447f4f42
make download and redirectresponse public
2014-04-20 16:12:46 +02:00
Lukas Reschke
886c5177e7
Fix typo & add type
2014-04-20 01:09:25 +02:00
Bernhard Posselt
4a7e0561ca
move db into iservercontainer
2014-04-19 19:30:12 +02:00
Bernhard Posselt
95a83233a9
fix doc strings for db facade
2014-04-19 15:32:17 +02:00
Bernhard Posselt
93237d87ec
fix scrutinizer issues
2014-04-19 15:25:36 +02:00
Bernhard Posselt
f260951825
port database layer from appframework to core
2014-04-19 14:56:16 +02:00
Morris Jobke
a2a0eb370b
Merge pull request #8222 from owncloud/type-hinting
...
Type hinting fixes
2014-04-17 16:08:15 +02:00
Bart Visscher
cc8a4511fe
Fix PHPdoc in lib/public
...
using scrutinizer patch
2014-04-15 22:55:47 +02:00
Bart Visscher
a9bf3df82d
Fix PHPdoc in OC\Share\Share and OCP\Share
2014-04-15 21:05:44 +02:00
Lukas Reschke
b04d95b116
Remove uneeded usages of nosniff
2014-04-13 12:48:16 +02:00
Bart Visscher
5c412f480c
$key is not needed for registering contactsmanager callbacks
2014-04-10 18:06:31 +02:00
Bernhard Posselt
f06ef8aa4b
register middleware as string to not force request to be instantiated too early and thus not having url parameters
2014-04-09 23:59:57 +02:00
Joas Schilling
015b9b1dac
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-09 15:02:05 +02:00
Thomas Müller
73ac3d0fcd
Merge pull request #7643 from owncloud/chainable_response
...
Chainable Response in AppFramework
2014-04-08 22:42:43 +02:00
Thomas Müller
85e7921b14
fixing undefined exception classes
2014-04-07 20:57:08 +02:00
blizzz
0c444fb2fb
Merge pull request #8017 from Raydiation/master
...
Remove dependency on container, removing service locator antipattern
2014-04-07 10:19:18 +02:00
Thomas Müller
20f26068e7
Merge pull request #7476 from owncloud/type-hinting
...
Type hinting
2014-04-03 20:02:27 +02:00
Bernhard Posselt
5f3b8c45d7
Remove dependency on container, removing service locator antipattern
2014-04-02 17:54:33 +02:00
Bart Visscher
6b061c236d
Merge branch 'master' into type-hinting
...
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
2014-03-31 21:38:54 +02:00
Bjoern Schiessle
8e34812393
always encrypt files to owner
2014-03-31 18:19:48 +02:00
Vincent Petry
d0012e729a
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
...
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
Thomas Müller
1816f43722
Merge pull request #7864 from owncloud/routing-performance
...
Routing performance
2014-03-25 23:00:36 +01:00
Bjoern Schiessle
6afd496d9b
remove prepFileTarget() seems that it is no longer in use
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
b602662578
add a "helper" and a "hooks" class. Move constants needed by multiple classes
...
to a "constants" class
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
8b6d1d3bf2
added private share api
2014-03-25 17:47:24 +01:00
Robin Appelman
f17674fef2
Only load routes from the apps we need
2014-03-24 15:41:46 +01:00
Thomas Müller
3eb5898f7b
use \OC_Mail::validateAddress() to validate the email address - fixes #7862
2014-03-24 15:35:07 +01:00
Robin Appelman
0d0aac6fff
Load the routes when matching or generating a route instead of when creating the router
2014-03-24 14:55:03 +01:00
Lukas Reschke
2c561c9c50
Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords
...
Obfuscate passwords in ext storage config
2014-03-20 16:31:12 +01:00
Morris Jobke
970878b581
Merge pull request #7818 from owncloud/logException_undefined_variable
...
Fix 'Undefined variable: message' in OCP\Util::logException
2014-03-20 11:14:30 +01:00
Thomas Tanghus
51fe3b8ccd
Fix 'Undefined variable: message' in OCP\Util::logException
2014-03-20 10:23:40 +01:00
Vincent Petry
80180bea32
Added IV for ext storage password encryption
2014-03-19 11:42:22 +01:00
Thomas Müller
153eadd753
Merge branch 'master' into close-session-faster-master
2014-03-17 21:57:48 +01:00
Thomas Müller
756bbe8786
Merge pull request #7649 from owncloud/routing-public
...
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
Bjoern Schiessle
9d32475260
finally fix the paths for the OCS Share API
2014-03-13 15:16:59 +01:00
Bjoern Schiessle
36885dc64c
fix path creation for re-shares, issue #7662
2014-03-11 12:58:46 +01:00
Robin Appelman
4a2b16d76d
update copyright header
2014-03-10 14:40:05 +01:00
Thomas Müller
73a1ece753
adding an explicit close method to class session - write operations (set and remove) being called after close() will throw an exception
2014-03-10 14:21:12 +01:00
Robin Appelman
8ab7d18a6a
Move the router classes to a namespace and expose it with a public interface
2014-03-10 14:04:58 +01:00
Thomas Tanghus
a1aacc18df
Add @return PHPDocs
2014-03-10 09:31:30 +01:00
Thomas Tanghus
8f6ea900f2
Chainable Response in AppFramework
2014-03-09 23:01:16 +01:00
Robin Appelman
65f52fee4f
Fix FileInfo->getType errors
2014-03-07 14:52:44 +01:00
Bart Visscher
8951328a87
More PHPDoc updates
2014-02-28 21:03:43 +01:00
Bart Visscher
e2286c6598
Type is with a small letter
2014-02-28 14:37:20 +01:00
Bart Visscher
35a8dfb2fa
More PHPDoc fixes, using scrutinizer patches as hints
2014-02-28 13:53:41 +01:00
Bart Visscher
89e0763d3d
Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10N
2014-02-28 13:37:41 +01:00
Bjoern Schiessle
e3f676e009
fix path in sharing results if it is a file in the Shared folder
2014-02-25 17:27:23 +01:00
Lukas Reschke
719f1111b6
Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix
...
Added extra checks for invalid file chars in newfile.php and newfolder.php
2014-02-20 11:53:58 +01:00
Scrutinizer Auto-Fixer
adaee6a5a1
Scrutinizer Auto-Fixes
...
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720
Enabled analysis tools:
- PHP Analyzer
- JSHint
- PHP Copy/Paste Detector
- PHP PDepend
2014-02-19 09:31:54 +01:00
Thomas Müller
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
Vincent Petry
797e0a614c
Added extra checks for invalid file chars in newfile.php and newfolder.php
...
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
check for invalid characters
2014-02-18 17:54:32 +01:00
Lukas Reschke
3b1083f46e
Merge pull request #7176 from owncloud/style
...
Some style fixes
2014-02-18 17:30:26 +01:00
Thomas Müller
750ffa8231
Merge pull request #7156 from owncloud/backgroundjob-public
...
Add the background job list to the public server container
2014-02-14 23:11:10 +01:00
Thomas Müller
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
icewind1991
2a7509ee50
Merge pull request #6748 from owncloud/fileinfo
...
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
Thomas Müller
4b84e3a7e8
Merge pull request #4624 from owncloud/convert-oc_appconfig
...
Convert OC_Appconfig to object interface
2014-02-13 15:51:40 +01:00
Bart Visscher
2c6411b897
$default of OC_Config::[gs]etValue can have more then string as type
2014-02-12 17:38:32 +01:00
icewind1991
7af456730e
Merge pull request #6964 from owncloud/storagestatistics-reuse
...
Reuse the calculated free_space in buildFileStorageStatistics
2014-02-12 15:48:14 +01:00
Robin Appelman
62288971ca
Additional phpdoc
2014-02-12 13:32:16 +01:00
Robin Appelman
3aafa837b8
Remove internal methods from the public interface
2014-02-12 13:25:50 +01:00
Robin Appelman
60bd9d512d
Merge branch 'master' into backgroundjob-public
2014-02-12 13:21:47 +01:00
Vincent Petry
c442a03d3a
Merge pull request #7075 from owncloud/quota-storagexsendfile
...
Added isLocal() method to storage, used for xsendfile
2014-02-11 14:49:39 +01:00
Robin Appelman
a6399f9cef
Add the background job list to the public server container
2014-02-11 14:00:24 +01:00
Robin Appelman
a7c50514ac
Merge branch 'master' into convert-oc_appconfig
2014-02-11 13:26:54 +01:00
Robin Appelman
753af3a3ff
Merge branch 'master' into storagestatistics-reuse
2014-02-10 14:01:32 +01:00
Joas Schilling
b330d07b51
Fix more documentation failes
...
Issue #7111
2014-02-08 11:47:55 +01:00
Robin Appelman
b537d90e58
use the 'new' server container for appconfig
2014-02-07 13:45:59 +01:00
Bjoern Schiessle
a8943ad022
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 12:53:13 +01:00
Jörn Friedrich Dreyer
81031984a6
remove duplicate param lines for OCP\User::getUsers()
2014-02-07 12:12:16 +01:00
Vincent Petry
788c8540aa
Added isLocal() method to storage, used for xsendfile
...
Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.
2014-02-06 20:53:15 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
Robin Appelman
1e79369338
merge master into storagestatistics-reuse
2014-02-05 13:36:55 +01:00
Jan-Christoph Borchardt
0609f30d1c
Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg
...
Change misleading message when file size exceeds upload limit
2014-02-04 08:04:19 -08:00
icewind1991
a27529709b
Merge pull request #6647 from owncloud/memcache-public
...
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
Pellaeon Lin
099b71c712
Merge branch 'master' into pr-exceed_upload_limit_msg
...
Conflicts:
apps/files/templates/index.php
apps/files_sharing/templates/public.php
2014-01-30 22:50:20 +08:00
Robin Appelman
4e2b52a376
merge master into fileinfo
2014-01-29 16:33:27 +01:00
Thomas Müller
ab9ddda8f2
Merge pull request #6907 from owncloud/webdav-logexceptions
...
Added exception logger plugin for sabre connector
2014-01-27 07:48:40 -08:00
Robin Appelman
3c1ab66eda
Reuse the calculated free_space in buildFileStorageStatistics
2014-01-27 15:56:57 +01:00
Vincent Petry
11ef12a106
Added exception logger plugin for sabre connector
...
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.
This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.
This will make it much easier to debug syncing issues.
2014-01-27 11:40:17 +01:00
Robin Appelman
1ab7ca0a19
Fix some phpdoc errors and rename interface
2014-01-24 16:01:19 +01:00
Robin Appelman
fc5f20112e
Add isReadable, isUpdateable, isDeletable, isShareable
2014-01-24 15:54:40 +01:00
Jens-Christian Fischer
0f6c607171
added function documentation
2014-01-24 14:22:42 +01:00
Jens-Christian Fischer
506393090b
Add 'mail_from_address' configuration
...
In environments where there are rules for the email addresses, the "from
address" that owncloud uses has to be configurable.
This patch adds a new configuration variable 'mail_from_address'.
If it is configured, owncloud will use this as the sender of *all*
emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by
default). By using the 'mail_from_address' configuration, only this
email address will be used.
2014-01-24 14:04:37 +01:00
Robin Appelman
02aa44d055
Merge branch 'master' into memcache-public
2014-01-22 13:19:49 +01:00
Thomas Müller
9bab05fd45
Merge branch 'master' into fixing-gallery-password-protected-access-master
2014-01-21 19:36:20 +01:00
Thomas Müller
a3ea5aa2ac
fixing comment + adding unit test for checkPasswordProtectedShare
2014-01-21 12:07:08 +01:00
Thomas Müller
23a4d0d44e
OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error
2014-01-21 11:32:30 +01:00
Thomas Müller
6746ad0a73
in case no share is found for the given token we can return right away
2014-01-21 10:55:10 +01:00
Thomas Müller
9fd4cb1b66
adding password protection check to getShareByToken()
2014-01-21 10:42:47 +01:00
Robin Appelman
5cb08bb9cb
Merge branch 'master' into fileinfo
...
Conflicts:
tests/lib/files/cache/cache.php
2014-01-17 14:47:29 +01:00
Björn Schießle
32e941a2bc
Merge pull request #6644 from ben-denham/unshare-all-fix
...
\OCP\Share::unshareAll() fix
2014-01-16 03:13:26 -08:00
Robin Appelman
82762bb462
remove ArrayAccess, JsonSerializable from the public part of FileInfo
2014-01-13 15:13:45 +01:00
Robin Appelman
39d2c18793
Extends phpdoc for \OCP\File\FileInfo
2014-01-13 14:42:14 +01:00
Robin Appelman
617acbd6f9
Add a FileInfo class which holds all info of a file and return that from getFileInfo, getDirectoryContent and search
2014-01-13 14:28:49 +01:00
Robin Appelman
5d456c7cc2
Merge branch 'master' into memcache-public
2014-01-09 13:54:58 +01:00
Robin Appelman
d50c7391d8
Use $server->getMemCacheFactory() in ldap connection
2014-01-09 13:54:50 +01:00
Robin Appelman
5a2a0426a6
Also update the OCP\IServerContainer
2014-01-08 15:51:40 +01:00
Robin Appelman
be7837402d
get the memorycache factory from OCP\Server instead of a cache instance
...
this allows apps to specify a prefix to use
2014-01-08 15:18:12 +01:00
Thomas Müller
2d5427efa9
Merge pull request #6290 from owncloud/files-androidcontentdisposition
...
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
Robin Appelman
4d65a80892
Remove the static dependency on OC_Util from Memcache
2014-01-06 13:11:38 +01:00
ben-denham
baccc8f584
Unshare all will now delete all shares for the item, instead of only for a single owner.
2014-01-06 11:14:43 +13:00
Thomas Müller
aa17a896ac
fix return statement
2013-12-19 00:33:29 +01:00
Thomas Müller
5eae75eeca
kill MDB2 in PHPDoc
2013-12-19 00:32:46 +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
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
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
Robin Appelman
e2efad6ae7
Also add default to the \OCP\IConfig interface
2013-12-16 14:33:03 +01:00
Robin Appelman
4c45c6f418
dont try to register background jobs if we haven't upgraded yet
2013-12-13 17:15:18 +01:00
Jörn Friedrich Dreyer
6408125edc
rely only on php DateTime to parse the db datetime string
2013-12-13 16:38:05 +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
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
Pellaeon Lin
fc607e6bce
Separate PHP upload limit and free space
2013-12-08 22:59:46 +08:00
Bjoern Schiessle
3f7aac1a79
add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired.
2013-12-05 17:29:15 +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
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
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
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
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
Owen Winkler
844b4785f1
Merge pull request #6034 from owncloud/fix-api-documentation
...
Fix api documentation
2013-11-25 11:17:16 -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
Morris Jobke
248eed16a6
fix defaults.php doc
2013-11-25 14:26:26 +01:00
Morris Jobke
b7ddc78626
fix db.php doc
2013-11-25 14:06:25 +01:00
Thomas Müller
993fea2f05
fix appframework routing
2013-11-25 11:36:33 +01: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
Arthur Schiwon
f94a6eb166
Add missing Avatar Interface
2013-11-22 00:43:23 +01:00
Arthur Schiwon
00071401d7
Round out Avatar Public API
2013-11-21 23:40:25 +01:00
Robin Appelman
abc428916c
Fix fatal error when trying to open a non existing public link
2013-11-12 15:38:00 +01:00
kondou
507325dd50
Add public API for \OC\Avatar
2013-11-07 12:48:40 +01:00
Morris Jobke
ef592981ea
unify license headers for public API files
2013-11-03 13:51:39 +01:00
Morris Jobke
d2a48d58ce
fix "No page-level DocBlock"
2013-11-03 13:38:25 +01:00
Andreas Fischer
7c1f0da0fe
Always select item_source.
2013-11-03 12:34:40 +01:00
Andreas Fischer
fa56aec4b8
Deduplicate expiration date check into a method.
2013-11-03 12:34:38 +01:00
Andreas Fischer
779b87d46a
Use unshareItem() when unsharing expired shares.
2013-11-03 12:33:34 +01:00
Andreas Fischer
ebf1694795
Use unshareItem() in unshareAll().
2013-11-03 12:33:34 +01:00
Andreas Fischer
1d1f5b288e
Extract unshare() code into unshareItem().
2013-11-03 12:33:34 +01:00
Andreas Fischer
329299e34c
OCP\Share::unshareAll(): Deduplicate hook parameters.
2013-11-03 12:33:31 +01:00
Morris Jobke
0dbe90cc9a
fix documentation stuff
2013-10-31 19:00:53 +01:00
Thomas Müller
1317b7c03d
pass the name of the item source from the browser to the server - no need to get the data via complicated db queries
2013-10-23 18:39:37 +02:00
Thomas Müller
1909288fcb
Merge branch 'master' into fix-sharing-code
2013-10-23 17:16:16 +02:00
Thomas Müller
8c69a5388e
Merge pull request #5478 from owncloud/core-logexceptionstacktrace
...
Expand exception stack trace in log in debug mode
2013-10-23 07:19:14 -07:00
Vincent Petry
c4dee281e6
Added $app parameter to logException
2013-10-23 13:58:42 +02:00
Vincent Petry
42c58220de
Moved logException to OCP\Util class
2013-10-23 10:48:27 +02: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
408e0022dd
Merge pull request #5249 from owncloud/activities-api
...
[OC6] Activities api
2013-10-21 13:21:17 -07:00
Morris Jobke
1f1fcc6129
Remove "link" shares right after disabling the "allow_link_share" setting
2013-10-18 11:37:13 +02:00
Michael Gapczynski
4cf328e3b9
Don't return links for shared files if disabled
2013-10-18 10:34:30 +02:00
Morris Jobke
f9bbfad3e5
Fix sharing error message - id -> file name
...
fixe #2827
2013-10-17 16:45:11 +02:00
Morris Jobke
30f4d91d01
Public API documentation fixes
...
refs #4883
* http/response.php
* config.php
* response.php
* files.php
* idbconnection.php
* app.php
* user.php
* template.php
* share.php
* db.php
* icache.php & il10n.php
2013-10-17 00:49:15 +02: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
852a50aa89
remove test code
2013-10-16 15:38:56 +02:00
Thomas Müller
8c2b0b1394
Merge branch 'master' into activities-api
2013-10-16 15:36:35 +02: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
Thomas Tanghus
d75d80ba13
OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller
2013-10-11 10:07:57 +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
Bjoern Schiessle
7fe493fdb8
make sure that we only find file/folder shares
2013-10-09 17:25:58 +02:00
Thomas Müller
053b55721d
Merge branch 'master' into fixing-appframework-master
2013-10-08 12:13:24 +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
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
aefea2a408
remove unused classes
2013-10-07 11:25:06 +02:00
Thomas Müller
e071bfc144
fixing SecurityMiddleware to use OC6 API
2013-10-07 00:33:54 +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
Thomas Tanghus
47b2007228
Remove misleading IMiddleware interface
2013-10-05 19:13:12 +02: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
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
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
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
Vincent Petry
f3594904c2
Removed $fromTime argument from public template API
2013-10-04 14:45:12 +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
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
Thomas Müller
4d4eda0f06
fixing namespace of ApacheBackend - now know as OCP\Authentication\IApacheBackend
2013-10-02 15:03:52 +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
Thomas Müller
0d7c36c9f1
adding PHPDoc comment
2013-10-02 01:13:02 +02:00
Thomas Müller
0537960dcc
adding getCurrentUserId() to ApacheBackend
2013-10-01 22:56:47 +02:00
Thomas Tanghus
a2cabd4c2a
Remove getContent() from IRequest
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
36d1156cf8
Add interface docs to IRequest.
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
d8ada370d7
Squashed commit of the following:
...
commit ae1f68ac54cf2878d265b2bbce13bd600d2d0719
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu Aug 22 11:45:27 2013 +0200
fixing undefined variable
commit 982f327ca10eea0a2222eae3e74210648591fd8a
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 12:00:14 2013 +0200
adding login.php as alternative for index.php/login
commit da0d7e1d096fb80789524b01f0f96fe08d147943
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 11:36:12 2013 +0200
adding a route for web login
commit 8e2a01160485cf7e9a2eb8bf46f06fae73956e8e
Author: Karl Beecher <karl@endocode.com>
Date: Tue Aug 6 17:00:28 2013 +0200
Login attempt returns true instead of exiting immediately
commit fd89d55de9e71e986e03a0de9aad9407b632e22f
Author: Karl Beecher <karl@endocode.com>
Date: Mon Aug 5 15:31:30 2013 +0200
Further abstraction.
This change introduces the ApacheBackend interface for backends that
depend on Apache authentication and session management. There are no
longer references to specific backends in OC_User.
commit 469cfd98aea5a37985722cf5f9e00ece0ce38178
Author: Karl Beecher <karl@endocode.com>
Date: Thu Aug 1 15:46:36 2013 +0200
Make login attempt function protected.
commit d803515f19ff086e2028fcaa51afae579685e596
Author: Karl Beecher <karl@endocode.com>
Date: Wed Jul 31 16:00:22 2013 +0200
Amends the login link
When using a Shibboleth login, clicking logout displays a message to the
user instead of ending the session.
commit aa8c1fcea05c8268f26a10b21c4e0bc547c3414f
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 13:15:59 2013 +0200
Abstract Shibboleth authentication into an Apache authentication method
commit 69082f2ebcab267f6e8eceb1a252f84c52236546
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 11:22:26 2013 +0200
Convert spaces -> tabs
commit 5a80861d86855eec5906fd5e235ac4ff12efb0f2
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:40:48 2013 +0200
Separate the authentication methods
SABRE authentication and base authentication have slightly different
workings right now. They should be refactored into a common method
later, but time pressure requires us to reinvent the wheel slightly.
commit dc20a9f8764b103b7d8c5b713f2bcdae18708b65
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:07:07 2013 +0200
Authenicate calls to WebDAV against Shibboleth.
When using WebDAV, the OC_Connector_Sabre_Auth::authenticate method is
normally called without trying the Shibboleth authentication... thus the
session is not established.
The method now tries Shib authentication, setting up a session if the
user has already authenticated.
commit 091e4861b2246c4084c9b30e232289fde4ba1abf
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 14:04:54 2013 +0200
Sets up the Shibboleth login attempt.
commit bae710ec0579ef99b23022cc12f6876c5fe6b0d5
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 12:36:44 2013 +0200
Add a method for attempting shibboleth login.
If the PHP_AUTH_USER and EPPN environment variables are set, attempt a
Shibboleth (passwordless) login.
commit 667d0710a7854e58fb109201d9cee6ec064e793a
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:38:04 2013 +0200
Revert "Adds the apps2 folder with user_shibboleth backend."
This reverts commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef.
commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:28:06 2013 +0200
Adds the apps2 folder with user_shibboleth backend.
Conflicts:
core/templates/layout.user.php
lib/base.php
2013-10-01 14:29:01 +02:00
Bjoern Schiessle
029abc9c43
mail is already themable via the template, no need to provide additional string in OC_Defaults
2013-09-30 10:03:12 +02:00
Thomas Müller
48b5c1d5f9
initial implementation of activity manager
2013-09-29 20:31:12 +02:00
Thomas Müller
2e1e283592
Merge branch 'appframework-master' into activities-api
...
Conflicts:
lib/public/iservercontainer.php
2013-09-29 20:10:07 +02:00
Thomas Müller
687ba053b7
Merge branch 'master' into appframework-master
2013-09-27 14:25:47 +02:00
Thomas Müller
735608f513
Merge pull request #4207 from owncloud/search_shared_files
...
add initial search in shared files
2013-09-27 05:18:12 -07:00
Thomas Müller
469b309b21
Merge pull request #4892 from owncloud/vcategories_public
...
OC_VCategories => OC\Tags. Public interface and getter in server container
2013-09-25 14:24:37 -07:00
Bjoern Schiessle
acd3c11e47
use OC_DB::executeAudited
2013-09-25 12:18:29 +02:00
Bjoern Schiessle
5a9e473a79
use OC_DB::executeAudited
2013-09-25 12:15:46 +02:00
Bjoern Schiessle
3cd0caa643
set default value for expire parameter
2013-09-25 12:15:30 +02:00
Bjoern Schiessle
883d1c0df3
use template for txt and html mails to send notification mails
2013-09-25 11:51:28 +02:00
Thomas Müller
b168d5aa3b
class API decommissioning part 1
2013-09-25 11:05:24 +02:00
Thomas Müller
b2ef978d10
AppFramework:
...
- get request from the server container
- implement registerMiddleWare()
- adding getAppName() to app container
2013-09-25 10:30:48 +02:00
Thomas Müller
db39fede97
Merge branch 'master' into appframework-master
...
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +02:00
Bjoern Schiessle
ca47fc5f18
fix PHPDoc
2013-09-24 19:37:24 +02:00
Bjoern Schiessle
0637dad0b3
some small fixes
2013-09-24 18:52:20 +02:00
Thomas Tanghus
aaed871cee
Add factory class for the server container.
2013-09-24 17:10:01 +02:00
Arthur Schiwon
d101ff42f1
User: move checkPassword from User to Manager to not break API
2013-09-24 13:46:30 +02:00
Thomas Müller
cd2421c7ee
adding PHPDoc comments to getBackend
...
ensure getChildren() is called on an instance of Share_Backend_Collection
2013-09-24 10:37:58 +02:00
Thomas Tanghus
8c469394e6
Remove duplicate method definitions
2013-09-24 00:12:23 +02:00
Thomas Tanghus
698394c994
Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods
...
Conflicts:
lib/public/iservercontainer.php
lib/server.php
2013-09-24 00:09:21 +02:00
Thomas Tanghus
4d3e7fa78a
Add getUserFolder/getAppFolder to Server.
2013-09-23 23:57:39 +02:00
Thomas Tanghus
1bbeb12e2e
Updated method names and added a few more tests.
2013-09-23 23:39:36 +02:00
Thomas Tanghus
45f73feb69
OC_VCategories=>OC\Tags. Public interface + getter in server container
2013-09-23 23:39:36 +02:00
Andreas Fischer
437858852c
Merge pull request #4856 from owncloud/fix-link-expiration
...
Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)
* owncloud/fix-link-expiration:
Perform expiration date checking before returning share data for token.
Tests whether expired/valid link share is still accessible.
2013-09-23 15:12:38 +02:00
Bjoern Schiessle
fc76a13c52
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/public/share.php
2013-09-23 11:18:00 +02:00
Bart Visscher
0c6dcdba6b
Add missing implements and fix parameters in IConfig
2013-09-20 22:45:22 +02:00
Thomas Müller
f83f323269
fixing typos + adding missing filed $activeEntry
2013-09-20 21:45:27 +02:00
Thomas Müller
e31f6c01e8
fixing PHPDoc
2013-09-20 21:43:17 +02:00
Thomas Müller
9116303cfc
fixing typos
2013-09-20 21:40:54 +02:00
Bart Visscher
e92abfd4d8
Add Config container class to server container
2013-09-20 20:21:24 +02:00
Bart Visscher
e3013c5801
Add Navigation class to server container
2013-09-20 20:20:01 +02:00
Thomas Müller
1b59003d6d
adding basic interfaces for the activities api
2013-09-20 16:37:52 +02:00
Bart Visscher
aa8a85f77d
Add DBConnection to server container
2013-09-20 14:33:45 +02:00
Bart Visscher
ac73ce1b2a
Add UserSession to server container
2013-09-20 14:32:43 +02:00
Bjoern Schiessle
944e9b8c69
make sure that both $permissions and $oldPermissions have the same type
2013-09-20 12:40:21 +02:00
Jörn Friedrich Dreyer
e8bf576184
add initial search in shared files
2013-09-19 21:08:32 +03:00
Thomas Tanghus
d5126dd6b4
Merge branch 'appframework-master' into server_folder_methods
2013-09-19 12:32:32 +02:00
Thomas Müller
1274d6116d
updating php docs
2013-09-18 22:22:51 +02:00
Thomas Tanghus
dd62ccdb4e
Merge branch 'appframework-master' into public_cache
...
Conflicts:
lib/public/iservercontainer.php
lib/server.php
2013-09-18 13:20:07 +02:00
Thomas Tanghus
6ba23912a7
Add getUserFolder/getAppFolder to Server.
2013-09-18 12:34:10 +02:00
Thomas Tanghus
d3f88ceeb4
Add some docs to the sessions interface.
2013-09-18 12:01:01 +02:00
Bjoern Schiessle
1a60aa2b6a
only remember password if the user changes the permissions, otherwise the user disabled the password protection
2013-09-18 11:49:02 +02:00
Thomas Tanghus
5bddb5377a
Purge session from Request - and fix some styles
2013-09-17 18:38:18 +02:00
Thomas Tanghus
5c19b995db
Add interface for Session and add getter in server container.
2013-09-17 18:31:14 +02:00
Thomas Tanghus
fe86182dac
OC_Cache namespace changes and add UserCache to server container.
...
Refs #4863
2013-09-17 17:46:33 +02:00
Thomas Müller
b9e943f5d5
fix naming
2013-09-17 09:42:14 +02:00
Thomas Müller
4cd0ee47a8
Merge branch 'master' into appframework-master
2013-09-17 09:39:45 +02:00
Thomas Müller
822daa8f8a
class files have to be lowercase
2013-09-17 00:27:22 +02:00
Thomas Müller
981a41e2cd
adding interface for middleware
2013-09-17 00:26:55 +02:00
Andreas Fischer
a92d4c2c09
Perform expiration date checking before returning share data for token.
2013-09-16 21:24:17 +02:00
Bjoern Schiessle
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
Thomas Tanghus
eab84d3d96
Add OCP\DB::getErrorMessage() to public namespace.
2013-09-16 02:17:39 +02:00
Thomas Müller
af0069bf03
adding getRootFolder() to server container and hooking up the new files api
2013-09-15 22:24:57 +02:00
Thomas Müller
4480b0b164
Merge branch 'master' into appframework-master
2013-09-13 23:31:59 +02:00
Thomas Müller
4da8fc6907
Merge branch 'appframework-master' of github.com:owncloud/core into appframework-master
2013-09-13 20:57:18 +02:00
Thomas Müller
5b3388c7c4
Merge branch 'master' into appframework-master
2013-09-13 20:56:49 +02:00
Robin Appelman
58ed78aa9e
cleanup public storage interface a bit
2013-09-12 21:58:32 +02:00
Robin Appelman
c9d2663159
Merge branch 'master' into fileapi-foreward
2013-09-12 21:43:35 +02:00
Robin Appelman
2e5ce091f0
add storage backend interface to public namespace
2013-09-10 20:13:47 +02:00
Robin Appelman
9ad7891b4e
improve phpdoc for the public files interface
2013-09-10 20:10:25 +02:00
Robin Appelman
e271a55783
move filesystem expceptions to global namespace
2013-09-10 19:44:23 +02:00
Robin Appelman
315344eb9c
move public files api to a clearer namespace
2013-09-10 19:34:38 +02:00
Robin Appelman
2e1b534957
update phpdoc for public fileapi
2013-09-06 20:55:47 +02:00
Robin Appelman
0131a32025
extract interfaces from fileapi for public namespace
2013-09-06 20:38:59 +02:00
Bjoern Schiessle
b8241aa79d
remove some more debug output
2013-09-06 16:07:54 +02:00
Bjoern Schiessle
edb78c917c
remove some error_logs
2013-09-06 16:07:45 +02:00
Bjoern Schiessle
d33fabd02d
remove error logs
2013-09-06 16:07:25 +02:00
Bjoern Schiessle
627b6164c4
if the files doesn't exist yet we start with the parent to search for shares
2013-09-06 16:07:07 +02:00
Bjoern Schiessle
f8563ec583
Merge branch 'master' into sharing_mail_notification_master
...
increased version number to trigger db update
Conflicts:
lib/util.php
2013-09-05 13:39:45 +02:00
Thomas Müller
7618cf3005
adding public interface for preview
2013-09-04 23:45:11 +02:00
Thomas Müller
835f477d8f
Merge branch 'master' into appframework-master
2013-09-04 23:15:17 +02:00
Bjoern Schiessle
931e90634e
fix db queries
2013-09-02 17:03:35 +02:00
Bjoern Schiessle
983da0d78f
fix db queries
2013-09-02 17:01:10 +02:00
Bjoern Schiessle
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
kondou
e5fc7b9dbe
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/base.php
2013-09-02 07:58:06 +02:00
Frank Karlitschek
c54994d2e9
fixing this obvious typo directly
2013-09-01 08:23:11 +02:00
Thomas Müller
206f83941b
move new interfaces into lib/public and OCP
2013-08-31 21:34:29 +02:00
Thomas Müller
97bdf008b1
PHPDoc added to existing interfaces
2013-08-31 20:57:16 +02:00
Thomas Müller
ec9b7d1e84
fixing file header
2013-08-31 01:41:24 +02:00
Bjoern Schiessle
4bbefdf608
add expiration date if it is already set
2013-08-30 17:20:10 +02:00
Bjoern Schiessle
10cf1b3a4e
return mailSend status in getItems()
2013-08-30 15:39:43 +02:00
Bjoern Schiessle
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
Thomas Müller
14b67d6c5f
fixing typo
2013-08-29 16:25:25 +02:00
Thomas Müller
21fd352c1a
as a quick example the public contacts API has been ported over as a service hosted within the server container
2013-08-26 23:48:18 +02:00
Thomas Müller
a995e81686
Merge branch 'master' into appframework-master
2013-08-26 21:31:15 +02:00
Georg Ehrke
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
Arthur Schiwon
958130e8fe
Sharing: only determine path root if owner is available
2013-08-22 00:00:40 +02:00
Thomas Müller
38f9df4293
introducing OCP\AppFramework\App
2013-08-21 01:02:15 +02:00
Thomas Müller
911bd3c16f
moving response classes over to OCP
2013-08-21 01:00:26 +02:00
Thomas Müller
e39083c36f
typo
2013-08-21 00:58:33 +02:00
Thomas Müller
ba029ef4b2
initial setup of the server container
2013-08-21 00:58:15 +02:00
Thomas Müller
f115b94927
Introducing IRequest
2013-08-20 17:53:58 +02:00
Thomas Müller
6e1946ab00
Introducing IContainer into public api
2013-08-20 17:22:33 +02:00
kondou
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
Georg Ehrke
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
Björn Schießle
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
kondou
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
Bjoern Schiessle
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
kondou
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
Bjoern Schiessle
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
Georg Ehrke
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
Bjoern Schiessle
9253627327
cancel sharing if some users doesn't have a working encryption set-up.
2013-08-01 13:04:55 +02:00
Thomas Müller
17c36b5074
fixes #4026
2013-07-30 10:26:42 +02:00
Thomas Müller
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
Georg Ehrke
1e4ec2ac27
add class='preview-icon' to rows in file app that make use of previews
2013-07-29 15:47:17 +02:00
Robin Appelman
1b50154c95
functions in OCP should be static
2013-07-25 15:25:17 +02:00
Jörn Friedrich Dreyer
cb4cf3e2f7
need to use \OC_Image to escape OCP namespace
2013-07-22 17:25:55 +02:00
Robin Appelman
d509a0c403
return result from getL10N
2013-07-22 15:52:02 +02:00
Bart Visscher
9bf12da750
Merge pull request #3880 from owncloud/code-checker
...
Add classes replaced by the public api to the code checker
2013-07-21 11:19:20 -07:00
Morris Jobke
05c83a163a
add proper deprecated tag
2013-07-21 10:30:00 +02:00
Jan-Christoph Borchardt
48267b6e6c
add back public API function, but mark as deprecated
2013-07-20 01:15:12 +02:00
Bart Visscher
cbe1c22b5f
Correct casing of OC_User and pass through the params to getUsers
2013-07-19 17:32:31 +02:00
Bart Visscher
a22940d3cd
Add OC_L10N to public api
2013-07-19 11:40:11 +02:00
Bart Visscher
9379cbf602
Add OC_Image to public api
2013-07-19 11:23:47 +02:00
Jan-Christoph Borchardt
48948ccf5f
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
2013-07-18 22:15:26 +02:00
icewind1991
3abe68176f
Merge pull request #3270 from owncloud/convert-oc_config
...
Convert OC_Config to object so it can be used for DI
2013-07-11 18:21:08 -07:00
Georg Ehrke
53830f2f75
implement use of previews in sharing app
2013-07-11 11:58:52 +02:00
Georg Ehrke
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
Victor Dubiniuk
5a3fce12a4
Implement encodePath
2013-07-09 17:46:11 +03:00
Michael Gapczynski
4feff3456b
Only emit permissions hook for files and and include path
2013-07-08 17:28:18 -04:00
Bart Visscher
52553c64ed
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
2013-07-08 17:59:50 +02:00
Michael Gapczynski
5c2a0325ba
Add update permissions hook to sharing
2013-07-08 11:40:10 -04:00
Thomas Müller
98da4bf704
removing unused getSharedItem()
2013-07-06 00:04:01 +02:00
Thomas Müller
dad91c156f
Merge branch 'master' into fixing-3942-master
...
Conflicts:
apps/files/ajax/upload.php
2013-07-06 00:02:11 +02:00
Thomas Müller
e159cbf527
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
2013-07-05 17:39:41 +02:00
Thomas Müller
352c1415be
proper fix for getting the shared item if no user is logged in
2013-07-05 13:45:21 +02:00
Bart Visscher
ad9458e85d
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
2013-07-04 18:23:47 +02:00
Björn Schießle
6cfa016c39
add public api
2013-07-04 10:11:55 +02:00
Thomas Müller
bb07dde988
Merge branch 'master' into convert-oc_config
2013-07-01 23:43:00 +02:00
Jörn Friedrich Dreyer
f3c4a37a78
Merge pull request #3832 from owncloud/oracle_sql_fixes
...
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-28 10:22:59 -07:00
Bart Visscher
6ad7a0336f
Oracle doesn't know & as bitwise AND
...
Conflicts:
lib/public/share.php
2013-06-28 15:48:49 +02:00
Bart Visscher
c6bbccc776
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
lib/setup.php
2013-06-27 17:54:17 +02:00
Jörn Friedrich Dreyer
5d51118cb2
fix type of numeric columns
2013-06-26 20:03:24 +02:00
Jörn Friedrich Dreyer
bf49edde6b
check item id is set
2013-06-26 19:57:28 +02:00
Georg Ehrke
39c387eed4
implement server side use of previews
2013-06-26 18:04:22 +02:00
Jörn Friedrich Dreyer
b32d6d8487
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-24 22:52:01 +02:00
Georg Ehrke
1a933a9173
Merge branch 'master' into oc_preview
2013-06-17 12:31:02 +02:00
Jörn Friedrich Dreyer
961a001af3
add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup
2013-06-14 12:18:20 +02:00
Jörn Friedrich Dreyer
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
Georg Ehrke
85ecec8b01
Merge branch 'master' into oc_preview
2013-06-06 11:13:55 +02:00
Michael Gapczynski
1c61732193
Merge branch 'master' into convert-oc_config
2013-06-03 18:06:13 -04:00
Jörn Friedrich Dreyer
96b1e54d4a
Merge pull request #3444 from owncloud/share-fix
...
Fix undefined index for share mount point retrieval
2013-06-03 11:35:06 -07:00
Robin Appelman
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
Florin Peter
1337f48d64
fixes for pgsql
2013-05-29 20:41:07 +02:00
Florin Peter
f1b884aa5d
changed deprecated class
2013-05-29 20:15:04 +02:00
Florin Peter
353d19d183
fixes if cache returns false
2013-05-29 20:11:13 +02:00
Florin Peter
c8d1cd224d
fix $parent/$source typo
2013-05-29 19:58:05 +02:00
Björn Schießle
ae0f37e9e2
fix indention
2013-05-29 15:37:27 +02:00
Björn Schießle
8587f565d2
remove unnecessary variable
2013-05-29 15:14:15 +02:00
Björn Schießle
63a2bec6e5
use public API for error handling; improved while condition
2013-05-29 14:40:47 +02:00
Björn Schießle
893a1ed6f5
for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists
2013-05-29 14:19:18 +02:00
Björn Schießle
672811c103
if one public link share was found, we don't have to check it for the other folders
2013-05-29 13:12:30 +02:00
Björn Schießle
b44192f366
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
2013-05-29 13:10:26 +02:00
Georg Ehrke
af57996d1e
Merge branch 'master' into oc_preview
2013-05-25 12:16:25 +02:00
Michael Gapczynski
7a0c592f93
Fix undefined index for share mount point retrieval
2013-05-21 20:21:19 -04:00
Georg Ehrke
0305ee50c5
Merge branch 'master' into oc_preview
2013-05-17 11:41:30 +02:00
Florin Peter
d7dc710c8b
revert changes
2013-05-17 01:22:30 +02:00
Björn Schießle
95297c2469
add pre-shared hooks
2013-05-16 17:44:28 +02:00
Florin Peter
0916769f67
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
2013-05-15 17:00:01 +02:00
Florin Peter
751487ded7
merge changes for files_encryption
2013-05-15 10:20:19 +02:00
Florin Peter
226aec8d56
Merge branch 'master' into files_encryption
2013-05-15 03:22:06 +02:00
Bart Visscher
e620286b25
Fix returns of values in OCP\Config
2013-05-07 20:07:28 +02:00
Robin Appelman
b7585050b5
Move legacy backgroundjob classes to a place where they can be autoloaded
2013-05-03 16:42:48 +02:00
Michael Gapczynski
73d7cae6df
One more mount point fix
2013-05-02 18:22:43 -04:00
Robin Appelman
809b5f81f6
Further seperation of mount management logic
2013-04-26 00:01:36 +02:00
Robin Appelman
b31dc10c3c
Add support for the old public backgroundjob api
2013-04-24 14:40:49 +02:00
Robin Appelman
117412272e
Update documentation for \OCP\BackgroundJob
2013-04-24 14:24:28 +02:00
Sam Tuke
4aa80d02be
Merge branch 'master' into files_encryption
2013-04-23 14:13:40 +02:00
Georg Ehrke
ec3e97f28f
Merge branch 'master' into oc_preview
2013-04-22 16:19:16 +02:00
Björn Schießle
b5cb5dab51
fix encryption to owncloud user for public link shares
2013-04-22 14:30:10 +02:00
Björn Schießle
b24a673714
the owner uid is not interesting. We want to get all users who have access to the given item source, no matter from whom it was shared
2013-04-22 14:12:18 +02:00
Robin Appelman
7948341a86
Rework background job system
2013-04-20 23:27:46 +02:00
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