6131 Commits

Author	SHA1	Message	Date
Lukas Reschke	e35feadac2	Pass \OC::$WEBROOT to the ctr	2014-11-27 14:50:14 +01:00
Lukas Reschke	fef32e63dd	Remove redundant code	2014-11-27 14:38:38 +01:00
Lukas Reschke	d197f43475	Use server container	2014-11-27 14:36:11 +01:00
Lukas Reschke	048139074d	Add functions to modify cookies to response class ... Currently there is no AppFramework way to modify cookies, which makes it unusable for quite some use-cases or results in untestable code. This PR adds some basic functionalities to add and invalidate cookies. Usage: ```php $response = new TemplateResponse(...); $response->addCookie('foo', 'bar'); $response->invalidateCookie('foo'); $response->addCookie('bar', 'foo', new \DateTime('2015-01-01 00:00')); ``` Existing cookies can be accessed with the AppFramework using `$this->request->getCookie($name)`.	2014-11-27 14:19:00 +01:00
Joas Schilling	0ed86c0993	Move OC_USER_BACKEND_* constants to OC_User_Backend class	2014-11-27 13:47:32 +01:00
Joas Schilling	24511c6f00	Move OC_GROUP_BACKEND_* constants to OC_Group_Backend class	2014-11-27 13:47:30 +01:00
Joas Schilling	a2172786a8	Merge pull request #12449 from owncloud/issue/12444-namespace-exceptions ... Issue/12444 namespace exceptions	2014-11-27 12:14:06 +01:00
Morris Jobke	f52ba9c73c	Merge pull request #12418 from owncloud/delete_previews ... delete old previews	2014-11-27 12:09:39 +01:00
Joas Schilling	4f1bbc4fd5	Remove unused 2nd parameter of buildPath() and rename to getSourcePath()	2014-11-27 11:19:20 +01:00
Joas Schilling	20237fba47	Introduce getSourcePath() in Storage\Local to reduce the difference to MappedLocal	2014-11-27 11:19:18 +01:00
Vincent Petry	a74822279c	Merge pull request #12464 from owncloud/cache-available-languages ... Cache results of available languages	2014-11-27 11:12:18 +01:00
Joas Schilling	ea3780f911	Replace exception with standard exception	2014-11-27 11:10:05 +01:00
Joas Schilling	e1f3abf7a5	Correctly namespace and autoload DatabaseException	2014-11-27 11:10:04 +01:00
Vincent Petry	51190f711d	Merge pull request #12451 from owncloud/issue/6101-remove-gettype-class ... Move constants from GET_TYPE to OC\Files so they can be autoloaded	2014-11-27 11:03:55 +01:00
Lukas Reschke	b20d698ebd	Cache results of available languages ... This function is about 8 times calles for every single page call, when caching this variable I was able to gain a small performance improvement from 20,512 µs to 630 µs profiled with xhprof Surely, this is no gigantic gain but if we would do that for every function out there...	2014-11-27 00:01:55 +01:00
Thomas Müller	5097d4dc05	remove deprecated \OC:$session	2014-11-26 15:32:47 +01:00
Joas Schilling	8e28bf012c	Move constants from GET_TYPE to OC\Files so they can be autoloaded	2014-11-26 12:56:54 +01:00
Joas Schilling	3338eede3c	Correctly namespace DatabaseSetupException	2014-11-26 12:30:07 +01:00
Lukas Reschke	c749570a06	Merge pull request #12411 from owncloud/unknown-command-windows ... Replace some more "command -v" calls with the Helper method	2014-11-26 10:29:41 +01:00
Morris Jobke	1da46b1a58	Merge pull request #12438 from owncloud/jenkins-no-new-session-ocs-api ... because OC_User::login will create a new session we shall only try to lo...	2014-11-26 10:22:16 +01:00
Morris Jobke	60e4aa120f	Merge pull request #12350 from mprokop/link_expiration ... fix calculation of expiration date if there is a default expiration date...	2014-11-26 10:19:12 +01:00
Thomas Müller	320a3c3784	because OC_User::login will create a new session we shall only try to login if user and pass are set ... ensure to never destroy an existing session	2014-11-26 09:19:10 +01:00
Morris Jobke	c5fa8f1bdc	Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants ... Issue/6101 remove namespace permission constants	2014-11-26 08:31:23 +01:00
Morris Jobke	e9696a8c9a	Merge pull request #12420 from owncloud/sqlite-wal-2 ... adding new config parameter for sqlite to specify the journal mode	2014-11-26 00:47:22 +01:00
Joas Schilling	0274dcba57	Replace some more "command -v" calls with the Helper method	2014-11-25 18:10:03 +01:00
Joas Schilling	2c39aec8cb	Replace deprecated constant with new class constant	2014-11-25 16:30:21 +01:00
Thomas Müller	a6c088a1ef	adding new config parameter for sqlite to specify the journal mode	2014-11-25 16:29:06 +01:00
Lukas Reschke	fc116f563f	Allow read-only configuration ... Workaround required for IIS setups running ownCloud to prevent dataloss. Long-term solution would be to move some configuration settings to the database	2014-11-25 16:26:47 +01:00
Thomas Müller	0f18274ca5	Merge pull request #12416 from owncloud/app-info-xml-parser-2 ... App info xml parser 2	2014-11-25 15:56:52 +01:00
Georg Ehrke	1a1b459ae8	delete old previews	2014-11-25 15:42:02 +01:00
Thomas Müller	5ce34fbaf6	handle invalid xml file	2014-11-25 11:53:28 +01:00
Thomas Müller	d4f107d4dd	simplify xml parser code	2014-11-25 11:53:28 +01:00
Thomas Müller	c503ecd544	Introduce app info xml parser including basic unit test - necessary for #10777	2014-11-25 11:53:28 +01:00
Olivier Paroz	93a6cc17a5	The class name is Movie NOT Movies	2014-11-25 11:35:38 +01:00
Morris Jobke	53b2d85709	Merge pull request #12402 from owncloud/fix-phpdoc ... Fix PHPDoc and deprecated code	2014-11-25 09:20:36 +01:00
Lukas Reschke	eb1dcb87c1	Merge pull request #12380 from owncloud/remove-oc-migrate ... Remove OC_Migrate	2014-11-25 00:25:37 +01:00
Lukas Reschke	b947b65e5b	Fix PHPDoc and deprecated code ... Some PHPDocs were incorrect, also used this opportunity to replace some deprecated functions.	2014-11-24 23:09:49 +01:00
Olivier Paroz	e2a9bd7838	You can only change the oritentation of a JPEG ... TIFFs also have EXIF headers, but they're not supported by the Image class PHP doc http://php.net/manual/en/function.exif-read-data.php	2014-11-24 17:32:53 +01:00
Thomas Müller	ddacd7f900	Merge pull request #12294 from owncloud/route-postfix ... Add route postfix to allow url versioning when only the http method changed	2014-11-24 16:32:54 +01:00
Morris Jobke	168fce0b18	Merge pull request #12303 from owncloud/windows-unknown-command-command ... Deduplicate findBinaryPath() and do not try "command -v" on windows	2014-11-24 14:03:07 +01:00
Morris Jobke	1b17429c1d	Merge pull request #12142 from owncloud/DeprecateOldIAPICalls ... Deprecate older API wrappers and calls	2014-11-24 14:01:49 +01:00
Morris Jobke	8782b2237c	Merge pull request #12084 from owncloud/sharing_fix_shared_with_info ... sharing: make sure that we only find the shares from a given owner	2014-11-24 11:44:43 +01:00
Lukas Reschke	216d617938	Remove OC_Migrate ... This is unused legacy code. Let it die with ~~~honor~~ fire. Fixes https://github.com/owncloud/core/issues/12346	2014-11-24 10:53:45 +01:00
Georg Ehrke	45d985f2d8	remove ugly hack and don't use OC\Preview\Image for tiffs and svgs	2014-11-23 19:11:03 +01:00
Bjoern Schiessle	a7ebfe87c9	also check for the correct owner if it was submitted	2014-11-21 16:17:37 +01:00
Miguel Prokop	397f14ed86	Consolidate if statement, and update unit test	2014-11-21 13:31:56 +01:00
Miguel Prokop	1d4d308a6c	fix calculation of expiration date if there is a default expiration date set (but not forced) and the user does not want the link to expire.	2014-11-21 11:01:39 +01:00
Morris Jobke	593ef76e36	Revert "drop OC_Preferences::getUsers and getApps" ... This reverts commit 09fd34eed9.	2014-11-20 22:02:26 +01:00
Morris Jobke	09fd34eed9	drop OC_Preferences::getUsers and getApps	2014-11-20 17:56:05 +01:00
Morris Jobke	985f8c3f69	Merge pull request #12330 from owncloud/jenkins-eat-that ... drop dependency of some commands on old config object	2014-11-20 17:11:08 +01:00
Thomas Müller	7fa4c6d0bc	Merge pull request #12321 from owncloud/checkForXMLWriter ... Check for XMLWriter class	2014-11-20 17:04:27 +01:00
Morris Jobke	8ae8eb4734	drop dependency of some commands on old config object	2014-11-20 15:03:16 +01:00
Thomas Müller	cbb9caf030	Merge pull request #12226 from owncloud/remove-phpass ... Remove phpass and migrate to new Hasher interface	2014-11-20 14:59:59 +01:00
Morris Jobke	46e6104795	Merge pull request #12297 from owncloud/issue/10991-all-testcase ... Issue/10991 all testcase	2014-11-20 14:53:18 +01:00
Lukas Reschke	9a1673c79d	Check for XMLWriter class ... This is not installed by default in all cases and will break the DAV features of ownCloud. Lot's of reports such as https://github.com/owncloud/ios-issues/issues/167#issuecomment-63798507	2014-11-20 13:13:14 +01:00
Vincent Petry	6a08fca363	Merge pull request #12253 from owncloud/port-12154 ... Port 12154	2014-11-20 12:47:27 +01:00
Joas Schilling	d15f1882f9	Simplify the binary finding code in the movie preview class	2014-11-20 12:41:55 +01:00
Joas Schilling	64421d76fd	Deduplicate function by moving it to the OC_Helper	2014-11-20 12:37:59 +01:00
Joas Schilling	bb540722cd	Use base class to reset the file mapper	2014-11-19 14:52:07 +01:00
Bernhard Posselt	4e90c44301	add postfix ... add postfix	2014-11-19 12:01:42 +01:00
Morris Jobke	d40bdfb35e	drop unneeded var_dump - fixes #9997	2014-11-18 22:36:42 +01:00
Morris Jobke	81d112fb42	Merge pull request #12261 from oparoz/patch-1 ... Replace deprecated switches	2014-11-18 18:59:34 +01:00
Björn Schießle	106d0f9c75	Merge pull request #12224 from owncloud/fix_12211 ... make sure that we don't find the wrong shares if a user and a group have the same ID	2014-11-18 17:26:02 +01:00
Olivier Paroz	cb118ce371	Replace deprecated switches ... Warning: -convert-to is deprecated. Use --convert-to instead. Warning: -outdir is deprecated. Use --outdir instead.	2014-11-18 15:04:01 +01:00
Lukas Reschke	309788003d	Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager ... Fix type hinting for app manager	2014-11-18 13:56:40 +01:00
Lukas Reschke	8d4e63dd7c	Merge pull request #12242 from owncloud/fix-undefined-size ... Check if the size field is available	2014-11-18 12:37:16 +01:00
Lukas Reschke	260a084d27	Add repair steps for legacy config files ... Remove all ports from the trusted domains Conflicts: lib/private/repair.php lib/repair/repairconfig.php	2014-11-18 12:36:03 +01:00
Lukas Reschke	d0a30b0e55	Ignore port for trusted domains ... This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain) Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975. Conflicts: lib/private/request.php	2014-11-18 12:36:03 +01:00
Robin Appelman	0b630a37ab	Fix type hinting for app manager	2014-11-18 12:22:13 +01:00
Bjoern Schiessle	ea4eedd35a	only users can have a display name different from the id	2014-11-18 11:46:28 +01:00
Bjoern Schiessle	367468ff1f	make sure that we only find the shares from the correct share type if users and groups with the same ID exists	2014-11-18 11:11:49 +01:00
Bjoern Schiessle	5192641447	make sure that we don't find the wrong shares if a user and a group have the same ID	2014-11-18 11:03:08 +01:00
Morris Jobke	36ba935381	Merge pull request #12237 from owncloud/fix-12236 ... Make declaration compatible	2014-11-18 10:30:17 +01:00
Lukas Reschke	944cd327b1	Merge pull request #9962 from owncloud/app-group-enable-remote ... Fix remote.php routes for apps that are enabled for specific groups	2014-11-18 10:08:20 +01:00
Lukas Reschke	6535540dcd	Check if the size field is available ... In some cases the 'size' field is not available resulting in some PHP errors such as: ```json {"reqId":"03548fd9e3d3aca15a5796b3b35d7b9d","remoteAddr":"::1","app":"PHP","message":"Undefined index: size at \/Users\/lreschke\/Programming\/core\/lib\/private\/files\/fileinfo.php#125","level":3,"time":"2014-11-17T21:38:57+00:00"} ``` This can be experienced when creating a new empty file and deleting it right away, then when going to the trash bin this error is thrown.	2014-11-17 22:39:40 +01:00
Lukas Reschke	e8f90133e0	Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElse ... Move CSRF check	2014-11-17 18:34:55 +01:00
Lukas Reschke	0b9dffa828	Make declaration compatible ... Fixes #12236	2014-11-17 18:30:17 +01:00
Vincent Petry	af7688ec17	Merge pull request #11741 from owncloud/delete_all_children_preview_2 ... delete all children's previews when deleting a folder	2014-11-17 16:45:54 +01:00
Morris Jobke	146cb920c9	Merge pull request #12218 from owncloud/issue/10991-fixes ... Issue/10991 Make unit tests pass on windows	2014-11-17 16:44:45 +01:00
Robin Appelman	7cb12d4bff	Add sabredav plugin to check if a user has access to an app	2014-11-17 15:50:24 +01:00
Robin Appelman	36528c6ef6	Merge pull request #12031 from owncloud/app-manager ... Add \OC\App\Manager to handle enabling/disabling apps	2014-11-17 15:49:15 +01:00
Lukas Reschke	07f0d76fc6	Move CSRF check ... Because we're closing the session now before controllers are executed there are cases where we cannot write the session.	2014-11-17 15:10:53 +01:00
Lukas Reschke	8595b76df2	Remove phpass and migrate to new Hasher interface ... This PR removes phpass and migrates to the new Hasher interface. Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt. Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.	2014-11-17 13:39:13 +01:00
Joas Schilling	0ab973a3a6	Make it possible to cleanPath() absolute Windows paths	2014-11-17 10:48:15 +01:00
Joas Schilling	39ae569c5c	Correctly close handle of directory when listing certificates	2014-11-17 10:48:14 +01:00
Morris Jobke	b9e86b0951	Merge pull request #12186 from owncloud/fix-12182 ... eliminate OC_Template::printErrorPage in database classes, fixes #12182	2014-11-15 16:50:15 +01:00
Lukas Reschke	cd5925036a	Check if app is enabled for user ... Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps	2014-11-15 11:13:55 +01:00
Arthur Schiwon	74ffda8261	do not output DB information, and do not set header	2014-11-14 17:43:22 +01:00
Arthur Schiwon	08205c63f9	errors are already logged	2014-11-14 16:59:54 +01:00
Arthur Schiwon	7ed678b04d	eliminate OC_Template::printErrorPage in database classes, fixes #12182	2014-11-14 15:48:55 +01:00
Morris Jobke	c0d63680ed	Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup ... cleanup group admin(s) on deleteGroup	2014-11-13 22:39:40 +01:00
Morris Jobke	e5d46d0d94	Merge pull request #11956 from owncloud/remove-check-for-allow_user_to_change_display_name ... removal of wrong/double implemented check	2014-11-13 15:39:07 +01:00
michag86	7e70c4ee95	removal of wrong/double implemented check ... Check already implemented in core/settings/ajax/changedisplayname.php	2014-11-13 13:02:02 +01:00
Lukas Reschke	5f8fb8d1ee	Run preupdate before an update ... The update routine tries to test the database migration before actually performing the update. However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails. This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.	2014-11-13 12:07:49 +01:00
Morris Jobke	97a8fa418d	Merge pull request #12141 from owncloud/kill-dav-client ... OC_DAVClient is not longer used - no need to carry it around anymore	2014-11-12 21:20:52 +01:00
Lukas Reschke	4302a78b27	Deprecate older API wrappers and calls ... Those old classes have now non-static pendants and can be deprecated IMHO.	2014-11-12 17:39:25 +01:00
Thomas Müller	6e3a841652	Merge pull request #12139 from owncloud/DoNotTouchMe ... Try to read the file only instead of trying to touch	2014-11-12 17:29:56 +01:00
Thomas Müller	fede6b93e5	OC_DAVClient is not longer used - no need to carry it around anymore	2014-11-12 17:07:34 +01:00
Jan-Christoph Borchardt	d5796bbaf9	Merge pull request #12128 from owncloud/drop-formfactor ... Drop form_factor that is appended to JS, CSS and template filenames	2014-11-12 16:23:19 +01:00
Lukas Reschke	49ddaf9489	Try to read the file only instead of trying to touch ... The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening. Fixes https://github.com/owncloud/core/issues/12135	2014-11-12 15:57:19 +01:00
Morris Jobke	952abdc51a	Drop form_factor that is appended to JS, CSS and template filenames	2014-11-12 13:07:23 +01:00
Lukas Reschke	da31177a8f	Remove debug statement ... Either we throw an exception or we ignore it. But we should certainly not print this to the end-user...	2014-11-12 11:32:48 +01:00
Thomas Müller	c998f620d0	Merge pull request #12105 from owncloud/dav-fixcleanpath ... Fix root path handling for WebDAV ext storage	2014-11-12 09:16:55 +01:00
Thomas Müller	9aef0421cf	Merge pull request #12107 from owncloud/dav-propfindmimetype ... Return real mime type on PROPFIND	2014-11-12 09:16:26 +01:00
Bernhard Posselt	6d5a239abf	Fix Pimple unset	2014-11-11 22:04:46 +01:00
Vincent Petry	0b2c24081f	Return real mime type on PROPFIND ... Return the real (insecure) mime type on PROPFIND	2014-11-11 15:42:50 +01:00
Vincent Petry	4b943a4810	Fix root path handling for WebDAV ext storage ... Added missing cleanPath() call that converts "/" to "" when calling SabreDAV. This is needed because SabreDAV will discard its base URL when passing "/".	2014-11-11 15:20:36 +01:00
Robin Appelman	43eb375ace	Add \OC\App\Manager to handle enabling/disabling apps	2014-11-10 13:52:52 +01:00
Vincent Petry	9b99c1d6f0	Merge pull request #12072 from owncloud/sabre-convertstoragenotavailableexception-secondtry ... Convert StorageNotAvailableException to SabreDAV exception	2014-11-10 12:52:52 +01:00
Vincent Petry	676b911b22	Merge pull request #12027 from owncloud/cleanup_exceptions ... [encryption] clean up encryption exceptions	2014-11-10 12:46:53 +01:00
Vincent Petry	cccedf6f30	Convert StorageNotAvailableException to SabreDAV exception ... Convert \OCP\Files\StorageNotAvailableException to \Sabre\DAV\Exception\ServiceUnavailable for every file/directory operation happening inside of SabreDAV. This is necessary to avoid having the exception bubble up to remote.php which would return an exception page instead of an appropriate response.	2014-11-10 12:01:24 +01:00
Craig Morrissey	541344d880	logging changes	2014-11-07 12:45:42 -05:00
Bjoern Schiessle	f27b6b0ab8	don't scan part files	2014-11-07 15:20:51 +01:00
Bjoern Schiessle	a10ae2816e	clean up encryption exceptions	2014-11-07 13:48:31 +01:00
Robin Appelman	d26a427f92	Also propagate etag changes when the watcher finds a changed file	2014-11-07 12:56:09 +01:00
Lukas Reschke	e345697cab	Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing ... Enc stop uploading if private key is missing	2014-11-07 11:19:04 +01:00
Thomas Müller	88c329b394	Merge pull request #12019 from owncloud/fix-template-shortcuts ... second parameter in template shortcuts script() and style() is optional	2014-11-07 11:01:10 +01:00
Adam Williamson	013feb8da0	writeData(): correct variable name for config file path ... It changed since we wrote this patch.	2014-11-06 18:10:43 -08:00
Adam Williamson	8b2b0aae31	deleteFromOpcodeCache: make parameter mandatory, document parameter ... Both pointed out in submission review by @bantu, thanks.	2014-11-06 18:05:20 -08:00
Adam Williamson	3b4823d89c	add function to invalidate one opcache file, use it if possible #9885 ... Issue #9885 appears to be triggered by ownCloud invalidating the entire PHP opcache. Testing indicates it can be avoided by only invalidating the single file that was written from the opcache, instead of clearing the whole thing. In general it is more efficient to invalidate only the single file that was changed, rather than the whole cache. This adds a deleteFromOpcodeCache() function which invalidates a single file from the opcache if possible, returning true if the underlying function returns true (which may mean 'success', or 'file does not exist', or 'file exists but is not in opcache', all of which are OK to treat as good for our purposes). It also changes writeData() in config.php to try using deleteFromOpcodeCache() and only fall back on clearOpcodeCache() if that fails.	2014-11-06 17:58:58 -08:00
Lukas Reschke	d383c45c13	Merge pull request #12003 from owncloud/password-migration ... Use new hashing API for OC_User_Database	2014-11-06 22:43:57 +01:00
Morris Jobke	81e6329c04	second parameter in template shortcuts script() and style() is optional	2014-11-06 21:26:50 +01:00
Morris Jobke	e53354bfd7	Merge pull request #12009 from owncloud/make-optional ... Make second argument optional	2014-11-06 19:43:11 +01:00
Robin Appelman	0c230fb57e	Merge pull request #11945 from owncloud/share-setup-other-user ... Setup shared mounts for the correct user when setting up the filesystem	2014-11-06 19:24:24 +01:00
Robin Appelman	16b0d52031	Default to reusing etags in the scanner	2014-11-06 18:34:10 +01:00
Robin Appelman	c21d1da01a	Support displaynames for dummy user backend	2014-11-06 18:31:40 +01:00
Lukas Reschke	20cd9a134f	Make second argument optional ... Equivalent to addVendorScript und addScript from OC_Util	2014-11-06 18:17:21 +01:00
Lukas Reschke	c4d7483a0a	Use new hashing API for OC_User_Database ... This will use the new Hashing API for OC_User_Database and migrate old passwords upon initial login of the user.	2014-11-06 15:42:06 +01:00
Lukas Reschke	24ca2d858f	Add OCP\Security\IHasher ... Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference. Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662 Requires https://github.com/owncloud/3rdparty/pull/136	2014-11-06 15:16:14 +01:00
Lukas Reschke	f73d653036	Merge pull request #11972 from owncloud/usermanager-remove-delete ... Remove confusingly names \OC\User\Manager::delete and fix the automatic ...	2014-11-06 13:52:25 +01:00
Robin Appelman	1eefc21329	Remove confusingly names \OC\User\Manager::delete and fix the automatic cache cleanup instead	2014-11-05 15:45:58 +01:00
Thomas Müller	06267fec8f	Merge pull request #11928 from owncloud/support-HTML-in-logo ... Support HTML in logo	2014-11-05 13:54:29 +01:00
Bjoern Schiessle	c2a45c1238	throw exception if private key is missing	2014-11-05 13:05:46 +01:00
Morris Jobke	7f4e447a5f	fix shortcuts - underline instead of camelCase	2014-11-04 13:57:38 +01:00
Morris Jobke	fde8ef0655	Merge pull request #11916 from owncloud/introduce-bower ... Introduce bower dependency managment for frontend libraries	2014-11-04 11:59:33 +01:00
Morris Jobke	7f1d974796	Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig ... First check whether it is the default config before touching	2014-11-03 21:20:42 +01:00
Lukas Reschke	be5ae6c44f	Support HTML in logo claim	2014-11-03 21:14:27 +01:00
Morris Jobke	d763b32048	ability to add bower resources ... * add addVendorScript & addVendorStyle * refactoring of addScript and addStyle * add shortcuts vendorScript and vendorStyle	2014-11-03 20:54:40 +01:00
Thomas Müller	994768d99f	Update Pimple to V3.0	2014-11-03 16:57:16 +01:00
Lukas Reschke	9790801268	First check whether it is the default config before touchign ... Potentially fixes https://github.com/owncloud/core/issues/11678	2014-11-03 16:37:04 +01:00
Morris Jobke	56cf1d9d27	fix odd behaviour	2014-10-31 18:46:47 +01:00
Vincent Petry	fd4b97d758	Merge pull request #9044 from owncloud/add-missing-email-principal ... adding missing email address for principal	2014-10-31 13:24:42 +01:00
Vincent Petry	55658e7bb2	Merge pull request #11539 from owncloud/mount-setup-once ... Only mount the storages for the user once	2014-10-31 10:42:29 +01:00
Morris Jobke	1c7f1a8787	Merge pull request #11877 from owncloud/fix-11875-master ... prevent PHP notice	2014-10-30 21:43:38 +01:00
Vincent Petry	bed81ea854	Merge pull request #11080 from owncloud/addheader-text-2 ... Fix the addHeader tag attributes text methods to not ignore the text parameter	2014-10-30 18:13:46 +01:00
Thomas Müller	99921489cf	prevent PHP notice	2014-10-30 17:24:25 +01:00
Georg Ehrke	33186957c8	delete all children's previews when deleting a folder ... add phpdoc	2014-10-30 17:15:42 +01:00
Thomas Müller	9b293537a6	Merge pull request #11740 from owncloud/update-archive-tar ... Update pear/archive_tar to 1.3.13	2014-10-30 17:14:07 +01:00
Lukas Reschke	6db69c5d05	Merge pull request #11864 from owncloud/clear-session-after-logout ... Clear session after logout	2014-10-30 16:47:46 +01:00
Morris Jobke	90e523ead0	Merge pull request #11858 from owncloud/fix-11064 ... Allow any outgoing XHR connections	2014-10-30 16:19:39 +01:00
Thomas Müller	08b46ccc17	Update pear/archive_tar to 1.3.13	2014-10-30 16:10:00 +01:00
Thomas Müller	18f7f582ac	Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro ... Fix stupid copy paste fail	2014-10-30 14:45:58 +01:00
Morris Jobke	e2001c6d31	Merge pull request #11821 from owncloud/generic-response ... Add a generic data response	2014-10-30 14:05:25 +01:00
Lukas Reschke	770c62c5d8	Clear session after logout ... Fixes https://github.com/owncloud/core/issues/8420	2014-10-30 12:10:39 +01:00
Lukas Reschke	e219d72619	Fix stupid copy paste fail ... ...	2014-10-30 10:37:59 +01:00
Lukas Reschke	b3f881748d	Allow any outgoing XHR connections ... Quickfix for https://github.com/owncloud/core/issues/11064	2014-10-30 00:00:40 +01:00
Vincent Petry	106b9eb55c	Merge pull request #11409 from owncloud/watcher-reuse ... Pass the cached data to the filesystem watcher	2014-10-29 16:38:16 +01:00
Thomas Müller	fb4f993336	Fix implementation of translation short cut	2014-10-29 10:58:10 +01:00
Vincent Petry	c682b1f0c1	Fix language file detection	2014-10-29 10:13:51 +01:00
Thomas Müller	2f19de11e4	adding console command to generate javascript translation files based on existing php translation files ... read server side translations from json files	2014-10-29 10:09:12 +01:00
Thomas Müller	a589d61b78	in case a translation javascript is not found we no longer bail out ... remove translation.php	2014-10-29 10:09:12 +01:00
Vincent Petry	ec1a73fab9	Added OC.L10N namespace with translation functions ... Added addTranslations and fixed de.js file Fixed de.js to use OC.L10N.register() and use to correct expected format. Added JS unit tests for OC.L10N class Include translations JS script for all apps	2014-10-29 10:09:12 +01:00
Bernhard Posselt	0696099bad	add dataresponse ... fix docstrings adjust copyright date another copyright date update another header update implement third headers argument, fix indention, fix docstrings fix docstrings	2014-10-29 09:43:47 +01:00
Robin Appelman	2974d4d380	Reset the users setup after clearing mounts	2014-10-28 15:13:29 +01:00
Lukas Reschke	510d0b2cf3	Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text parameter ... Also support closing tags with no text content given Conflicts: lib/private/template.php	2014-10-28 11:15:58 +01:00
Morris Jobke	4461e69873	Merge pull request #11791 from owncloud/webdav-getquotainfo-503-handling ... Properly catch 503 storage not available in getQuotaInfo	2014-10-28 09:33:54 +01:00
Lukas Reschke	d6380a5395	Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable ... Make supported DBs configurable within config.php	2014-10-27 22:24:16 +01:00
Thomas Müller	79778d6a51	code cleanup during review 👍	2014-10-27 21:39:35 +01:00
Lukas Reschke	233c49f4b9	Make supported DBs configurable within config.php ... This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake. To test this play around with the new configuration parameter "supportedDatabases".	2014-10-27 21:39:34 +01:00
Robin Appelman	3f63f4b6b1	Only mount the storages for the user once	2014-10-27 18:50:28 +01:00
Vincent Petry	21d825ed6c	Properly catch 503 storage not available in getQuotaInfo ... When doing a PROPFIND on the root and one of the mount points is not available, the returned quota attributes will now be zero. This fix prevents the expected exception to make the whole call fail.	2014-10-27 16:27:12 +01:00
Morris Jobke	a00712aa65	Merge pull request #11783 from owncloud/allow_passing_driver_options ... allow passing db driver options	2014-10-27 16:00:13 +01:00
Robin Appelman	8de287f2ef	Merge pull request #11763 from owncloud/stable-etags ... Generate stable etags for local files	2014-10-27 15:30:30 +01:00
Jörn Friedrich Dreyer	e16a58220d	allow passing driver options, fixes #11718	2014-10-27 12:30:29 +01:00
Vincent Petry	aee1edf6b5	Merge pull request #11708 from owncloud/fix-momentjs ... Setting moment locale based on user selection	2014-10-27 10:30:47 +01:00
Lukas Reschke	acec1afe17	Merge pull request #11760 from owncloud/add-type-hints-where-sensible ... Add type hinting to functions	2014-10-25 14:09:48 +02:00
Morris Jobke	be32e562e3	drop unneeded hint	2014-10-25 12:00:56 +02:00
Morris Jobke	63f2b1f460	Merge pull request #11767 from danbartram/add_db_rollback ... Add missing DB rollback functionality	2014-10-24 19:52:56 +02:00
Thomas Müller	9fa5483111	Merge pull request #11709 from owncloud/temp-handling ... Cleanup handling of temporary files	2014-10-24 19:29:05 +02:00
Dan Bartram	9c1015b790	Add missing DB rollback functionality	2014-10-24 17:44:06 +01:00
Robin Appelman	283c10f010	Generate stable etags for local files	2014-10-24 16:47:58 +02:00
Lukas Reschke	f901c5ff08	Fix PHPDoc and remove explicit type hint	2014-10-24 15:49:55 +02:00
Lukas Reschke	b3a04840b5	Add type hinting to functions ... It's only reasonable to have proper type hinting here which might even help us to catch bugs.	2014-10-24 14:13:40 +02:00
Robin Appelman	16cfca6a5f	Better reuse of cache data for getFolderContents	2014-10-24 12:33:54 +02:00
Robin Appelman	0a3f57f832	Pass the cached data to the filesystem watcher	2014-10-24 12:32:55 +02:00
Lukas Reschke	d060180140	Use function outside of loop ... Otherwise the function is executed n times which is a lot of overhead	2014-10-24 12:27:53 +02:00
Robin Appelman	0b96297783	Use the TempManager to handle temporary files	2014-10-24 12:18:49 +02:00
Robin Appelman	83c74b80ad	Add \OC\TempManager to handle creating and cleaning temporary files	2014-10-24 12:18:46 +02:00
Lukas Reschke	2d2a4741ce	Make files non executable ... There is not much sense in having these files marked executable, we should avoid that.	2014-10-24 11:14:51 +02:00
libasys	cbd130bed0	adding missing email address for principal ... * fix #8515 * add mail only if it exists	2014-10-24 11:12:23 +02:00
Morris Jobke	4b5a3876ac	Merge pull request #7749 from owncloud/load_avatar_header_via_php ... Load avatar in header via PHP	2014-10-24 01:27:25 +02:00
kondou	729dffed5e	Load avatar in header via PHP ... * fix #7484 * use UID, css, and div instead of span	2014-10-23 23:17:18 +02:00
Lukas Reschke	c30b7f8197	Remove unreachable statement	2014-10-23 23:03:14 +02:00
Clark Tomlinson	ca5abe5744	Setting moment locale based on user selection	2014-10-23 10:32:47 -04:00
Thomas Müller	e26a16afea	Merge pull request #11549 from owncloud/add-more-localizations-master ... implement localizations based on punic	2014-10-23 16:09:47 +02:00
Thomas Müller	6c1871da06	Merge pull request #10985 from owncloud/db-cleanup ... Cleanup database handling	2014-10-23 13:48:33 +02:00
Morris Jobke	b82e44b448	Merge pull request #10689 from owncloud/load_classfile_once ... make sure class file is loaded once	2014-10-23 11:41:00 +02:00
Lukas Reschke	e9ec45ddd1	Merge pull request #11704 from owncloud/fix-type-for-query ... Use mixed as type	2014-10-22 18:13:31 +02:00
blizzz	44a7a3690a	Merge pull request #11702 from owncloud/fix-11637 ... setup filesystem by username, not login name, fixes #11637	2014-10-22 17:56:30 +02:00
Lukas Reschke	be06937e65	Use mixed as type ... Actually query() returns value of the type "mixed" (as is also stated in the interface) - this is purely there to make our IDEs and Scrutinizer happier.	2014-10-22 15:09:33 +02:00
Jörn Friedrich Dreyer	b7fa644a54	Merge pull request #9586 from owncloud/enhanced-sql-script-generation-oracle-master ... Special treatment for Oracle	2014-10-22 14:54:42 +02:00
Lukas Reschke	31e489b44d	Merge pull request #11687 from owncloud/appframework-session-annotation ... introduce SessionMiddleWare to control session handling via an annotatio...	2014-10-22 14:45:28 +02:00
Arthur Schiwon	993376fb6f	better variable name	2014-10-22 13:36:57 +02:00
Arthur Schiwon	e0342db47c	set up FS by username, not login name\!	2014-10-22 13:28:08 +02:00
Thomas Müller	02c5933af8	introduce SessionMiddleWare to control session handling via an annotation	2014-10-22 12:44:19 +02:00
Robin Appelman	d83b11d34a	Use statements wrapper in \OCP\IDB	2014-10-22 12:29:53 +02:00
Robin Appelman	e6f6cdd19f	Bit more cleanup	2014-10-22 12:29:53 +02:00
Robin Appelman	2ae6a0d96d	Move creating the database connection to the server container	2014-10-22 12:29:53 +02:00
Robin Appelman	d4e929c37a	Remove implicit prepared statement cache and get the connection from the server container in \OC_DB	2014-10-22 12:26:43 +02:00
Robin Appelman	72f99f5041	Remove \OC\DB\ConnectionWrapper, have \OC\DB\Connection implement \OCP\IDBConnection directly instead	2014-10-22 12:26:43 +02:00
Bjoern Schiessle	b7718bc212	always use the correct share type	2014-10-22 11:48:29 +02:00
Morris Jobke	e2ff180521	Merge pull request #11416 from owncloud/eventlogger ... Allow apps to gather performance diagnistics	2014-10-22 11:18:26 +02:00
Lukas Reschke	cb36666600	Merge pull request #11630 from owncloud/kill-some-legacy ... remove legacy class OC_Updater	2014-10-21 14:01:49 +02:00
Lukas Reschke	8f8abdbaee	Add unit tests for convertToRelativePath	2014-10-20 15:09:43 +02:00
Lukas Reschke	7b94c7f9c1	Refer to relative path instead of absolute path ... There is no need to refer to the absolute path here if we can use the relative one. Conflicts: lib/private/templatelayout.php	2014-10-20 15:09:43 +02:00
Thomas Müller	c8e8945efb	implement localizations based on punic	2014-10-20 15:04:42 +02:00
Thomas Müller	6af0e76a03	remove legacy class OC_Updater	2014-10-20 14:44:42 +02:00
Robin Appelman	9fd234f63f	Log some additional events	2014-10-20 13:38:38 +02:00
Robin Appelman	beb1c6ad74	Allow adding events that hapend before the event logger was loaded	2014-10-20 13:38:38 +02:00
Robin Appelman	4a8358bc50	Rename to NullQueryLogger	2014-10-20 13:38:38 +02:00
Robin Appelman	1e69f5e7ac	Log some basic events	2014-10-20 13:38:38 +02:00
Robin Appelman	6e08014781	Rename namespace to Diagnostics	2014-10-20 13:38:38 +02:00
Robin Appelman	2790bda4f8	Activate the query logger on connect	2014-10-20 13:38:37 +02:00
Robin Appelman	b71d1d3616	Add QueryLogger interface to allow apps to get a list of used queries	2014-10-20 13:38:37 +02:00
Robin Appelman	d38050cf52	Add an EventLogger interface to allow apps to get a log of the request timeline	2014-10-20 13:38:37 +02:00
Jörn Friedrich Dreyer	ca0e3fdfea	throw exception in writeBack, the returned boolean is checked nowhere	2014-10-20 11:29:05 +02:00
Jörn Friedrich Dreyer	9b0f0df7f5	make skeleton compatible with objectstore ... suspend encryption proxy when copying skeleton	2014-10-20 11:28:36 +02:00
Arthur Schiwon	4e8c7570d4	make performance less bad. Still far from good, but at least it works	2014-10-17 20:16:04 +02:00
Arthur Schiwon	a7a532f58a	with several backends, more than limit can be returned	2014-10-17 20:16:04 +02:00
Morris Jobke	7bf401e48a	Merge pull request #11430 from owncloud/minify-js-css-master ... adding cssmin and jssmin(minify)	2014-10-17 15:05:59 +02:00
Lukas Reschke	439b33ec38	Merge pull request #11634 from owncloud/loadapps-encapsulaterequire ... Encapsulate require_once to avoid name space bleedind	2014-10-17 14:32:10 +02:00
Vincent Petry	27c22f071d	Encapsulate require_once to avoid name space bleedind ... The script required by require_once might use variable names like $app which will conflict with the code that follows. This fix encapsulates require_once into its own function to avoid such issues.	2014-10-17 12:45:45 +02:00
Thomas Müller	93b0f1a3bf	adding cssmin and jssmin(minify) ... adding argument deleteSelf to rmdirr() - if false the directory itself will not be deleted only it's content adding repair step to clean the asset cache after upgrade + coding style adjustments	2014-10-17 12:22:26 +02:00
blizzz	688a141586	Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup ... drastic ldap speedup (update)	2014-10-17 12:07:27 +02:00
Morris Jobke	f1a5ebd59d	Merge pull request #11611 from owncloud/fix-svg-master ... Fix SVG icons	2014-10-17 12:01:27 +02:00
Lukas Reschke	af335a39f1	Add PHPDoc about sanitization of "insertIfNotExist" ... Let's document this potential pitfall properly.	2014-10-17 11:06:49 +02:00
Lukas Reschke	53e0cf2f74	Add a try catch block ... This function might also be called before ownCloud is setup which results in a PHP fatal error. We therefore should gracefully catch errors in there.	2014-10-16 21:45:09 +02:00
Thomas Müller	f7097faf82	Special treatment for Oracle	2014-10-16 17:02:15 +02:00
Lukas Reschke	a37dcf94fd	Merge pull request #11591 from owncloud/addAppVersionToCSSandJS ... Add app version to JS and CSS	2014-10-16 15:54:57 +02:00
Lukas Reschke	5f3ddf5c80	Merge pull request #11383 from ockham/share-tags2 ... Share tags	2014-10-16 15:36:04 +02:00
Thomas Müller	a04159090f	include the apps' versions hash to invalidate the cached assets	2014-10-16 13:29:51 +02:00
Lukas Reschke	4deb57bfae	Remove insane comment	2014-10-16 12:42:00 +02:00
Lukas Reschke	9cfbf7ed1c	Fix SVG icons ... FIXME: Ugly hack to prevent SVG of being returned if the SVG provider is not enabled. This is required because the preview system is designed in a bad way and relies on opt-in with asterisks (i.e. image/*) which will lead to the fact that a SVG will also match the image provider. Conflicts: lib/private/preview.php	2014-10-16 12:35:51 +02:00
blizzz	756f64d728	Merge pull request #11595 from owncloud/make_get_display_name_more_robust ... strip whitespace from the beginning and end of the display name	2014-10-16 11:33:12 +02:00
Jörn Friedrich Dreyer	0254a3c406	make trashbin compatible with objectstore, replace glob with search in cache, make unknown free space work like unlimited free space	2014-10-16 10:15:43 +02:00
Lukas Reschke	63e0599218	Merge pull request #11565 from owncloud/fix-behaviourOnOSX ... Add darwin to if block	2014-10-15 21:12:50 +02:00
Lukas Reschke	f82b996f57	Merge pull request #11528 from owncloud/use-raw-url ... Use `rawurlencode` since this seems to be expected by cURL	2014-10-15 19:58:27 +02:00
Jörn Friedrich Dreyer	c27fd94ec8	in cli mode return true for isHtaccessWorking	2014-10-15 16:59:28 +02:00
Thomas Müller	b091394a90	introduce new app page layout ... filter installed and not-installed apps properly kill unneeded file load category 'Installed' on page load adding documentation links new apps mgmt: first style adjustment apps mgmt: only show license and preview if they exist adding buttons new apps mgmt: fix for mobile use app icon if available new apps mgmt: position enable/disable toggle to the right new apps mgmt: proper display of icons or previews new apps mgmt: fix loading spinner reenable group selection for apps new apps mgmt: position enable button normally again new apps mgmt: clarify wording from 'Installed' to 'Enabled' reintroduce enable/disable Move rating image path generation to client-side Move expression outside of l10n fix group handling add buttons for 'More apps' and 'Add your app' again disable changed date of app for now adding recommended label style 'Recommended' app tag fixing php warning sort by rating adding meta-category 'Recommended' Only show existing documentation links lacy loading of screenshots making group based app activation work again adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg' adding app.svg for all core apps query string '?installed' is not longer needed update and uninstall is back + error feedback remove unneeded parameter fix alignment of 'recommended' label	2014-10-15 15:21:40 +02:00
Bjoern Schiessle	239bff5766	strip whitespace from the beginning and end of the display name to avoid empty display names	2014-10-15 14:54:35 +02:00
Vincent Petry	6824a5ce7f	Merge pull request #11538 from owncloud/webdav-creatable-info ... Use the cached fileinfo to get creatable permissions	2014-10-15 14:39:07 +02:00
Lukas Reschke	6ccda2ae98	Add app version to JS and CSS ... This leads to the regeneration of the hash in case a single application is updated. Fixes https://github.com/owncloud/core/issues/11374	2014-10-15 14:00:20 +02:00
Vincent Petry	6fa03870e9	Merge pull request #11541 from owncloud/usersession-activeuser-setsession ... Unset the cached active user when using a different session object	2014-10-15 13:31:05 +02:00
Vincent Petry	4650101674	Merge pull request #11548 from owncloud/extstorage-ocfields ... Allow specifying protocol in ext storage OC config	2014-10-15 13:27:23 +02:00
Lukas Reschke	1b3feb710d	Use `rawurlencode` since this seems to be expected by cURL ... Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405	2014-10-14 13:16:23 +02:00
Lukas Reschke	bf84cd4bcc	Add darwin to if block ... Otherwise it would fall into the 'win' else block because strpos($os, 'win') does also match 'darwin' what is the `php_uname` for OS X.	2014-10-14 12:58:00 +02:00
Joas Schilling	0407bc0978	Set overwritemailurl* configs on setup ... Correctly use overwritemailurl value when generating absolute urls in CLI Fix #11500 Rename the config to *cli Add overwrite.cli.url to the sample config Revert separator fix, fixes unit test	2014-10-14 05:07:09 +02:00
goodkiller	9f0b99cd17	Update group.php ... Here is fox for my LDAP users OW 7.0.2	2014-10-14 01:18:45 +03:00
Bernhard Reiter	b416f7d8ac	PHPDoc fixes as suggested by @MorrisJobke.	2014-10-14 00:06:33 +02:00
Bernhard Reiter	1770179648	Add getTag() function for accessing of a single tag.	2014-10-14 00:06:33 +02:00
Bernhard Reiter	bc265e8b52	Make loading of tags from DB more explicit.	2014-10-14 00:06:07 +02:00
Bernhard Reiter	226d7233e1	In Tags::rename($from, $to), check if there already is a tag named $to.	2014-10-14 00:06:07 +02:00
Bernhard Reiter	7e9baafc53	Add option to include tags for shared items.	2014-10-14 00:06:07 +02:00
Bernhard Reiter	7963125c41	Remove two obsolete try...catch blocks.	2014-10-14 00:06:07 +02:00
Bernhard Reiter	5471189fe6	Implement Tag and TagMapper classes. ... Subclassed from \OCP\AppFramework\Db\Entity and Mapper, respectively. This will allow us to also deal with shared tags.	2014-10-14 00:06:07 +02:00
Bernhard Reiter	cf6fb2c2e4	Remove redundant null initializations.	2014-10-14 00:06:07 +02:00
Bernhard Reiter	3e5d725502	Test addMultiple() with $sync=true.	2014-10-14 00:06:07 +02:00
Vincent Petry	e95372bf01	Merge pull request #11546 from owncloud/users-deletewithfilecache ... Retrieve storage numeric id earlier when still available	2014-10-13 17:27:13 +02:00
Vincent Petry	ab5149f5df	Allow specifying protocol in ext storage OC config ... Allow specifying a protocol in the host field when mounting another ownCloud instance. Note that this was already possible with the WebDAV config but this bug made it inconsistent.	2014-10-13 17:15:58 +02:00
Vincent Petry	d485c0098d	Retrieve storage numeric id earlier when still available ... The numeric id is only available before the storage entry is deleted, so get it at that time.	2014-10-13 15:52:48 +02:00
Bjoern Schiessle	c6c9a51b11	distinguish between file dependent shares and other shares	2014-10-13 15:04:54 +02:00
Robin Appelman	912fbfab01	Unset the cached active user when using a different session object	2014-10-13 13:11:48 +02:00
Robin Appelman	19de425a50	Use the cached fileinfo to get creatable permissions	2014-10-13 13:09:05 +02:00
Lukas Reschke	bf674487aa	Merge pull request #11367 from owncloud/removeIsMimeSupported ... Remove uneeded slicing of element	2014-10-12 19:45:00 +02:00
Björn Schießle	87899db204	Merge pull request #11380 from owncloud/fix_performance_issue_sharing ... [sharing] fix performance issues	2014-10-10 15:56:30 +02:00
Bjoern Schiessle	3431d547a9	fix performance issues	2014-10-10 12:16:26 +02:00
Vincent Petry	660e9c4012	Merge pull request #11501 from Ansud/master ... Urlencode file name before passing it to cURL	2014-10-10 10:57:59 +02:00
Vincent Petry	9dea79e341	Merge pull request #11305 from owncloud/ext-updateetagonmount ... Update etag of parent dir when adding/removing ext storage mount points	2014-10-09 18:18:36 +02:00
Vincent Petry	c82e310e20	Merge pull request #11495 from owncloud/apps-clearenableappscacheafterloadingauthapp ... Clear enabled apps cache after loading authentication app	2014-10-09 17:20:05 +02:00
Lukas Reschke	16cd749065	Add support for keys in the info.xml ... This allows to have links to different doc base URLs a.	2014-10-09 15:48:30 +02:00
Tony Zelenoff	2d03019c91	Urlencode file name before passing it to cURL ... Large file helper use cURL to determine file sizes. Thus filenames must be urlencoded in case special symbols like '#' can cause BadRequest errors. Signed-off-by: Tony Zelenoff <antonz@parallels.com>	2014-10-09 17:15:12 +04:00
Vincent Petry	36d22825e0	Clear enabled apps cache after loading authentication app ... Since getEnabledApps() depends on an authentication app to be loaded, especially in the case of LDAP, the cache from getEnabledApps() is now cleared to make sure that subsequent calls will properly return apps that were enabled for groups. This is because getEnabledApps() uses the inGroups() function from the group manager provided by LDAP or any other authentication app.	2014-10-09 14:34:41 +02:00
Jörn Friedrich Dreyer	3427976bb6	strict comparison	2014-10-08 18:49:55 +02:00
Jörn Friedrich Dreyer	aa3ad898a9	fix amazon s3 issues ... folder size and mtime is always unknown in s3 more s3 fixes make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings reduce number of http calls on remove and rmdir fix typo	2014-10-08 18:49:47 +02:00
Robin Appelman	12ac3a800d	Expose getAppKeys trough \OCP\IConfig	2014-10-08 14:22:17 +02:00
Vincent Petry	6585eaa5df	Added failing unit tests for mount config hooks	2014-10-08 14:22:17 +02:00
michag86	8abe441d4a	cleanup group admin(s) on deleteGroup	2014-10-08 14:05:06 +02:00
michag86	ca58ac50a2	fix for issue #10880	2014-10-07 16:07:48 +02:00
Vincent Petry	d7db006315	Revert "fix for issue #10880" ... This reverts commit 0df070a8e4.	2014-10-07 15:54:25 +02:00
michag86	0df070a8e4	fix for issue #10880	2014-10-07 14:30:14 +02:00
Victor Dubiniuk	b6087ea79b	Add CssImportFilter. More elegant fix for documents#348	2014-10-06 19:39:02 +03:00
Morris Jobke	a6293a38f2	Merge pull request #11390 from Nemesiz/master ... Preview large TXT files fix	2014-10-06 14:25:27 +02:00
Olivier Paroz	b0000800e1	New generic class for Imagemagick conversions	2014-10-04 17:50:12 +02:00
Nmz	83c2829ca8	Preview large TXT files fix ... Limit the size of the string generating the preview image for TXT files	2014-10-02 12:47:39 +03:00
Lukas Reschke	e762ff2bbd	Merge pull request #11356 from owncloud/redirect-only-to-the-same-domain ... Redirect only to absolute URL	2014-10-01 12:47:43 +02:00
Lukas Reschke	cbecd62287	Merge pull request #11303 from owncloud/addFilelockToConfig ... Add flock to config	2014-10-01 10:43:18 +02:00
Morris Jobke	5beeb923e6	Merge pull request #11365 from owncloud/fix-phpdoc ... Fix PHPDoc	2014-09-30 16:15:37 +02:00
Lukas Reschke	68cf6681e5	Add flock to config ... This adds a file lock to the config in hope that this prevents race conditions as reported in https://github.com/owncloud/core/issues/11070 Testplan: - [ ] Delete config.php and make it read-only => Error is thrown that it is not writeable - [ ] Installation still works - [ ] Changing config settings works (i.e. using the SMTP config switches in the administration menu) - [ ] Your PC didn't blow up - [ ] Installing the news app and the "Disable AppCode checker" app did not destroy your installation Only skip the main config Otherwise read only additional configs might not be processed Test on tmpdir	2014-09-30 15:53:27 +02:00
Lukas Reschke	96d9e0eb5b	Remove uneeded slicing of element ... The "*/*" provider has been removed. This is therefore not needed anymore and leads to unexpected bugs. Please notice that this is only relevant for master.	2014-09-30 14:08:43 +02:00
Lukas Reschke	67f8875f47	Remove invalid PHPDoc ... Despite the documentation this function does not read values from the cookie	2014-09-30 13:46:43 +02:00
Lukas Reschke	b4944ffcc5	Fix PHPDoc	2014-09-30 13:34:50 +02:00
Lukas Reschke	8c8e5c168e	Merge pull request #10107 from owncloud/sharing_group_shares ... [sharing] group shares	2014-09-29 20:26:41 +02:00
Lukas Reschke	41374986d3	Remove dead code	2014-09-29 17:20:29 +02:00
Lukas Reschke	6e7365fc17	Redirect only to absolute URL ... We do not want to redirect to other domains using the "?redirect_url=" feature. Please notice, that the ownCloud project does not consider open redirectors as security issue.	2014-09-29 17:07:43 +02:00
Bjoern Schiessle	6e7acb8ae0	some small fixed, suggested by scrutinizer	2014-09-29 11:23:18 +02:00
Bjoern Schiessle	2a4da7fe09	on unshare only unshare childrens if there is no other parent available	2014-09-26 16:58:47 +02:00
Lukas Reschke	53f6d74938	Merge pull request #11311 from owncloud/fixing-unhandled-exception-cleanTmp-master ... catch and log exception in OC_Helper::cleanTmp()	2014-09-26 14:31:31 +02:00
Bjoern Schiessle	e115a7043f	only create a new share entry, if the user needs a different target name than the group share	2014-09-26 13:19:15 +02:00
Bjoern Schiessle	ed85055d31	for group shares we don't need a extra db entry of groupTarget equals itemTarget	2014-09-26 13:10:31 +02:00
Bjoern Schiessle	d242e518f9	for group shares only the parent has the up-to-date permission. Make sure that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self	2014-09-26 13:01:54 +02:00
Thomas Müller	4c08215e66	catch and log exception in OC_Helper::cleanTmp()	2014-09-26 11:36:53 +02:00
Thomas Müller	e5a111b80e	Merge pull request #11285 from owncloud/dav-permissions-create ... Fix dav permissions for folders	2014-09-26 09:21:32 +02:00
Robin Appelman	6365c57b04	Merge pull request #11282 from owncloud/scanner-memory-stable7 ... Don't keep the full info of all children in memory	2014-09-25 15:53:33 +02:00
Vincent Petry	9fc23e1967	Merge pull request #10934 from owncloud/datadir-write-setup ... Don't complain about non-writable datadirs before we're installed	2014-09-25 14:32:32 +02:00
Bjoern Schiessle	52b6469b0c	call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible	2014-09-25 14:26:31 +02:00
Robin Appelman	10c350b895	Fix dav permissions for folders without create permissions	2014-09-25 14:01:19 +02:00
Robin Appelman	ccb4475a8d	Expose creatable permissions trough fileinfo	2014-09-25 14:00:13 +02:00
Bjoern Schiessle	968152113e	always select permissions, used in getItems()	2014-09-25 12:35:11 +02:00
Bjoern Schiessle	d5fc011c90	some small fixes	2014-09-25 11:29:57 +02:00
Lukas Reschke	cb002c1f6b	Clarify possible preview providers for type Office ... a	2014-09-24 21:21:39 +02:00
Robin Appelman	f88021dbbc	Don't keep the full info of all children in memory	2014-09-24 15:44:56 +02:00
Lukas Reschke	3da6b3b533	Merge pull request #11229 from kofemann/for-upstream ... user/backed: use pow of two for backed action constants	2014-09-24 15:19:11 +02:00
Bjoern Schiessle	07d43df713	only add a new row if it isn't a unique share, otherwise update the existing row	2014-09-24 14:02:02 +02:00
Bjoern Schiessle	9f7b15582a	fix add user to group to work with grouped shares	2014-09-24 14:02:01 +02:00
Bjoern Schiessle	bd268c35f5	generateTarget() will always find a unique target	2014-09-24 14:02:01 +02:00
Lukas Reschke	75e45ac786	Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser ... Do not show exception to the end-user - use a proper error page instead	2014-09-23 18:36:40 +02:00
Vincent Petry	89e02e89d4	Merge pull request #7051 from owncloud/postsetupajaxcheck ... Moved WebDAV check to client side JS	2014-09-23 16:55:16 +02:00
Tigran Mkrtchyan	276f50a1ba	user/backed: use pow of two for backed action constants ... the current implementation limits number of possible backed actions to 8 as it uses pow of 16 for constants. This change introduces pow of two and allows up-to 32 actions to be defined. The old values are preserved for backward compatibility.	2014-09-23 15:18:01 +02:00
Thomas Müller	c587a4aaa2	Merge pull request #11222 from owncloud/store-users-timezone-master ... send browsers timezone back tp the server on login	2014-09-23 13:45:21 +02:00
Thomas Müller	42fe0b9e08	Merge pull request #11241 from owncloud/use-lower-case ... Use only lower-case letters	2014-09-23 12:16:58 +02:00
Lukas Reschke	5d977f97b0	Merge pull request #11032 from owncloud/harden-redirect ... Do only follow HTTP and HTTPS redirects	2014-09-23 11:34:44 +02:00
Vincent Petry	e65ceb08fc	Moved WebDAV and internet checks to client side JS ... - Added setup checks in JavaScript - Moved isWebDAVWorking to JS using SetupChecks - Moved internet connection checks to an ajax call that goes through the server	2014-09-23 11:16:14 +02:00
Vincent Petry	fc42a64e6c	Merge pull request #11226 from owncloud/kill-postsetupcheck-master ... remove post setup check	2014-09-23 10:33:50 +02:00
Thomas Müller	37a5bff155	Merge pull request #11227 from owncloud/fix-windows-path ... fixing directory seperators	2014-09-23 07:38:23 +02:00
Morris Jobke	f970c81b1e	Merge pull request #11215 from owncloud/dav-throwwhendeletefailed ... WebDAV now throws 403 when deletion did not work	2014-09-23 00:49:30 +02:00
Morris Jobke	051ed93e24	Merge pull request #11211 from owncloud/previewProviderSwitch ... Add a configuration switch for enabled preview mimetypes	2014-09-23 00:45:59 +02:00
Lukas Reschke	1565d82b81	Use only lower-case letters ... Fixes https://github.com/owncloud/core/issues/11239	2014-09-22 21:29:03 +02:00
Lukas Reschke	6eeb905871	Do only follow HTTP and HTTPS redirects ... We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server) Get final redirect manually using get_headers() Migrate to HTTPHelper class and add unit tests	2014-09-22 20:02:32 +02:00
Thomas Müller	21412559df	remove post setup check	2014-09-22 19:43:55 +02:00
Bjoern Schiessle	9105e17307	unit tests for grouping of shares pointing to the same source	2014-09-22 17:54:47 +02:00
Bjoern Schiessle	89c3b650e6	group shares and combine permissions	2014-09-22 17:25:15 +02:00
Morris Jobke	9e8d2907e2	Merge pull request #11204 from owncloud/fix_oc_stream_seek ... Fix oc stream seek	2014-09-22 16:25:07 +02:00
Clark Tomlinson	db72270acc	fixing directory seperators	2014-09-22 10:13:46 -04:00
Lukas Reschke	ca3447fcde	Add a configuration switch for enabled preview mimetypes	2014-09-22 16:09:08 +02:00
Thomas Müller	814114ab8e	enhance formatDate function to accept an optional argument containing the time zone	2014-09-22 15:03:28 +02:00
Morris Jobke	831d34f084	Merge pull request #11210 from owncloud/issue/11209 ... Also match routes without trailing slash for files app	2014-09-22 14:04:20 +02:00
Vincent Petry	470c25eff4	WebDAV now throws 403 when deletion did not work ... Assume a permission issue whenever a file could not be deleted. This is because some storages are not able to return permissions, so a permission denied situation can only be triggered during direct deletion.	2014-09-22 13:15:17 +02:00
blizzz	b8a1340538	Merge pull request #9225 from voxsim/fix_displayNamesInGroup ... fix in displayNamesInGroup	2014-09-22 12:13:15 +02:00
Jörn Friedrich Dreyer	f83689e1be	in quota wrapper use === instead of ! for better readability and as in other wrappers	2014-09-22 11:35:42 +02:00
Jörn Friedrich Dreyer	561a7e47cd	return boolean in Ciose::stream_seek	2014-09-22 11:33:55 +02:00
Joas Schilling	71bec60b92	Also match routes without trailing slash ... Fix #11209	2014-09-22 11:22:33 +02:00
Jörn Friedrich Dreyer	b752cb98d8	return boolean in OC::stream_seek	2014-09-22 11:20:15 +02:00
Thomas Müller	8abf786af9	Merge pull request #10499 from owncloud/mkcol-headers-afterbind ... Use afterBind to send fileId header for files and directories	2014-09-22 10:02:03 +02:00
Morris Jobke	154e848ce2	Merge pull request #11199 from owncloud/delete_bogus_previews ... Delete bogus cached previews while updating	2014-09-21 22:48:21 +02:00
Georg Ehrke	071e4bfc06	make sure preview prop is instanceof OC_Image before using it in showPreview	2014-09-21 17:30:29 +02:00
Georg Ehrke	ab2554e013	delete old previews	2014-09-21 17:16:21 +02:00
Thomas Müller	7537d405e3	adding 'smallint unsigned' to type mapping for sqlite	2014-09-20 20:06:44 +02:00
Morris Jobke	463dd44d6d	Merge pull request #11178 from owncloud/throw-error-on-preview-instead-in-the-contructor ... Throw error in showPreview instead the constructor	2014-09-19 21:39:30 +02:00
Lukas Reschke	4c6bad7f71	Merge pull request #11158 from owncloud/fix_basic_auth ... Move BasicAuth check to isLoggedIn	2014-09-19 13:39:13 +02:00
Lukas Reschke	6869d2e82a	Throw error in showPreview instead the constructor ... This function is also used in a way such as: ``` $preview = new \OC\Preview(\OC_User::getUser(), 'files'); $info = \OC\Files\Filesystem::getFileInfo($file); if (!$always and !$preview->isAvailable($info)) { \OC_Response::setStatus(404); } else { $preview->setFile($file); $preview->setMaxX($maxX); $preview->setMaxY($maxY); $preview->setScalingUp($scalingUp); $preview->setKeepAspect($keepAspect); } ``` Which won't work anymore since `setFile` is used instead of passing the file in the constructor. Fixes a regression in master.	2014-09-19 13:26:41 +02:00
Vincent Petry	437f8c3cd5	Merge pull request #11119 from owncloud/removeOldUpgradeRoutines ... Remove old upgrade routines	2014-09-19 12:23:42 +02:00
Vincent Petry	f0186d99d2	Merge pull request #11163 from owncloud/check-for-updates-between-major-versions ... Prevent updates between multiple major versions	2014-09-19 12:20:22 +02:00
Robin Appelman	33f7af9207	Merge pull request #10958 from owncloud/db-ilike ... Introduce cross-db ILIKE	2014-09-19 12:07:56 +02:00
Lukas Reschke	a71af58535	Prevent updates between multiple major versions ... Ref https://github.com/owncloud/core/issues/11078	2014-09-18 17:56:06 +02:00
voxsim	7a14f94ae5	1. remove sizeof($filteredUsers) > 0 as condition ... 2. use count instead of sizeof. Latter is an alias to first one, practically we stick to count everywhere. Having it consistent helps with readability. 3. move whitespace so we have $groupUsers[] = $filteredUser; instead of $groupUsers []= $filteredUser;	2014-09-18 17:50:19 +02:00
Lukas Reschke	d0d3b7457b	Move BasicAuth check to "isLoggedIn()" ... Ensures that Basic Auth works properly for APIs and removes the need for some even uglier lines of code.	2014-09-18 16:14:07 +02:00
Robin Appelman	a85f0ae2da	Fix ILIKE without wildcards for oracle	2014-09-18 15:09:57 +02:00
Robin Appelman	c8dbdc29d0	Check for writable datadir during setup	2014-09-18 14:15:52 +02:00
Robin Appelman	23dd7cb51d	Don't complain about non-writable datadirs before we're installed	2014-09-18 13:33:13 +02:00
Robin Appelman	6fa3280c2a	Inject config into checkserver and cleanup tests	2014-09-18 13:33:13 +02:00
Lukas Reschke	d07d5915c9	Remove unused and overflowing function ... Resolves https://github.com/owncloud/core/issues/10991 failure 4	2014-09-18 10:21:28 +02:00
Morris Jobke	c89c6ed21d	Merge pull request #11143 from owncloud/improve-404 ... Make 404 page easier to understand	2014-09-18 09:10:16 +02:00
Lukas Reschke	8fc1a9f5a9	Make 404 page easier to understand ... Fixes https://github.com/owncloud/core/issues/11133	2014-09-17 22:57:32 +02:00
Remco Brenninkmeijer	f930b356e6	Error needs to push body-id for new guest layout	2014-09-17 18:02:18 +02:00
Lukas Reschke	ef0a0f5f87	Merge pull request #9554 from owncloud/fix_preview_orientation ... fix orientation in image-backend, not in preview system itself	2014-09-17 17:05:47 +02:00
Robin Appelman	0c03b2bdd5	Use ILIKE in cache search	2014-09-17 16:12:54 +02:00
Lukas Reschke	c88d517e88	Merge pull request #10622 from owncloud/recursive-delete-forbidden ... Fix isDeletable	2014-09-17 15:36:41 +02:00
Robin Appelman	67b1ec1faf	Implement ILIKE for sqlite	2014-09-17 13:47:55 +02:00
Robin Appelman	60587e9dcd	Make sqlite LIKE case sensitive on default	2014-09-17 13:47:33 +02:00
Morris Jobke	c6eab9aaba	fix error message template	2014-09-17 13:25:50 +02:00
Lukas Reschke	6d3757f864	Do not show exception to the end-user ... Log the error instead of potentially leaking sensitive information	2014-09-17 13:17:52 +02:00
Morris Jobke	b644e8a5e7	Merge pull request #10932 from owncloud/issue/10926 ... Add a method to get the absolute url for a route	2014-09-17 13:05:26 +02:00
Lukas Reschke	33c0d2f743	Fix mapping of relative paths	2014-09-17 11:38:10 +02:00
Robin Appelman	2f22e67570	Also check if the file itself is updatable	2014-09-17 11:35:16 +02:00
Robin Appelman	d25a9a118f	Check if a folder is deletable before we try to recursively delete it	2014-09-17 11:35:16 +02:00
Robin Appelman	ab79caf29b	Check if the parent is writable to check if a file is deletable	2014-09-17 11:35:16 +02:00
Lukas Reschke	0d37e16499	Merge pull request #11092 from owncloud/conceal_sabredav_version ... Conceal or display SabreDAV version number.	2014-09-17 10:35:50 +02:00
Lukas Reschke	2cfa07049f	Remove old upgrade routines ... We do not support updates from 6 to 8 directly, therefore we can remove those upgrade routines.	2014-09-16 20:27:52 +02:00
Lukas Reschke	368391e401	Merge pull request #11009 from owncloud/tobiasKaminsky-route ... REST API for thumbnails	2014-09-16 19:31:51 +02:00
Lukas Reschke	4ebc11aa8d	Merge pull request #11102 from owncloud/visit1985-issue_108 ... mysql setup: if dbuser exists try a different one (owncloud/core#108)	2014-09-16 18:54:37 +02:00
Lukas Reschke	d2743e6ad6	Merge pull request #7254 from owncloud/core-sortalgo ... Fixed JS sort comparator to be consistent between JS and PHP	2014-09-16 17:29:03 +02:00
Thomas Müller	ba445e85b2	Merge pull request #11082 from owncloud/deduplicateDependencyCheck ... Deduplicate dependency checks	2014-09-16 16:33:02 +02:00
Lukas Reschke	2f10b60c9e	Merge pull request #10754 from cetra3/master ... Refactor internal session handler to write directly to $_SESSION	2014-09-16 15:48:19 +02:00
Thomas Müller	ca35d86c5a	adding ILIKE to AdapterSQLSrv	2014-09-16 15:44:21 +02:00
Robin Appelman	1771bfc2f2	Introduce cross-db ILIKE	2014-09-16 15:32:34 +02:00
tobiasKaminsky	e62d5b7e55	Route for thumbnail generation ... Thumbnail generation Removed Log Added requested changes Added requested changes. - Fix code style - Add exception if file does not exist - Switch route styling Replaces https://github.com/owncloud/core/pull/10805 Fix codestyle Fix codestyle Migrate to appframework Fix typo	2014-09-16 15:00:58 +02:00
Lukas Reschke	261d07c95c	Merge pull request #11084 from owncloud/no-migration-for-mssql-master ... Disable database migrations for MSSQL - scripts have to be applied manua...	2014-09-16 14:00:24 +02:00
scolebrook	f31e4066de	Conceal or display SabreDAV version number in browser and http response headers.	2014-09-16 13:25:44 +02:00
Lukas Reschke	5813cf32dc	Deduplicate dependency checks ... Some code that I also used for https://github.com/owncloud/administration/pull/11	2014-09-16 13:07:47 +02:00
Michael Göhler	e6609d0970	simplify mysql user creation flow ... if dbuser exists try a different one, owncloud/core#108 changed outdated comment corrected length calculation changed indentation for else clauses	2014-09-16 11:53:54 +02:00
Morris Jobke	dd70d1b88c	Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdoc ... Fix unexisting class and PHPDoc	2014-09-16 10:29:01 +02:00
Morris Jobke	af52ffc5d5	Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspect ... add y to with-aspect naming schema	2014-09-16 08:36:33 +02:00
Morris Jobke	245a0e2ad8	Merge pull request #10362 from owncloud/preserve_transparency_on_fileload ... Preserve transparency when loading from a file	2014-09-16 08:33:56 +02:00
voxsim	1366133d2b	add more logic in displayNamesInGroup for big user bases	2014-09-15 18:37:54 +02:00
Lukas Reschke	4f0f7e35ca	Fix unexisting class and PHPDoc ... You can't add int here as hint...	2014-09-15 17:08:56 +02:00
Morris Jobke	06eb3b62c6	Merge pull request #10109 from owncloud/issue_#9793_guestlayout ... Step one, open guest layout for different styles.	2014-09-15 15:15:41 +02:00
Georg Ehrke	cf76933b76	add phpdoc	2014-09-15 15:10:03 +02:00
Georg Ehrke	3157d307f7	add y to with-aspect naming schema	2014-09-15 15:10:03 +02:00
Thomas Müller	d824d03fe1	Disable database migrations for MSSQL - scripts have to be applied manually	2014-09-15 15:00:32 +02:00
Lukas Reschke	07b14bcd4f	Merge pull request #10960 from owncloud/use-intl-module-master ... use intl's native normalizer_normalize() in case the module is available	2014-09-15 14:13:30 +02:00
Raghu Nayyar	1145529584	Merge pull request #11041 from owncloud/no-size-check-on-lock-master ... content size checks are not valid for LOCK	2014-09-13 00:48:52 +05:30
Lukas Reschke	5ff999d69d	Return false in case one of the values is null	2014-09-12 13:34:45 +02:00
Thomas Müller	27cd30aa94	content size checks are not valid for LOCK	2014-09-12 09:42:32 +02:00
Thomas Müller	4878f7a416	Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecauseSupporting53IsSomethingReallyReallyCoolAndWeAreObviouslySomeOfTheCoolGuys ... Add custom hex2bin implementation for 5.3	2014-09-11 15:05:36 +02:00
Lukas Reschke	7d2c521b46	Step one, open guest layout for different styles. ... Conflicts: core/templates/layout.guest.php Step one, open guest layout for different styles.	2014-09-11 11:41:02 +02:00
Thomas Müller	59209e0f2b	use intl's native normalizer_normalize() in case the module is available	2014-09-11 10:24:31 +02:00
Lukas Reschke	bfebbe47de	Merge pull request #10962 from owncloud/repair_search_lucene ... repair search lucene before installing	2014-09-11 10:09:43 +02:00
Lukas Reschke	1973275adc	Add custom hex2bin implementation for 5.3 ... Fixes https://github.com/owncloud/core/issues/11004	2014-09-11 09:51:45 +02:00
kondou	18ef7bf1ed	Preserve transparency when loading from a file ... Fix #7148 - again :)	2014-09-10 23:49:21 +02:00
Thomas Müller	2a382a87d5	Merge pull request #10988 from owncloud/usetransactions-wrong-name ... Fix method name useTransactions	2014-09-10 17:27:23 +02:00
Robin Appelman	fa2b385d33	Fix method name	2014-09-10 15:59:24 +02:00
Vincent Petry	70ebe86e60	Merge pull request #10929 from owncloud/issue/10514 ... Set overwritewebroot when installing owncloud to avoid problems	2014-09-10 15:07:57 +02:00
Jörn Friedrich Dreyer	8e2acb1482	repair search lucene before installing	2014-09-10 10:22:40 +02:00
Bernhard Posselt	ba698a4942	Merge pull request #10972 from ppaysant/routes-defaults ... Allow default values for route parameters.	2014-09-09 23:40:46 +02:00
Lukas Reschke	c3d90b96c8	Merge pull request #10922 from owncloud/explicit-scan-transactions ... Use bigger transactions when doing explicit file system scans	2014-09-09 23:32:32 +02:00
Patrick Paysant	cb5416b798	Allow default values for route parameters.	2014-09-09 23:00:29 +02:00
Bernhard Posselt	023e066971	more sugar for including lists of templates	2014-09-09 15:47:42 +02:00
Bernhard Posselt	d02f6c7ebe	Merge pull request #10947 from owncloud/html-imports ... add template functions for html imports	2014-09-09 14:07:46 +02:00
Jörn Friedrich Dreyer	3d4f77c8f1	Merge pull request #10949 from owncloud/allow_prefilling_login ... allow prefilling login	2014-09-09 11:42:14 +02:00
Lukas Reschke	353155b516	Merge pull request #7323 from owncloud/Jonny007-MKD-master ... Update adapter.php	2014-09-09 11:31:50 +02:00
Jörn Friedrich Dreyer	ed2414fd0d	Merge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstore ... Keep fileid on move in objectstore, fixes #10848	2014-09-09 10:25:10 +02:00
VicDeo	efd485acda	Merge pull request #10858 from owncloud/issue/10847 ... Use correct language package so the subject is correctly translated	2014-09-09 01:11:34 +03:00
Jörn Friedrich Dreyer	0aad7fa1b1	allow prefilling login	2014-09-08 21:44:13 +02:00
Bernhard Posselt	f685d03674	append .html since componets always use html files	2014-09-08 21:37:18 +02:00
Bernhard Posselt	4aff85cd0c	add template functions for html imports	2014-09-08 21:19:44 +02:00
Lukas Reschke	70abce0482	Merge pull request #10739 from owncloud/eventsource-public ... Add EventSource to the public API	2014-09-08 18:46:27 +02:00
Lukas Reschke	c79c894dbb	Merge pull request #10755 from owncloud/shorter_sharing_links ... Shorter sharing links	2014-09-08 17:26:20 +02:00
Lukas Reschke	2d847934ed	Merge pull request #10938 from owncloud/useSecureMimetype ... Use secure mimetype for content delivery	2014-09-08 17:13:54 +02:00
Lukas Reschke	5de404eb92	Merge pull request #10827 from oparoz/patch-2 ... Libreoffice config folder needs to be set	2014-09-08 16:41:26 +02:00
Lukas Reschke	fa718d2e2c	Fix typo	2014-09-08 16:34:03 +02:00
Lukas Reschke	0cdfe4f8c2	Merge pull request #10911 from owncloud/template-funcs ... Add template shortcut functions for style and script	2014-09-08 16:32:05 +02:00
Lukas Reschke	312ed18d15	Use secure mimetype for content delivery ... Adds some hardening against potential CSP bypassed.	2014-09-08 15:57:39 +02:00
Joas Schilling	c5b5378558	Add a method to get the absolute url for a route ... Fix #10926	2014-09-08 14:43:14 +02:00
Joas Schilling	249558966e	Set overwritewebroot when installing owncloud to avoid problems ... Fix #10514	2014-09-08 14:30:13 +02:00
Robin Appelman	644755df66	Use bigger transactions when doing explicit file system scans	2014-09-08 14:15:41 +02:00
Vincent Petry	637cff68ac	Merge pull request #10862 from chli1/master ... fix BadRequest error if CONTENT_LENGTH not set	2014-09-08 10:00:15 +02:00
cetra3	459ead69f6	Merge branch 'master' of https://github.com/owncloud/core	2014-09-08 15:05:49 +09:30
Bernhard Posselt	7e4d244200	add shortcut functions for style and script	2014-09-06 14:25:28 +02:00
Jörn Friedrich Dreyer	8488be4d03	Keep fileid on move in objectstore, fixes #10848	2014-09-05 13:25:59 +02:00
Robin Appelman	e29b7e9335	Remove explicit propagate calls	2014-09-05 11:53:24 +02:00
Robin Appelman	d0e83a71aa	Update cache before post hooks	2014-09-05 11:53:24 +02:00
Robin Appelman	1d8a88dd1b	Fix warning in homecache	2014-09-05 11:53:23 +02:00
Robin Appelman	850542c5d6	Refactor Cache\Updater to work outside of the users home	2014-09-05 11:53:23 +02:00
kondou	ecc9b42e41	Match \OC_Helper::linkToPublic() to new links and fit unittests	2014-09-04 20:44:50 +02:00
kondou	a10411d2bc	Readd TOKEN_LENGTH	2014-09-04 19:09:26 +02:00
Jesus Macias Portela	523680cef2	Merge pull request #10840 from owncloud/issue_10674 ... Solve bug with touch always return true on /lib/private/files/view.php	2014-09-04 17:29:08 +02:00
kondou	226b203e20	Use base62 and remove configuration options for link length	2014-09-04 16:20:20 +02:00
kondou	c2d8eabd71	Change config.sample entry and use MediumSecurity	2014-09-04 15:52:23 +02:00
kondou	3bf725d7e0	Adapt token size to new generation and add an option for free length specification ... Minimum size is 3 = 46656 tokens, maximum size is 64, which is what our DB allows.	2014-09-04 15:24:33 +02:00
kondou	2a4c51389c	Use a route instead of s.php and convert tokens asap	2014-09-04 15:23:55 +02:00
kondou	0f2ad9862e	Initial work on shorter links	2014-09-04 15:23:53 +02:00
Lukas Reschke	1a7df33233	Merge pull request #10818 from owncloud/enableappforgroupfix ... Fix upgrade process when apps enabled for specific groups	2014-09-04 13:56:41 +02:00
chli1	712487c861	fix BadRequest error if CONTENT_LENGTH not set ... If client does not send content length header on webdav upload (e.g. because the content comes from a stream and its length is not predictable) the put() method should not try to compare the content length value with the actually amount of received data, because this will always fail and results in a BadRequest exception. So the check will only be performed if $_SERVER['CONTENT_LENGTH'] is set.	2014-09-04 13:49:15 +02:00
Robin Appelman	fa3393674c	Better phpdoc and method naming	2014-09-04 13:26:51 +02:00
Robin Appelman	8605e2e6a5	Explicitly cast id and validate type	2014-09-04 13:26:47 +02:00
Olivier Paroz	bbc2d7cf4f	Typ in whichOpenOffice test	2014-09-04 12:54:20 +02:00
Joas Schilling	a0e8e88bc6	Use correct language package so the subject is correctly translated ... Fix #10847	2014-09-04 11:23:23 +02:00
Lukas Reschke	8fec19a872	Merge pull request #10790 from cbhp/master ... added missing User-Agents	2014-09-03 22:40:12 +02:00
Jesus Macias	91c8174013	Fix code with previous comments	2014-09-03 18:21:24 +02:00
Jesus Macias	883649b69c	Reset changes on 3rdparty submodule	2014-09-03 18:20:09 +02:00
cbhp	c00450b2c7	always use a user-agent constant ... Some providers block connections with missing user-agents. Also user-agents are useful for analyzing requests. I've added a USER_AGENT constant that is used in cURL and in file_get_contents.	2014-09-03 18:00:05 +02:00
Lukas Reschke	63a90a129b	Use proper RNG generator ... OC_Util::generateRandomBytes() only returns lowercase alphanumeric values. We should use the new RNG which has a broader characterset.	2014-09-03 17:46:48 +02:00
Lukas Reschke	26f337d523	Only return lowercase letters and digits for backwards compatbility	2014-09-03 17:18:00 +02:00
Thomas Müller	954925eaa0	Merge pull request #10667 from pmjdebruijn/itunes-appid ... defaults: add customizable defaultiTunesAppId	2014-09-03 16:26:20 +02:00
Olivier Paroz	eaab067716	env:UserInstallation was already there in master ... My changes were made against stable7 and I merged them to the file in master, so this version is now the properly merged file for master. I'm just adding `owncloud-<instanceid>` to the path where temp files are stored.	2014-09-03 16:08:40 +02:00
Lukas Reschke	373d1c5e9f	Merge pull request #10642 from owncloud/securityutils ... Add some security utilities	2014-09-03 15:28:42 +02:00
Clark Tomlinson	d64cacec43	Merge pull request #10826 from oparoz/master ... Adding TIFF support to the files app	2014-09-03 09:14:35 -04:00
Clark Tomlinson	0400f7845c	Merge pull request #10723 from owncloud/webdav-folder-size ... adding new webdav property containing the folder size	2014-09-03 09:07:23 -04:00
Robin Appelman	65608d7c92	Use the public api to get event sources	2014-09-03 13:36:15 +02:00
Robin Appelman	dad53180bc	Add event source to the public api	2014-09-03 13:36:15 +02:00
Robin Appelman	54c918fe48	Initialize an event source when we start using it, not in the constructor	2014-09-03 13:35:04 +02:00
Olivier Paroz	3bf155e138	This is not a PDF, there are no pages	2014-09-03 12:32:59 +02:00
Thomas Müller	6cdb1d89ae	Merge pull request #10761 from canadaduane/fix_occ_upgrade ... Ensure db connection before changing cache state	2014-09-03 11:27:16 +02:00
Thomas Müller	52dc31e13c	Merge pull request #10725 from owncloud/sabredav-etag-master ... adding OC-ETag header	2014-09-03 11:21:47 +02:00
Lukas Reschke	77c0adb520	Merge branch 'securityutils' of https://github.com/owncloud/core into securityutils	2014-09-03 11:04:49 +02:00
Lukas Reschke	50b430ee7c	Add char consts, hash the specified password for the HMAC	2014-09-03 11:03:27 +02:00
Olivier Paroz	0c3c72aec0	Libreoffice config folder needs to be set ... In order to avoid conflicts between multiple instances installed on one server, it's required to define a LibreOffice configuration folder per instance. Just like with my PR for the documents app (https://github.com/owncloud/documents/pull/353), I propose to use /tmp/owncloud-instanceid	2014-09-03 03:12:35 +02:00
Olivier Paroz	b559b21dc3	Converts TIFF files to PNG	2014-09-02 22:56:39 +02:00
Olivier Paroz	1e600a0d36	Adding support for tiff files	2014-09-02 22:53:41 +02:00
Vincent Petry	e05b95636b	Fix upgrade process when apps enabled for specific groups ... Fix issue where the currently logged user was causing side-effects when upgrading. Now setting incognito mode (no user) on update to make sure the whole apps list is taken into account with getEnabledApps() or isEnabled().	2014-09-02 17:16:14 +02:00
Robin Appelman	a9a37b5363	Don't automatically setup the filesystem the moment we load OC\Files\FileSystem	2014-09-02 16:15:42 +02:00
cbhp	969b41c1c9	added missing User-Agents ... header "User-Agent" was missed	2014-08-31 19:44:06 +02:00
Morris Jobke	4024960a0e	Merge pull request #10780 from owncloud/config-public ... Extend public config interface	2014-08-31 15:54:35 +02:00
Lukas Reschke	8009df0b60	Merge pull request #10420 from owncloud/external-share-self-signed ... Make external shares work with imported self signed certificates	2014-08-31 15:50:30 +02:00
Robin Appelman	0a1e5aebf1	Extend public config interface	2014-08-31 15:27:36 +02:00
Lukas Reschke	ae3425d2da	Merge branch 'master' into securityutils ... Conflicts: lib/private/util.php	2014-08-31 15:21:09 +02:00
Lukas Reschke	a197ef0f6c	Merge pull request #10768 from owncloud/l10n-use-public ... Use public api for getting l10n	2014-08-31 11:58:59 +02:00
Robin Appelman	bfa0c4b78a	Explicitly set the timezones	2014-08-31 11:06:18 +02:00
Lukas Reschke	4efe6f6240	Add unit tests and fix rootcerts creation bug	2014-08-31 10:47:50 +02:00
Robin Appelman	e64aa330fd	check for blacklisted file certificate filenames	2014-08-31 10:47:50 +02:00
Robin Appelman	79d896e830	Rename namespace	2014-08-31 10:47:50 +02:00
Robin Appelman	6044ad0e17	Cleanup certificate code	2014-08-31 10:47:50 +02:00
Robin Appelman	ba8416a04f	move certificate classes to their own namespace	2014-08-31 10:47:50 +02:00
Robin Appelman	c158db7200	Add certificate class	2014-08-31 10:47:50 +02:00
Robin Appelman	c1b11571ea	Move certificate management interface from files_external to core	2014-08-31 10:47:50 +02:00
Robin Appelman	4efdbff6df	No need for this folder to be world accessible	2014-08-31 10:45:11 +02:00
Robin Appelman	dcc4f96d3e	Verify names of certificates	2014-08-31 10:45:11 +02:00
Robin Appelman	ecdbf00628	Move certificate management code to core	2014-08-31 10:45:10 +02:00
Robin Appelman	d0266c0bf8	Use public api for getting l10n	2014-08-31 10:08:22 +02:00
Morris Jobke	06e6f10ce4	Add optional user ID parameter for getUseFolder	2014-08-31 09:49:19 +02:00
Duane Johnson	ccf440495e	Ensure db connection before changing cache state ... When trying to upgrade from 7.0.0 to 7.0.2, the manual upgrade path (e.g. ` sudo -u www-data /usr/bin/php5 ./occ upgrade`) exits with the following fatal error: ``` /var/www/owncloud# php occ upgrade PHP Fatal error: Call to a member function disableQueryStatementCaching() on a non-object in /var/www/owncloud/lib/private/db.php on line 423 ``` This is caused by the self::$connection static variable having not been initialized at the point of call. Adding a self::connect() fixes the issue. See https://forum.owncloud.org/viewtopic.php?f=29&t=23398&p=68556#p68556	2014-08-30 15:46:56 -06:00
cetra3	6b24aa5224	Refactor internal session to write directly to $_SESSION	2014-08-30 08:48:13 +00:00
Robin Appelman	0b88355368	Merge pull request #10721 from owncloud/kill-rand ... Kill insecure random number generation	2014-08-29 19:48:00 +02:00
Morris Jobke	3a4b71ffb4	Merge pull request #10734 from owncloud/fix-10268 ... retrieve local users, groups and group members in a sorted way	2014-08-29 19:35:32 +02:00
Lukas Reschke	35276def1c	Merge pull request #10614 from owncloud/remove-ee-hack ... Remove different URL for EE	2014-08-29 18:23:15 +02:00
Jörn Friedrich Dreyer	10382ef2f0	allow empty hostname and dots in service name for oracle autosetup	2014-08-29 17:09:17 +02:00
Robin Appelman	3de69ff81b	Don't register the call when rendering error pages	2014-08-29 15:44:39 +02:00
Robin Appelman	dd7b8e4555	Remove insecure fallback random number generation	2014-08-29 15:44:09 +02:00
Arthur Schiwon	0bb460c9b5	retrieve local users, groups and group members in a sorted way	2014-08-29 15:17:37 +02:00
Thomas Müller	96a931929e	adding OC-ETag header	2014-08-29 12:09:33 +02:00
Thomas Müller	647120fb36	adding new webdav property containing the folder size	2014-08-29 11:39:02 +02:00
Jörn Friedrich Dreyer	f551917a3c	kill OC::$session ... maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession restore order os OC::$session and OC::$CLI remove unneded initialization of dummy session write back session when $useCustomSession is true log warning when deprecated app is used	2014-08-29 10:22:21 +02:00
voxsim	a49610e18a	change logic in displayNamesInGroup and add some unit tests	2014-08-28 13:51:48 +02:00
Arthur Schiwon	aeb9cfc6c9	make sure class file is loaded once	2014-08-28 12:34:29 +02:00
Lukas Reschke	9ab62ad5b7	Escape error messages	2014-08-27 17:01:51 +02:00
Clark Tomlinson	cb0da1178b	Merge pull request #10653 from owncloud/x-forwarded-for ... Add support for getting the real client IP behind proxies	2014-08-27 10:32:34 -04:00
Pascal de Bruijn	49da0a7943	defaults: add customizable defaultiTunesAppId	2014-08-27 14:07:39 +02:00
Björn Schießle	c35d60f6d8	Merge pull request #9915 from suraia/unsharefromself-source ... Allow specifying the item source in unshareFromSelf().	2014-08-27 10:31:35 +02:00
Lukas Reschke	3329e0f2b2	Use DI	2014-08-27 00:49:53 +02:00
Lukas Reschke	d26a9c3c58	Add some security utilities ... This adds some security utilities to core including: - A library for basic crypto operations (e.g. to encrypt passwords) - A better library for cryptographic actions which allows you to specify the charset - A library for secure string comparisions Remove .htaccess Remove .htaccess Fix typo Add public API Use timing constant comparision Remove CBC constant Adjust code Remove confusing $this	2014-08-27 00:18:04 +02:00
Lukas Reschke	7acdd018a1	Add support for getting the real client IP behind proxies ... Fixes https://github.com/owncloud/core/issues/10624 Fix copy paste fail Add unittest for comma separated headers Revert 3rdparty	2014-08-27 00:05:04 +02:00
Thomas Müller	2e8026a7b5	Merge pull request #10619 from owncloud/issue/6722 ... Add a test to break the slugifyPath() with folder and file afterwards	2014-08-26 10:33:18 +02:00
Lukas Reschke	ca7e4c8c67	Add isAppstoreEnabled instead of hijacking the URL	2014-08-26 10:20:51 +02:00
Clark Tomlinson	6523c575f3	Merge pull request #10623 from owncloud/not-a-valid-resource-log-entries ... Do not try to close the same resource multiple times	2014-08-25 12:52:06 -04:00
Vincent Petry	c86824fa09	Merge pull request #10023 from owncloud/tmp-file-created-status ... Log unsuccessful temp file creation and return false	2014-08-25 17:24:46 +02:00
Joas Schilling	989da69cff	Do not try to close the same resource multiple times	2014-08-25 15:31:43 +02:00
Joas Schilling	1846aebfff	Use md5() of the original name instead of uniqid() for slugifying ... Previously we used uniqid() here. However this means that the behaviour is not reproducable, so when uploading files into a "empty" folder, the folders name is different. If there would be a md5() hash collition, the deduplicate check will spot this and append an index later, so this should not be a problem. Fix #6722	2014-08-25 15:06:12 +02:00
Joas Schilling	b861e1d696	Fix code layout before fixing the function	2014-08-25 15:06:10 +02:00
Jörn Friedrich Dreyer	ebf7758d10	Merge pull request #10595 from owncloud/swift-stream ... Stream downloads from Swift object stores without downloading it first	2014-08-25 11:26:39 +02:00
Lukas Reschke	4bc72cc4e0	Remove different URL for EE ... This can now be achieved by setting `appstoreenabled` to `false` in config.php	2014-08-24 20:22:15 +02:00
Clark Tomlinson	2ad0d3f1be	Throw exception if file cannot be accessed via http ... Format file Removing calls to deprecated classes and using internal method to get via http Missed a character Fix inverted logic	2014-08-22 19:41:30 -04:00
Thomas Müller	a77d468d35	Merge pull request #10584 from owncloud/simple-wizard-trusted-domains ... Add a trusted domain wizard	2014-08-22 17:12:17 +02:00
Lukas Reschke	88c3a4a31a	Expose setSystemValue	2014-08-22 15:53:23 +02:00
Thomas Müller	0e8916b147	Merge pull request #7539 from owncloud/repair-legacystorageid ... Added repair script to upgrade the legacy home storage ids	2014-08-22 14:22:39 +02:00
Robin Appelman	191a82e768	Stream downloads from Swift object stores without downloading it first	2014-08-22 14:11:36 +02:00
Thomas Müller	b8b2ef8748	no statement caching for Oracle	2014-08-22 12:06:36 +02:00
Robin Appelman	63570df75f	Add files as string to tar archives	2014-08-21 08:49:57 +02:00
Robin Appelman	88c32861bc	reformat	2014-08-21 08:49:57 +02:00
Vincent Petry	8f201c7383	Explicily close the statement cursors ... Fixes the issue that makes SQLite freeze on later tests.	2014-08-20 23:49:15 +02:00
Lukas Reschke	92c80dd946	Merge pull request #10518 from owncloud/fix_storage_const_autoload ... Fix storage const autoload	2014-08-20 23:23:42 +02:00
Vincent Petry	068f9d10f1	Added repair step for legacy storages	2014-08-20 23:14:05 +02:00
Vincent Petry	36c88e2830	Merge pull request #10422 from owncloud/dav-disablerangerequestwhennotsupported ... Return whole file if range request cannot be granted due to encryption	2014-08-20 18:14:09 +02:00
Morris Jobke	9a5e745a64	fix typo	2014-08-19 16:45:22 +02:00
Morris Jobke	b3b3354809	move to public namespace	2014-08-19 14:05:08 +02:00
Stephan Peijnik	5d7deefd95	Use tabs for indentation. ... Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>	2014-08-19 13:55:43 +02:00
Stephan Peijnik	2df52e54d7	Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem. ... As constants not defined within a class cannot be automatically found by the autoloader moving those constants into a class makes them accessible to code which uses them. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>	2014-08-19 13:55:35 +02:00
Robin Appelman	fdfc5c67f8	Merge pull request #9866 from owncloud/app-upgrade ... Don't do app upgrades in the background	2014-08-19 13:33:38 +02:00
Thomas Müller	1c23f54d42	Merge pull request #10341 from owncloud/issue/9928 ... [Issue/9928] Problems with filemtime in MappedLocal Storage	2014-08-19 10:10:09 +02:00
Vincent Petry	ec274ad40b	Use afterBind to send fileId header for files and directories ... afterBind is called for both files and directories and is now used to send the OC-FileId headers.	2014-08-18 18:40:58 +02:00
helix84	722a119e46	fix typo in util.php	2014-08-18 15:59:36 +02:00
Robin Appelman	ab590ce9a0	fix undefined variable	2014-08-18 15:30:46 +02:00
Thomas Müller	62e06cb0ba	Merge pull request #10472 from owncloud/fix_undefined_index_ocsid ... check if array index ocsid is set before accessing it	2014-08-18 10:43:21 +02:00
Thomas Müller	c933848c55	Merge pull request #10156 from owncloud/issue/9968 ... Check return of fopen() before using it	2014-08-18 10:35:04 +02:00
Frank Karlitschek	ddeb301ad6	Merge pull request #10456 from kroimon/skeleton_dir_config ... Make skeleton directory configurable.	2014-08-17 20:01:02 -04:00
Georg Ehrke	7347174636	check if array index ocsid is set before accessing it	2014-08-17 22:26:14 +02:00
Lukas Reschke	a2677c14c8	Remove X-Mailer header from mails	2014-08-17 18:55:13 +02:00
Stefan Rado	ccc46be740	Make skeleton directory configurable.	2014-08-16 01:07:42 +02:00
Lukas Reschke	a822a31ce3	Merge pull request #10442 from owncloud/move-failed-logins ... Move authentication failed logging to checkPassword	2014-08-15 16:50:28 +02:00
Lukas Reschke	98fc56831d	Merge pull request #9275 from NormalRa/master ... Add .apk mimetype.	2014-08-15 14:41:53 +02:00
Lukas Reschke	a82cd1ff67	Fix unit test	2014-08-15 14:15:27 +02:00
Lukas Reschke	5bb4772858	Move authentication failed logging to checkPassword ... Fixes https://github.com/owncloud/core/issues/10366	2014-08-15 12:13:00 +02:00
Jörn Friedrich Dreyer	799fb46927	add missing @deprecated annotation to legacy classes	2014-08-14 22:18:12 +02:00
Thomas Müller	c1102b1671	Merge pull request #10417 from owncloud/update_deprecation_doc ... update deprecation docs	2014-08-14 17:54:23 +02:00
Björn Schießle	64c3fe670c	Merge pull request #10399 from owncloud/fix_setSendMailStatus ... [sharing] fix mail notification	2014-08-14 17:45:39 +02:00
Joas Schilling	4d32e3548b	Ensure that filename is prefixed with a slash	2014-08-14 16:48:30 +02:00
Clark Tomlinson	4502eaf9f8	Merge pull request #10414 from owncloud/relax-code-checker ... in order to prevent false-positives on the code checker - exec and eval ...	2014-08-14 09:35:20 -04:00
Vincent Petry	cc8c1d8e07	Return whole file if range request cannot be granted due to encryption ... Whenenver range headers are set and encryption is enabled, it is not possible to automatically fseek() to the proper position. To avoid returning corrupt/invalid data or causing a decryption error, the range headers are stripped so that the SabreDAV code in httpGet() returns the whole file.	2014-08-14 15:18:49 +02:00
Jörn Friedrich Dreyer	fd798fd982	update deprecation docs	2014-08-14 12:22:34 +02:00
Morris Jobke	987a0565fb	Merge pull request #10395 from owncloud/close-filehandle-lib-files ... Close open file handles in files library	2014-08-14 10:57:54 +02:00
Thomas Müller	a4932dc5e2	in order to prevent false-positives on the code checker - exec and eval will not longer be grepped for	2014-08-14 10:48:42 +02:00
Thomas Müller	6d94fc846d	Merge pull request #10394 from owncloud/close-filehandle-lib-image ... Close file handle if exception occurs in image class	2014-08-13 22:41:33 +02:00
Robin Appelman	bba59bf815	Cast file id's to int so we can compare them properly	2014-08-13 19:18:34 +02:00
Bjoern Schiessle	d9f35d8c15	we need the recipient as a additional parameter to know for which share the notification was send	2014-08-13 17:02:51 +02:00
Morris Jobke	c6bf51c457	Close open file handles in files library ... ref #10392	2014-08-13 15:48:32 +02:00
Morris Jobke	f61658945f	Close file handle if exception occurs in image class ... ref #10392	2014-08-13 15:19:58 +02:00
Robin Appelman	174805f5e3	Merge pull request #9762 from owncloud/owner-public ... Return the proper owner for home storages	2014-08-12 14:29:17 +02:00
Normal Ra	1633ec5c87	APK mimetype icon to be a generic package icon.	2014-08-12 14:10:49 +02:00
Clark Tomlinson	e63853a353	Merge pull request #10335 from owncloud/fix-emptyapplist ... Fix issue when no apps are enabled	2014-08-11 16:16:18 -04:00
Thomas Müller	3e493501da	Merge pull request #9890 from owncloud/check-php-charset-master ... setting and checking default_charset in php.ini to be UTF-8	2014-08-11 22:11:11 +02:00
Vincent Petry	a32eac1477	Fix issue when no apps are enabled ... Properly initialize $apps array	2014-08-11 20:36:51 +02:00
Joas Schilling	564bf23c1b	Do not filemtime() on "." directory. Use empty string instead ... Fix #9928	2014-08-11 17:39:37 +02:00
Joas Schilling	d7666d9d3d	Remove doubled slash between folder and path	2014-08-11 16:50:52 +02:00
Thomas Müller	13d44f8f7f	Merge pull request #10251 from owncloud/fix-dav-attributes-master ... shared files/folders are not mounted	2014-08-11 14:40:47 +02:00
Vincent Petry	79fa2bc391	Merge pull request #10301 from owncloud/fix-internal-mail-share-links ... Don't use /Shared as a base for links in share email	2014-08-11 13:33:39 +02:00
Vincent Petry	f2001a48a4	Fixed sort algo for additional cases	2014-08-11 13:28:53 +02:00
Vincent Petry	173059f6d0	Fixed file list sorting ... Now using a natural sort algorithm that is more consistent between JS and PHP (although not perfect in some corner cases) - added OC.Util.naturalSortComparator that uses the same algo that was used for the user list - changed user list and files list to use OC.Util.naturalSortComparator - removed toLowerCase() and changed the comparator to use String.localeCompare() - added unit tests - added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()	2014-08-11 13:28:53 +02:00
Thomas Müller	b83d00f847	Merge pull request #10249 from mroi/patch-1 ... file size on non-(Linux/BSD/Windows)-installations	2014-08-11 13:02:01 +02:00
Tom Needham	aeef10eb47	Add scrollto to the url if sharing a file for long file lists	2014-08-09 00:21:29 +01:00
Tom Needham	16dafa9cac	Fix link to files and folders in internal share emails	2014-08-09 00:08:45 +01:00
Bjoern Schiessle	6dda30b5a2	remove share permissions if user is excluded from sharing	2014-08-08 12:16:54 +02:00
Morris Jobke	b6a2a85bb8	Merge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttf ... implement a txt preview fallback for the case that ttf is not support	2014-08-07 22:55:06 +02:00
Thomas Müller	520f6422ac	Merge pull request #10079 from owncloud/Improve_scanner_message ... Improved scanner error message	2014-08-07 16:09:52 +02:00
Thomas Müller	9d2cff50ed	shared files/folders are not mounted	2014-08-07 16:01:13 +02:00
Michael Roitzsch	cde1a9241d	file size on non-(Linux/BSD/Windows)-installations ... Determining the file size using the exec() method is implemented for Linux, BSD, and Windows. However, on systems matching neither platform name (like SunOS), the fall-through path will return a file size result constituting a zero size instead of an invalid null return value.	2014-08-07 15:41:58 +02:00
Thomas Müller	e33fc2807c	Merge pull request #10142 from owncloud/fix-#9283-gzip_support ... Removed broken tar cutter, added tar and fixed extension switch.	2014-08-07 14:53:31 +02:00
Robin Appelman	f1091280de	Merge pull request #10184 from owncloud/getbyid-node ... Fix Folder::getById	2014-08-07 13:40:17 +02:00
Thomas Müller	d2365afad6	Merge pull request #8915 from owncloud/MorrisJobke-travis ... Travis support for PRs and master, stable5 and stable6	2014-08-07 11:33:13 +02:00
Volkan Gezer	173538befb	typo fix from transifex suggestion	2014-08-06 20:48:26 +02:00
Robin Appelman	12207ec0c7	Fix SharedCache::getPathById	2014-08-06 13:38:14 +02:00
Robin Appelman	1deb6aadd3	return null instead of throwing an exception	2014-08-06 12:06:41 +02:00
Thomas Müller	a72dae6842	Merge pull request #10144 from owncloud/issue/9972 ... Issue/9972 Fix issues with group and username `0`	2014-08-06 09:53:13 +02:00
Morris Jobke	9fb79c86f0	Merge pull request #10191 from owncloud/sharing_rm_trailing_slash ... [sharing] remove trailing slash	2014-08-05 23:13:35 +02:00
Bjoern Schiessle	48c57b80e3	remove trailing slash from path	2014-08-05 20:34:32 +02:00
Björn Schießle	d35bfc9a4c	Merge pull request #9520 from owncloud/theme_urls ... Add ability to theme iOS and Android client URLs just like desktop URLs.	2014-08-05 17:53:18 +02:00
Robin Appelman	bf8f910a32	Fix Folder::getById	2014-08-05 16:58:10 +02:00
Morris Jobke	676fa459d7	Minor fixes ... * instanceof \OC\Files\View * fix misplaced paranthesis * remove misplaced character in comment	2014-08-05 16:53:28 +02:00
Robin Appelman	244d4e1399	Make View->shouldEmitHooks more robust	2014-08-05 16:53:28 +02:00
Morris Jobke	8561d0dfca	remove escaping because it's unneeded	2014-08-05 13:18:38 +02:00
Morris Jobke	7b222c4ab5	fix uppercase issue	2014-08-05 13:16:51 +02:00
scolebrook	2e127d2c5e	Add ability to theme iOS and Android client URLs just like desktop URLs.	2014-08-05 13:16:51 +02:00
Bjoern Schiessle	41cca70a63	don't display share permission if resharing was disabled by the admin	2014-08-05 10:57:51 +02:00
Morris Jobke	c0e78d9841	Merge pull request #10151 from owncloud/issue/9912 ... Increase word wrap limit for emails to 78 characters	2014-08-05 08:20:57 +02:00
Joas Schilling	303f6da76f	Check return of fopen() before using it ... Fix #9968	2014-08-04 17:53:06 +02:00
Joas Schilling	f4c7e3c1e9	Merge pull request #10083 from th3fallen/fix-9969-take-two ... Fix 9969	2014-08-04 17:41:03 +02:00
Joas Schilling	c1b8d93cb0	Increase word wrap limit for emails to 78 characters	2014-08-04 16:05:09 +02:00
Joas Schilling	4865c52aa6	Fix isLoggedIn() check for user '0' ... Fix #9972	2014-08-04 15:53:55 +02:00
Joas Schilling	f80baf03d4	Fix getting group '0' from database backend ... Fix #9972	2014-08-04 15:53:55 +02:00
Remco Brenninkmeijer	cb842ba793	Previous commit was not based on master, retry. Removed broken tar cutter, double extensions are not possible in temp files. Added tar support. Fixed extension switch.	2014-08-04 14:10:09 +02:00
Robin Appelman	8b4d3c065c	only set core version at the end	2014-08-04 13:42:16 +02:00
Robin Appelman	ae263da69a	Also set the app version when updating from app store	2014-08-04 13:41:05 +02:00
Robin Appelman	776cc45a5a	Allow loading app without checking the upgrade	2014-08-04 13:41:05 +02:00
Robin Appelman	4602d1f2a6	extract upgrade parts to their own methods	2014-08-04 13:41:05 +02:00
Robin Appelman	4608f8a3b5	Throw an exception when we try to load an app that needs to be upgraded	2014-08-04 13:41:04 +02:00
Robin Appelman	43d790239d	Extend OC_Util::needUpgrade to also catch app upgrades	2014-08-04 13:41:04 +02:00
Thomas Müller	65903a012a	Merge pull request #10025 from owncloud/l10n-typo ... typo fix from transifex suggestion	2014-08-04 11:03:50 +02:00
Volkan Gezer	7a07690b25	expire -> expiration	2014-08-02 04:02:39 +02:00
Jörn Friedrich Dreyer	a0ab4c2434	fix return documentation	2014-08-01 13:42:35 +02:00
Thomas Müller	378f35f0ec	prevent PHP errors and enhance logging	2014-08-01 09:54:32 +02:00
Volkan Gezer	5f015067f4	suggestions by deepdiver	2014-08-01 01:39:52 +02:00
Clark Tomlinson	26af116fcd	Removing unnecessary switch statements in fopen methods.	2014-07-31 09:34:27 -04:00
Martin	d975012ae6	Improved scanner error message	2014-07-31 13:12:35 +02:00
Thomas Müller	4eb2b4e1b0	Merge pull request #10051 from owncloud/preview-empty-text ... Use svg mimeicons for empty text files	2014-07-31 11:38:29 +02:00
Jan-Christoph Borchardt	5b11a18dea	Merge pull request #10044 from owncloud/transparency_fix ... extract transparency fix from #8050	2014-07-30 18:36:51 +02:00
Morris Jobke	62b37fbb99	Merge pull request #10024 from owncloud/preview-restrict-height ... Also keep maxY into account when scaling a preview while preserving aspect ratio	2014-07-30 17:22:20 +02:00
Jörn Friedrich Dreyer	dd9347fdd2	Merge pull request #10000 from owncloud/fix-lowlat-cache-autoload ... Cache factory needs to use globalPrefix in createLowLatency()	2014-07-30 16:56:45 +02:00
Robin Appelman	4a9b0d5465	Use svg mimeicons for empty text files	2014-07-30 16:31:37 +02:00
Georg Ehrke	fa461befbc	extract transparency fix from #8050	2014-07-30 16:13:33 +02:00
Morris Jobke	38e309b0fe	Merge pull request #9970 from owncloud/sharing_set_expire_date ... Sharing set expire date	2014-07-30 14:37:16 +02:00
Volkan Gezer	90d8f42d7c	typo fix from transifex suggestion	2014-07-30 14:07:32 +02:00
Robin Appelman	c066320208	Also keep maxY into account when scaling a preview while preserving aspect ratio	2014-07-30 13:52:40 +02:00
Victor Dubiniuk	0113ad0b33	Log unsuccessful temp file creation and return false	2014-07-30 13:50:41 +02:00
Thomas Müller	54d5d03271	Merge pull request #9888 from owncloud/mysql-tinyint-master ... migration test for sqlite - adding type mapping for 'tinyint unsigned'	2014-07-30 11:48:10 +02:00
Andreas Fischer	9be8ac5867	Memcache\Factory: Remove static, use globalPrefix.	2014-07-29 11:14:36 +02:00
Bjoern Schiessle	67e302885c	remove share permission if user is excluded from sharing	2014-07-29 10:08:08 +02:00
Thomas Müller	58472a2660	migration test for sqlite - adding type mapping for 'tinyint unsigned'	2014-07-29 09:18:37 +02:00
Bjoern Schiessle	4e87ac2bb9	make sure that we set the expire date if a date is adefault date is set	2014-07-28 22:45:03 +02:00
Björn Schießle	c53b56e313	Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date ... [share api] add OCS api call to set expire date for link shares	2014-07-28 17:28:32 +02:00
Morris Jobke	1fbbaed261	Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hoster ... generate copy of sqlite database file in data directory	2014-07-28 16:54:52 +02:00
Robin Appelman	cb0ff19dc4	Merge pull request #9924 from owncloud/eventsource-nginx-buffering ... Prevent nginx from buffering event source events	2014-07-28 16:17:35 +02:00
Georg Ehrke	4e8e69dc81	implement a txt preview fallback for the case that ttf is not support	2014-07-28 13:05:08 +02:00
Thomas Müller	539d2b7ec3	Merge pull request #9784 from josh4trunks/libreoffice_match_cl ... Cleanup Document Preview	2014-07-28 13:03:33 +02:00
Thomas Müller	a3411e3719	Merge pull request #9641 from owncloud/localuser-addressbook ... ownCloud users are exported as address book	2014-07-28 12:18:56 +02:00
Thomas Müller	534fb9ebf9	Merge pull request #9631 from owncloud/update-getid3 ... update getID3 library	2014-07-28 11:51:36 +02:00
Thomas Müller	11214219f3	Merge pull request #9819 from owncloud/updater-setversionafterupdate ... Set version AFTER a successful update	2014-07-28 11:19:57 +02:00
Thomas Müller	0aa652ecfd	Merge pull request #9859 from tiezdne/master ... Update mimetypes.list.php	2014-07-28 11:16:43 +02:00
Thomas Müller	cfaa05cc0e	Merge pull request #9905 from owncloud/joblist-non-existing-class ... Dont try to execute jobs that no longer exist	2014-07-28 11:09:27 +02:00
Thomas Müller	ab8efe3aa2	Merge pull request #9935 from owncloud/harden-get-urlco ... Verify whether the URL is valid	2014-07-28 11:07:41 +02:00
Thomas Müller	c87f425fe7	generate copy of sqlite database file in data directory	2014-07-28 10:29:39 +02:00
Thomas Müller	f2982b7a08	Merge pull request #9904 from owncloud/loggedout-getuserfolder ... Dont throw an error when calling $server->getUserFolder when logged out	2014-07-28 10:04:01 +02:00
Lukas Reschke	260729fd7d	Verify whether the URL is valid ... Required for https://github.com/owncloud/mail/pull/100#issuecomment-50266017 @karlitschek Backport for stable6 and stable7 requested.	2014-07-27 16:46:32 +02:00
Robin Appelman	2c4e06d325	Prevent nginx from buffering event source events	2014-07-26 16:07:11 +02:00
Michael Kuhn	ecdd04374a	Allow specifying the item source in unshareFromSelf().	2014-07-26 02:00:49 +02:00
Robin Appelman	43978befda	Dont try to execute jobs that no longer exist	2014-07-25 18:02:02 +02:00
Robin Appelman	acafb4a426	Merge pull request #9669 from owncloud/group-public ... Add group management to the public api	2014-07-25 17:55:12 +02:00
Robin Appelman	bf12bba079	Dont throw an error when calling $server->getUserFolder when logged out	2014-07-25 17:52:50 +02:00
Morris Jobke	ae3761f15d	add autoload	2014-07-25 17:37:33 +02:00
Morris Jobke	a9666c4f5b	update getID3 library	2014-07-25 15:25:45 +02:00
Bjoern Schiessle	ecc1f92bb6	add OCS api call to set expire date for link shares	2014-07-25 13:38:18 +02:00
Thomas Müller	07dc0b2fdf	setting and checking default_charset in php.ini to be UTF-8	2014-07-25 09:53:25 +02:00
Thomas Müller	176ecbd311	ownCloud users are exported as address book	2014-07-24 17:35:02 +02:00
Thomas Müller	788a2eca2f	Merge pull request #9841 from owncloud/fix-password-reset-master ... Fix password reset in console command and lost password controller	2014-07-24 15:58:02 +02:00
tiezdne	6a2f3921f6	Update mimetypes.list.php	2014-07-24 15:43:55 +02:00
Thomas Müller	a8b6cc6a07	- adding default value for $recoveryPassword ... - set password correctly in lost password	2014-07-24 12:50:39 +02:00
Thomas Müller	7d60f7a222	register type mappings for unknown/unsupported mysql types	2014-07-24 12:17:26 +02:00
Vincent Petry	6f329dcb6c	Set version AFTER a successful update ... If an app upgrade failed, the core version will not be increased either in the database. This will re-display the update page and make it possible to redo the apps upgrade. Note that any core repair routine must take into account that an update might need to be redone again even though the core's DB state is already the one of the new version.	2014-07-23 23:38:17 +02:00
Thomas Müller	363ba04f5e	only commit in case a transaction is active	2014-07-23 20:13:19 +02:00
josh4trunks	acd5660492	Cleanup Document Preview ... Use the env:UserInstallation flag like https://github.com/owncloud/documents/blob/master/lib/converter.php. This will stop the creating of multiple directories for document conversion in tmpDir.	2014-07-22 22:46:38 -07:00
Sander	4e2954673a	Revert change	2014-07-22 19:45:01 +02:00
Sander	eacdf26cde	Allow getAppFolder to get another apps path ... cc @Raydiation	2014-07-22 16:07:43 +02:00
Thomas Müller	31149fb1c3	adding special handling of checkPrecondition() for chunked upload	2014-07-22 13:06:20 +02:00
Robin Appelman	e9de20952a	Return the proper owner for home storages	2014-07-21 16:59:59 +02:00
Thomas Müller	0a9e0d1051	perm -> permissions	2014-07-21 13:49:22 +02:00
Vincent Petry	3df7a83c72	Merge pull request #9406 from philfry/master ... silently discard the response body, needed for apache/mod_dav and maybe ...	2014-07-21 12:22:06 +02:00
Andreas Fischer	8cd1f7464e	Merge pull request #9672 from owncloud/mysql-affectedrows ... Make MySQL affected row count consistent with other DBMSes * owncloud/mysql-affectedrows: Added test of OCS privatedata to trigger key duplication Document why we have to check with defined() first. Make MySQL return "number of found rows" instead of number of "affected rows".	2014-07-20 21:29:16 +02:00
Frank Karlitschek	f92b5a2507	update appstore api url	2014-07-17 21:54:46 -04:00
Robin Appelman	5a0397eb5e	Fix renaming files in the root folder of a MappedLocal storage	2014-07-16 21:24:18 +02:00
icewind1991	d58c8d72cf	Merge pull request #9550 from kofemann/dcache-fixes-for-upstream ... storage: do not check file mode on rename	2014-07-16 16:06:14 +02:00
Andreas Fischer	d8bd8c4b66	Document why we have to check with defined() first.	2014-07-16 15:13:35 +02:00
Andreas Fischer	e26612244a	Make MySQL return "number of found rows" instead of number of "affected rows".	2014-07-16 14:35:47 +02:00
Robin Appelman	94fa21d146	Add group management to the public api	2014-07-16 14:25:31 +02:00
Stephan Peijnik	4d74aa09bf	Port of #9584 ... Fixes #9583 lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs. settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> Fix indentation. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> Renamed $grp to $group in foreach loop. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> Use is_null() instead of empty() when checking the return value of GroupManager::get(). Additionally, $grp was renamed to $group inside \OC\Group\MetaData::fetchGroups(). Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> Updated code to reflect changes introduced to \OC\Group\MetaData. Now that fetchGroups() does not exist anymore and getGroups() is called directory, the 'groups' property does not exist anymore. Instead, we now generate that array on the fly and return it from getGroups. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>	2014-07-16 12:23:26 +02:00
Björn Schießle	7d8a8e78fa	Merge pull request #9640 from owncloud/fix_9627 ... make sure that 'OC_Theme' exists before checking if the method exists	2014-07-16 10:12:52 +02:00
Thomas Müller	0f9b22107b	Merge pull request #9644 from owncloud/fix_user_api ... Fix user api	2014-07-15 23:57:02 +02:00
blizzz	10b59f101f	Merge pull request #9540 from owncloud/use_fileinfo_in_search_results ... use fileinfo object in search results	2014-07-15 19:49:36 +02:00
Bjoern Schiessle	6967d328e2	make sure that 'OC_Theme' exists before checking if the method exists	2014-07-15 17:48:25 +02:00
Jörn Friedrich Dreyer	818929274d	use UserSession service to resolve user id	2014-07-15 17:42:17 +02:00
Vincent Petry	a8d95356ca	Merge pull request #8987 from owncloud/lastindexid-debug ... [DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL	2014-07-15 17:01:57 +02:00
icewind1991	61b5a770e4	Merge pull request #9561 from libasys/patch-3 ... Fix Error undefined index: file_target	2014-07-15 16:54:57 +02:00
Thomas Müller	6c93bcc814	Merge pull request #9621 from owncloud/fix_logger_implementation ... fix logger implementation	2014-07-15 16:05:15 +02:00
Jörn Friedrich Dreyer	4a855be814	fix logger implementation and test	2014-07-15 10:10:16 +02:00
Thomas Müller	e8f02b9410	Merge pull request #9562 from owncloud/users-groupfilter ... Do not filter groups, but therefore update the user counts according to the filter	2014-07-15 07:40:55 +02:00
Thomas Müller	73e2bf7bf4	fixing PHPDoc	2014-07-14 21:26:47 +02:00
Arthur Schiwon	ab2c7e06a4	remove dead code ... do not filter groups. but update the user count according to the filter improve phpdoc improve metadata runtime cache add metadata tests	2014-07-14 21:26:37 +02:00
Jörn Friedrich Dreyer	8f11019f45	mkae getRelativePath of file search results overwriteable in subclasses	2014-07-14 19:27:10 +02:00
Jörn Friedrich Dreyer	eea5c2ee0a	return relative path	2014-07-14 19:12:06 +02:00
Robin Appelman	c3991ae13e	Use the correct path when building the FileInfo for the search result	2014-07-14 18:32:45 +02:00
Morris Jobke	9ee1c7ff71	Merge pull request #9228 from owncloud/remove-routing-singular-issues ... Routing: Dont strip the s from the resource id to prevent possible weird behavior with irregular english plural nouns	2014-07-14 17:10:07 +02:00
Thomas Müller	4b91741875	Merge pull request #9598 from owncloud/fix-app-installation-master ... append file extension to the temporary file which contains the downloade...	2014-07-14 17:05:36 +02:00
Vincent Petry	10a29556b0	- Added test to trigger index id error ... - re-enable encryption migration tests - sqlite requires reconnect after schema changes	2014-07-14 16:20:09 +02:00
Robin Appelman	20c1ce7f47	Add public interfaces for User, UserManager and UserSession	2014-07-14 15:10:51 +02:00
Björn Schießle	05ba9b3c64	Merge pull request #9539 from enoch85/patch-1 ... Fix for #9422	2014-07-14 12:58:23 +02:00
Vincent Petry	e58dce2ee0	Merge pull request #9571 from owncloud/fix_appstore_update_issue ... Fix update to button issue	2014-07-14 10:00:39 +02:00
Thomas Müller	e47cd5ebf1	append file extension to the temporary file which contains the downloaded archive - in case of zip files fileinfo doesn't seem to return anything reliable	2014-07-11 16:51:59 +02:00
Georg Ehrke	fb685b0856	improve check for duplicate apps	2014-07-10 17:18:10 +02:00
Georg Ehrke	305db9c2d7	add proper version comparision in OC_Installer::isUpdateAvailable	2014-07-10 17:17:55 +02:00
Morris Jobke	e33ef0d449	Merge pull request #9536 from owncloud/default-app-groups-master ... Default app groups master	2014-07-10 15:45:44 +02:00
Tigran Mkrtchyan	03f422153d	files: storage: rename should check parent directories of old and new files ... as described by POSIX.1-2008 (see http://pubs.opengroup.org/onlinepubs/9699919799/functions/rename.html) Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>	2014-07-10 14:58:59 +02:00
libasys	cd88c2fd7b	Update share.php ... change isset with empty on line 1911	2014-07-10 13:19:35 +02:00
libasys	b395ff549b	Update share.php ... Added isset for error: ``` Undefined index: file_target at /var/www/owncloud/lib/private/share/share.php#1911 ```	2014-07-10 13:02:04 +02:00
Georg Ehrke	380aacdf93	fix orientation in image-backend, not in preview system itself	2014-07-09 23:07:58 +02:00
Jörn Friedrich Dreyer	3f093974f9	use fileinfo object in search results	2014-07-09 14:47:43 +02:00
Daniel Hansson	851c1f87d6	Fix for #9422	2014-07-09 14:40:05 +02:00
Thomas Müller	5d2a3c83ac	adding 'groups' entry to remote apps	2014-07-09 11:23:17 +02:00
Thomas Müller	1ae6e1bcf8	fixing typos	2014-07-09 10:20:17 +02:00
Thomas Müller	63fdaacbfc	Merge pull request #9510 from libasys/patch-1 ... BugFix missing $item on 'file_target' Line 1911	2014-07-09 07:58:37 +02:00
Thomas Müller	10978a80c2	Merge pull request #9507 from owncloud/fix-9302-master ... Upload abortion is now detected within the OC_Connector_Sabre_File::put...	2014-07-08 17:39:34 +02:00
Thomas Müller	65d9d6ad01	Merge pull request #9412 from owncloud/public-api-activity ... Public api activity	2014-07-08 16:37:18 +02:00
Arthur Schiwon	3338a0f236	port of #9500 ... don't trigger update from checkPassword, it is already called by userExists, this is enough. do not write to database when the value is the same add test cases. also split test classes in a file each, looks like only the first class is being executed also appconfig shall not write to database if the value is unchanged	2014-07-08 16:32:01 +02:00
Robin Appelman	3e3d460729	use case insensitive LIKE when searching for files in mysql	2014-07-08 15:49:27 +02:00
Robin Appelman	76c709d7de	Add repair step to set MySQL collation to utf8_bin ... Set default collation of mysql connection to utf8_bin Set utf_bin as default collation for new tables	2014-07-08 15:12:07 +02:00
Thomas Müller	ea269f0067	Upload abortion is now detected within the OC_Connector_Sabre_File::put() ... OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless Adding unit test testUploadAbort()	2014-07-08 11:09:59 +02:00
libasys	e70a7af6da	BugFix missing $item on 'file_target' Line 1911 ... I think this should be right!	2014-07-08 10:51:05 +02:00
Thomas Müller	8363f3c635	Adding new interface \OCP\Activity\IExtentsion ... Adding method getNotificationTypes() Adding method filterNotificationTypes() Adding method getDefaultTypes() Adding method translate() and getTypeIcon() Adding method getGroupParameter() Adding method getNavigation() Adding method getNavigation() Adding method isFilterValid() and getQueryForFilter() Adding unit tests for \OC\ActivityManager	2014-07-08 09:04:37 +02:00
Morris Jobke	29bdfc0ce2	Merge pull request #9502 from owncloud/add_ocsids ... Add ocsids for shipped apps in core repo	2014-07-07 19:58:41 +02:00
Morris Jobke	b2377129b6	Merge pull request #9494 from owncloud/issue/9490 ... [issues/9490] \OC::$WEBROOT is invalid when called from cron.php	2014-07-07 19:36:41 +02:00
Georg Ehrke	e5e8e28ae7	add ocsids to info.xml	2014-07-07 17:11:50 +02:00
Joas Schilling	e8537afd60	Only overwrite serverHost when in unit tests ... The intention of the original commit 12f7cb8767 was to fix tests. But cron should always return a valid host not localhost.	2014-07-07 15:08:45 +02:00
Thomas Müller	b091b15f0b	MySQL: adding repair step to convert MyIsam tables to InnoDB	2014-07-07 12:32:24 +02:00
Vincent Petry	5c444c2da8	Merge pull request #9468 from owncloud/fix_logout_error_messages ... better validation: cadd extra check if appinfo/info.xml exists	2014-07-07 10:58:23 +02:00
Georg Ehrke	1565089c02	fix phpDocBlock for OC_App::getAppInfo	2014-07-05 13:32:21 +02:00
Georg Ehrke	042ec984bd	better validation: cadd extra check if appinfo/info.xml exists	2014-07-05 13:28:47 +02:00
Jörn Friedrich Dreyer	8fbcca1291	Merge pull request #9419 from owncloud/fix_search_results_in_root_dir ... Fix search results in root dir & deprecate OC_Search_Provider	2014-07-04 18:28:54 +02:00
Björn Schießle	a544bd3a0f	Merge pull request #9357 from owncloud/sharing_unshare_on_delete ... [sharing] unshare childrens on delete	2014-07-04 17:42:52 +02:00
icewind1991	d3fab824f7	Merge pull request #9445 from owncloud/filelist-auth-error ... Reload the page when the files app encounters an authentication error	2014-07-04 16:39:00 +02:00
Robin Appelman	4fe1cdd2a7	Add machine readable error messages to OC\JSON ... Reload the files app in case of authentication errors, expired tokens or disabled app Reloading will triger the full server side handeling of those errors formatting fix missing semicolon + some jshint warnings	2014-07-04 16:20:27 +02:00
Jörn Friedrich Dreyer	aeeae5f1b2	Merge pull request #8308 from owncloud/case_insensitive_search_oracle ... use case insensitive linguistic sort and compare when connecting to oracle	2014-07-04 15:51:57 +02:00
Thomas Müller	2327d41b11	Merge pull request #9269 from owncloud/fix_versions_preview ... change order of registering api and capabilities to fix file version previews	2014-07-04 15:25:24 +02:00
Bjoern Schiessle	e9f5730869	make sure that the umount hook always contains the path relative to data/user/files	2014-07-04 10:34:54 +02:00
Jörn Friedrich Dreyer	b5545b81c6	make search case insensitive on postgres and oracle	2014-07-03 19:01:00 +02:00
Jörn Friedrich Dreyer	b56f5f2773	deprecate OC_Search_Provider in favor of \OCP\Search\Provider	2014-07-03 16:03:09 +02:00
Vincent Petry	2fec6cbd5b	Remove forgotten debug log	2014-07-03 12:26:17 +02:00
Philippe Kueck	ef114b6594	silently discard the response body, needed for apache/mod_dav and maybe other dav servers which return an html body	2014-07-03 12:04:38 +02:00
Vincent Petry	ed29e7d160	Merge pull request #9329 from owncloud/sharing_check_target ... don't move a share mount point into a different mount point	2014-07-02 21:01:03 +02:00
Vincent Petry	f4eb90e229	Merge pull request #9311 from owncloud/storage-not-available ... Handle storages not being available in webui and webdav	2014-07-02 18:15:58 +02:00
Morris Jobke	904e3102d3	Merge pull request #9288 from owncloud/fix_dispatcher_null_values ... don't typecast null values inside dispatcher.php	2014-07-02 15:29:33 +02:00
Robin Appelman	c4fa07d7cf	Also update sqliteadapter	2014-07-02 15:27:27 +02:00
Robin Appelman	edb67f9f4d	Remove invalid mounts from the active fs	2014-07-02 15:00:12 +02:00
Volkan Gezer	805a7cf485	Merge pull request #9338 from owncloud/fix-redirect-for-appframework ... Redirect after session expiry to the previous loaded page	2014-07-02 11:39:41 +02:00
Vincent Petry	94c3bac9ed	Merge pull request #9327 from owncloud/migrator-postgreskeywordtest ... Added migrator test for reserved keyword	2014-07-01 20:40:18 +02:00
Vincent Petry	3d921ed3c3	Merge pull request #9334 from owncloud/defaultappfix ... Default app fix	2014-07-01 20:39:13 +02:00
Bjoern Schiessle	bb935978fa	don't move a share mount point into a different mount point	2014-07-01 19:38:55 +02:00
Jonny007-MKD	4161fd2408	Update adapter.php ... Modified insertIfNotExist() to support NULL values	2014-07-01 17:47:27 +02:00
Bjoern Schiessle	735eac6c9d	add a explicit interface for the home storage	2014-07-01 17:31:33 +02:00
Vincent Petry	7c17452028	Added unit test for default app URL	2014-07-01 16:55:29 +02:00
Morris Jobke	b6a4cc20f7	Redirect after session expiry to the previous loaded page ... * fixes #6945	2014-07-01 16:54:52 +02:00
Jörn Friedrich Dreyer	5a588333b2	introduce and use getCurrentConnection()	2014-07-01 16:45:00 +02:00
Vincent Petry	3e78f41d00	Use getAbsoluteUrl for redirection URL ... Also separate the function into getDefaultPageUrl() and redirectToDefaultPage() to make it testable.	2014-07-01 16:02:38 +02:00
Vincent Petry	c005515ebd	Support for multiple default apps ... If a default app isn't visible for the user, try the next one. Else fallback to the "files" app.	2014-07-01 15:42:26 +02:00
Robin Appelman	8161104420	Catch StorageInvalidException in webdav	2014-07-01 15:03:29 +02:00
blizzz	616f9b1e03	Merge pull request #9156 from owncloud/solve-8959 ... search term for users and groups may occur anywhere in the name or displ...	2014-07-01 14:37:09 +02:00
Vincent Petry	894d69184a	Add bak defaultapp setting	2014-07-01 14:28:45 +02:00
Jörn Friedrich Dreyer	dd20b9f672	reset collection to 'root' after adding a route to the api	2014-07-01 14:21:20 +02:00
Vincent Petry	b752aff51d	Fix migrator tests to use the correct migrator instances	2014-07-01 12:54:35 +02:00
Jan-Christoph Borchardt	75a5746b70	Merge pull request #9306 from owncloud/publicneedsupgrade ... Return 503 in public.php and OCS API when upgrade is due	2014-07-01 11:52:39 +02:00
Arthur Schiwon	16275eca84	loop over usernames, not passwords	2014-06-30 20:43:50 +02:00
Robin Appelman	99960d7747	Handle StorageNotAvailableException in webdav	2014-06-30 16:36:11 +02:00
Robin Appelman	d78a2a9f78	Add StorageNotAvailableException	2014-06-30 15:46:37 +02:00
Vincent Petry	972fffbe02	Return 503 OCS response with requested format	2014-06-30 15:37:38 +02:00
Joas Schilling	0c711e1cfa	Use get random bytes as uniqeid() is not unique in some cases ... Fix #9161	2014-06-30 11:10:10 +02:00
Georg Ehrke	c30bea45e9	don't typecast null values inside dispatcher.php	2014-06-29 22:40:50 +02:00
Thomas Müller	9032ce4535	Merge pull request #9266 from owncloud/fix_objectstore_etag_update ... always regenerate etag when writing back file to objectstore	2014-06-29 20:59:20 +02:00
Volkan Gezer	ae68a773c0	more strings to translate in utils also some fixes in defaults	2014-06-28 13:29:24 +02:00
Normal Ra	42edd5b788	Add .apk mimetype.	2014-06-28 00:13:15 +02:00
icewind1991	1a3e698294	Merge pull request #9263 from owncloud/remote-share-update ... Better detecting of remote changes for external shares	2014-06-27 19:31:18 +02:00
Jörn Friedrich Dreyer	23fa75f5ac	always regenerate etag when writing back file to objectstore	2014-06-27 18:49:06 +02:00
Robin Appelman	db3f0cee4a	Fix parsing of webdav permissions	2014-06-27 17:28:56 +02:00
Robin Appelman	6f5d5b9a30	Also check for updated permissions for webdav storages	2014-06-27 17:27:47 +02:00
Robin Appelman	5b8c2ac750	Use the etag to check for updates in webdav storages where available	2014-06-27 17:10:46 +02:00
Vincent Petry	fd8b5680dd	Merge pull request #8383 from owncloud/object_storage ... Object storage	2014-06-27 16:53:03 +02:00
Jörn Friedrich Dreyer	25dbbbadd3	use normalize path to convert '.' to '' in objectstorestorage	2014-06-27 15:00:29 +02:00
Thomas Müller	4d6019b73f	Merge pull request #9247 from owncloud/move-webdav-class-to-core-master ... Move webdav class to core master	2014-06-27 12:59:59 +02:00
Jörn Friedrich Dreyer	ab93f1949d	update hasUpdated description, overwrtie testStat for objectstore test	2014-06-27 12:14:31 +02:00
Vincent Petry	4b5bf606cb	Merge pull request #9215 from owncloud/officemimetypesupdatefix ... Office mime types update fix	2014-06-27 11:23:19 +02:00
Thomas Müller	171475b95a	fix autoloader	2014-06-27 08:52:40 +02:00
Thomas Müller	c745240543	Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies	2014-06-27 08:52:28 +02:00
Robin Appelman	f93457c41d	Fix check if class exists	2014-06-27 00:52:37 +02:00
Robin Appelman	437094bbfc	Check if classes/method exists before trying to call them in background jobs	2014-06-26 22:40:12 +02:00
Thomas Müller	7804bd010c	Merge pull request #9230 from owncloud/fix-repair-step-php-53 ... Redeclared as public to allow invocation from within the closure in php ...	2014-06-26 17:20:09 +02:00
Vincent Petry	8526556110	Merge pull request #9206 from owncloud/occ-scan-user ... Prevent running the files:scan command as the wrong user	2014-06-26 17:03:23 +02:00
Vincent Petry	b7d79a90b0	Merge pull request #9210 from owncloud/better_validation_in_getAppPath ... better validation for OC_App::getAppPath()	2014-06-26 15:52:12 +02:00
Thomas Müller	4c80c9595f	Redeclared as public to allow invocation from within the closure in php 5.3	2014-06-26 14:27:41 +02:00
Bernhard Posselt	2662c4c61b	use id instead of resourceId	2014-06-26 14:20:35 +02:00
Bernhard Posselt	5496ca234b	dont strip the s from the resource	2014-06-26 14:02:20 +02:00
voxsim	5d30ed9ad1	fix in displayNamesInGroup: when specified limit N, we did complex search only in the first N users	2014-06-26 12:38:33 +02:00
Jörn Friedrich Dreyer	f96a535f80	fix objectstore test execution	2014-06-26 11:30:00 +02:00
Björn Schießle	1822bba5e9	Merge pull request #9193 from owncloud/sharing_etag_propagation ... make sure that the etags get propagated correctly	2014-06-26 10:26:24 +02:00
Vincent Petry	b1e778d5fd	Moved office mimetype update to a repair step	2014-06-25 19:49:18 +02:00
Georg Ehrke	09356bc5b3	better validation for OC_App::getAppPath()	2014-06-25 16:24:55 +02:00
Robin Appelman	9a2ed86672	Prevent running the files:scan command as the wrong user	2014-06-25 15:22:49 +02:00
icewind1991	16396e2e33	Merge pull request #9123 from owncloud/webdav-move-permissions ... Fix permissions check when moving a file to a different directory over webdav	2014-06-25 15:09:58 +02:00
Jörn Friedrich Dreyer	8e6cb6dc54	delete object without downloading it first	2014-06-25 14:53:38 +02:00
Arthur Schiwon	f3ecf819ec	extend Dummy user and group implementation to pass tests	2014-06-25 13:13:53 +02:00
Robin Appelman	113749bd96	really always take root of the substorage	2014-06-25 13:00:11 +02:00
Bjoern Schiessle	a0b85fc5e4	make sure that during share and unshare the etags get propagated correctly	2014-06-25 12:11:56 +02:00
Arthur Schiwon	121d52860e	return int, not string	2014-06-24 21:54:57 +02:00
Bjoern Schiessle	92a82f02b3	always take root of the substorage	2014-06-24 18:53:51 +02:00
Robin Appelman	92f2a430a8	Don't bother checking for external updates for objectstore storages	2014-06-24 14:48:59 +02:00
Robin Appelman	eb97eee964	Only initialize the swift container when manipulating an object	2014-06-24 14:42:52 +02:00
Robin Appelman	159b603d13	Add support for rackspace swift backends	2014-06-24 14:36:29 +02:00
Bjoern Schiessle	70ca292fd9	only the mount point has delete and update permissions to enable rename operation	2014-06-24 13:55:04 +02:00
Bjoern Schiessle	84d36df70b	make sure that we always return the correct permissions	2014-06-24 13:39:37 +02:00
Thomas Müller	f913b1629b	Merge pull request #9158 from owncloud/no-recursion-on-rmdirr-master ... fix recursion on rmdirr	2014-06-23 23:18:10 +02:00
Thomas Müller	fba694edae	update PHPDoc $fileInfo is a SplFileInfo	2014-06-23 23:15:30 +02:00
Joas Schilling	167ba14af7	Merge pull request #9159 from owncloud/enabledapp-cache-loggedin ... Only cache enabled apps when logged in	2014-06-23 18:02:57 +02:00
Jörn Friedrich Dreyer	28c1a95575	use common storage test	2014-06-23 16:29:01 +02:00
macjohnny	11ccb57fc7	modified caching mechanism in getUserGroupIds ... removed cachedUserGroupIds, instead changed indexing in getUserGroups to groupId	2014-06-23 15:59:27 +02:00
Vincent Petry	8c82098281	Merge pull request #8974 from owncloud/router-preventloadappsonupgrade ... Prevent loadApps on upgrade	2014-06-23 15:15:50 +02:00
Robin Appelman	2547945779	Add comment	2014-06-23 15:14:35 +02:00
macjohnny	24e397afd2	clean up function getUserGroupIds ... clean up of function getUserGroupIds and improved caching mechanism of cachedUserGroupIds	2014-06-23 14:47:19 +02:00
Thomas Müller	ed31f30afd	dir itself has to be removed as well	2014-06-23 14:40:55 +02:00
Robin Appelman	8b41689fe6	Only cache enabled apps when logged in	2014-06-23 13:55:21 +02:00
Thomas Müller	f83821c388	fix recursion on rmdirr	2014-06-23 13:54:27 +02:00
Arthur Schiwon	01a012980a	search term for users and groups may occur anywhere in the name or displayname, not just in the beginning	2014-06-23 12:03:09 +02:00
Jörn Friedrich Dreyer	7ec53571c4	use 'object' as the fakedir stream name	2014-06-23 11:07:01 +02:00
Arthur Schiwon	81ecbbb061	trusted domains shall not be ignored on autosetup	2014-06-23 10:33:15 +02:00
Bart Visscher	089139f8ea	Add explanation about the current implementation of updateApp	2014-06-22 12:45:59 +02:00
macjohnny	405e89f45a	Update manager.php	2014-06-21 16:06:11 +02:00
Robin Appelman	80e6d357a2	Fix permissions check when moving a file to a different directory over webdav	2014-06-20 14:29:13 +02:00
Jörn Friedrich Dreyer	c112a1d323	move to stream based IObjectStore interface, rearrange & reformat code	2014-06-20 12:27:47 +02:00
macjohnny	6a3d6d3e4b	Update manager.php	2014-06-19 20:32:37 +02:00
macjohnny	14fcd68172	Update manager.php	2014-06-19 19:35:10 +02:00
macjohnny	c954168973	Update manager.php ... defined $uid in getUserGroupIds	2014-06-19 13:28:37 +02:00
macjohnny	18c7c94b7a	Update manager.php ... added description and blank lines in getUserGroupIds	2014-06-19 11:41:29 +02:00
macjohnny	356e4b6665	Update manager.php ... add caching to getUserGroupIds	2014-06-19 11:37:46 +02:00
Jörn Friedrich Dreyer	f2fe00e972	fix rebase, use 'object::user:<username>' or 'object::store:<storageid> as storage id, by default use container/bucket name for storageid, make storageid configurable, store user only for HomeObjectStoreStorage, change updateObject() to writeObject()	2014-06-18 15:20:26 +02:00
Jörn Friedrich Dreyer	5cae863408	change architecture from inheritance to composition	2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer	9335a5f07f	remove duplicate method	2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer	5722e31d1a	add autocreate config option for containers, implement autocreate and delete of containers, use generated container names for tests	2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer	4e65889f54	only use one config option 'objectstore' for root and home storage configuration	2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer	7493ff0624	fix unit test by always initializing the root of the storage in the constructor	2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer	10de4a7b90	move creation of / and users 'files' from storage constructor to setupFS / mount initialization	2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer	87aaf39259	fix checking unset array values, deduplicate code, remove file from cache if it could not be stored in the objectstore	2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer	eca536d8b4	minor code cleanup	2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer	c020e8e658	use exceptions to notify abstract parent class of problems	2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer	60a8419a1f	when root storage cannot be mounted throw an exception visible to the end user	2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer	1374ba9adf	fix fallback config for default home storage	2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer	ccb698a6a8	move swift and abstract code to core	2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer	85ccfad37c	change 'object_storage' config param to 'root_storage' ... copy skeleton only for local filesystems	2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer	2bf7e5c02f	make objectstore setup more robust, don't pass user to object store mounted as root	2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer	3c66a8c8ed	allow configuring objectstore as home and root storage	2014-06-18 12:53:19 +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
icewind1991	8d1cf79152	Merge pull request #8399 from owncloud/server-server-sharing ... Add server<->server sharing	2014-06-17 17:40:05 +02:00
Vincent Petry	cce58368ad	Merge pull request #9065 from owncloud/migrator-keepprimaryindexname ... Do not rename primary key index when renaming table	2014-06-17 16:43:33 +02:00
Vincent Petry	7aa11b4361	Do not rename primary key index when renaming table ... When the migrator renames a table, for example for upgrade simulation, it should not rename the primary key to avoid messing up with the diff because the MySQL Doctrine code expects that index to always be called "primary".	2014-06-17 15:23:18 +02:00
Andreas Fischer	9db0a82a26	We obviously have to pass the hostname as is when there is no ':' in the hostname. ... This reverts commit 73062040e6.	2014-06-17 14:48:32 +02:00
Robin Appelman	07fdeba50b	Fix moving movablemount over webdav	2014-06-17 14:10:11 +02:00
Jörn Friedrich Dreyer	cd77f92f4c	add new keynote mimetype	2014-06-16 16:25:12 +02:00
Robin Appelman	b188550c22	Also support removeable mounts with rmdir	2014-06-16 16:24:42 +02:00
Robin Appelman	0532f5c39a	Fix permission for movable storage root	2014-06-16 16:20:40 +02:00
Georg Ehrke	15c215cd03	Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore ... Make shipped apps updatable via appstore	2014-06-16 15:54:50 +02:00
Georg Ehrke	86f546ff64	disable code check for shipped apps	2014-06-16 13:49:02 +02:00
Vincent Petry	a48bcceb23	Merge pull request #8917 from owncloud/repair-routine-base ... Add support for repair step classes	2014-06-16 11:13:10 +02:00
macjohnny	e5224782fa	Merge pull request #9022 from owncloud/speedup-nested-ldap-groups ... drastic speedup for nested ldap groups	2014-06-16 07:50:53 +02:00
Robin Appelman	87e311b996	Fix storage being passed to cache/watcher and scanner when using storage wrappers	2014-06-14 10:14:08 +02:00
Robin Appelman	c61f759a8b	Fix check for shared files inside shares	2014-06-14 10:14:08 +02:00
Robin Appelman	c6a83b2f17	Fix exposing single files over webdav	2014-06-14 10:13:24 +02:00
Robin Appelman	65f3b2fad2	Add server<->server sharing backend	2014-06-14 10:10:37 +02:00
Morris Jobke	35f7565e9b	Merge pull request #8978 from owncloud/movie_preview_improvements ... movie previews: use file directly when it's stored locally and encryption is not enabled	2014-06-14 01:01:59 +02:00
Georg Ehrke	65028c459b	don't skip code check for skipped apps ... those apps will have to use the public api	2014-06-13 21:51:16 +02:00
Georg Ehrke	c378e76412	skip certain tests for shipped apps	2014-06-13 21:45:31 +02:00
Frank Karlitschek	87101e6638	Merge pull request #9018 from owncloud/dbms-socket-support ... Refactor OC_DB::connect() to properly support sockets.	2014-06-13 18:09:51 +02:00
macjohnny	767aa4e35f	drastic speedup for nested ldap groups ... add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups. Changes a function call in getUserGroups to only retrieve group ids instead of objects. this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request. in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page. this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack: self::getManager()->getUserGroups($user) - getGroupObject() (executed for every group!) - groupExists() (resulting in many ldap-requests) since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.	2014-06-13 00:04:06 +02:00
Andreas Fischer	73062040e6	Don't specify host when using a socket.	2014-06-12 20:22:45 +02:00
Andreas Fischer	0932760304	Rename variable to indicate that it can be port and socket.	2014-06-12 20:18:38 +02:00
Andreas Fischer	3d8eabedbd	No need to check the port number as this will fail anyway.	2014-06-12 20:17:30 +02:00
Andreas Fischer	4ca1e3cc02	Move getValue() to where required. This actually is not required "global data".	2014-06-12 19:59:40 +02:00
Andreas Fischer	17c2e63449	Move check for : to where it belongs, getting rid of $socket = false;	2014-06-12 19:56:51 +02:00
Andreas Fischer	4b87586487	Extract common variables of $connectionParams.	2014-06-12 19:53:33 +02:00
Andreas Fischer	6da2beeaff	Inline $port expression, getting rid of $port variable.	2014-06-12 19:48:37 +02:00
Vincent Petry	b595c982d0	Merge pull request #8968 from owncloud/scanner-parent-repair ... Repair broken parent link in the scanner	2014-06-12 17:40:44 +02:00
Vincent Petry	05e351416e	Fixed instanceof to use interface instead of class	2014-06-12 17:38:26 +02:00
Vincent Petry	ca690c4d02	Added RepairStep interface and default repair step lists ... The updater is using "before update" repair steps and "regular" repair steps. The "regular" repair steps are also used by the CLI tool. Currently no steps exist but can be added later in the static methods in the \OC\Repair class. Added unit test to test messaging, error and exception cases.	2014-06-12 17:38:26 +02:00
Vincent Petry	6fcd1af4db	Add support for repair step classes ... This also makes it possible to unit test each repair step class individually	2014-06-12 17:38:26 +02:00
Morris Jobke	ab7cff6dfd	Revert "Merge pull request #8998 from macjohnny/master" ... This reverts commit 482eded8b3, reversing changes made to 354cace14a.	2014-06-12 14:56:46 +02:00
macjohnny	482eded8b3	Merge pull request #8998 from macjohnny/master ... drastic speedup for nested ldap groups	2014-06-12 14:49:15 +02:00
Vincent Petry	3e1576011f	Merge pull request #8980 from owncloud/better-accept-header ... handle http accept headers more gracefully	2014-06-12 13:28:03 +02:00
macjohnny	e8e2e47e68	Update manager.php	2014-06-12 11:29:20 +02:00
macjohnny	b1094cfe82	Update group.php	2014-06-12 11:28:57 +02:00
macjohnny	0af8aa689f	drastic speedup for nested ldap groups ... Changes a function call in getUserGroups to only retrieve group ids instead of objects. this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request. in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page. this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack: self::getManager()->getUserGroups($user) - getGroupObject() (executed for every group!) - groupExists() (resulting in many ldap-requests) since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.	2014-06-12 09:51:23 +02:00
macjohnny	ede2aa236e	Update manager.php ... add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.	2014-06-12 09:41:23 +02:00
Vincent Petry	5def2a72dd	Merge pull request #8991 from owncloud/fix-php53-arraycombine ... Fixed array_combine for PHP 5.3	2014-06-12 09:08:50 +02:00
josh4trunks	1b02991a1d	Fixes based on suggestions ... I use the term socket for any extension, either unix socket, or internet socket (port). I check if the socket is all digits * only integers 0 and larger would pass this test. I then check if the string is less than or equal to the maximum port number. By using "if($socket)" I make sure socket isn't false, empty, or the string '0'. I don't believe I need to initialize $port because $port will always be set if $socket is true. Please show me if I am wrong here. Thanks	2014-06-11 21:47:45 -07:00
Vincent Petry	4e4c2b04c8	Fixed array_combine for PHP 5.3	2014-06-11 19:13:49 +02:00
Vincent Petry	75a53b3c49	Merge pull request #8901 from owncloud/permissions-update-cache ... Save the permissions in the filecache if it's not saved yet	2014-06-11 18:28:55 +02:00
Vincent Petry	65b3d293ce	Added ORDER BY to enforce share entry order ... Sometimes MySQL decides to return the shares in the wrong order, but some parts of the code seem to require the order to be known, at least so that the parent shares come before the children shares. This fix adds an ORDER BY clause to force the order by id.	2014-06-11 14:28:30 +02:00
Vincent Petry	491c96eaa9	Merge pull request #8966 from owncloud/fix_failing_tests_on_master ... Fix failing tests on master	2014-06-11 10:05:38 +02:00
Bernhard Posselt	0252d39bb6	fix indention	2014-06-11 00:57:00 +02:00
Bernhard Posselt	1002281dae	handle http accept headers more gracefully	2014-06-11 00:54:25 +02:00
Georg Ehrke	7396e5f455	movie previews: use file directly when it's stored locally and encryption is not enabled, fixes #7756	2014-06-10 22:08:27 +02:00
Georg Ehrke	5e9fa64819	don't show update button when appstore is disabled or no writable dir exists	2014-06-10 18:39:34 +02:00
Georg Ehrke	e047e28ac5	make text preview backend use imagettftext, fixes #8087	2014-06-10 17:29:40 +02:00
Robin Appelman	6b1d8a56bb	remove unused argument	2014-06-10 15:42:37 +02:00
Robin Appelman	054083b9cd	add some comments	2014-06-10 15:37:43 +02:00
Robin Appelman	21cfd1014a	Repair broken parent link in the scanner	2014-06-10 15:26:18 +02:00
Bjoern Schiessle	9dc0befcca	call self::getNumericStorageId() to get the numeric ID	2014-06-10 14:48:19 +02:00
Georg Ehrke	602404c631	fix php doc block	2014-06-10 13:58:41 +02:00
Georg Ehrke	6bf06890e7	always return a bool in OC_App::updateApp	2014-06-10 13:56:05 +02:00
Georg Ehrke	5d4f3baf56	fix php doc block	2014-06-10 13:51:20 +02:00
Georg Ehrke	1ab9bdcaa0	remove unnecessary @return	2014-06-10 13:01:10 +02:00
Robin Appelman	41d2354191	Save the permissions in the filecache if it's not saved yet	2014-06-09 12:34:35 +02:00
Morris Jobke	e769ef9bbb	Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix ... Added hacky fix for long path cleanup routine	2014-06-08 20:46:00 +02:00
Björn Schießle	3da47db33c	Merge pull request #8927 from owncloud/expire_only_link_shares ... only expire link shares	2014-06-06 19:24:15 +02:00
Thomas Müller	647dcce514	Merge pull request #8253 from owncloud/pk-on-all-tables-master ... Primary keys on all tables master	2014-06-06 16:40:11 +02:00
Thomas Müller	c053f27381	Merge pull request #8921 from owncloud/fix-remove-storage-master ... No need to create a storage within remove	2014-06-06 16:16:44 +02:00
Bjoern Schiessle	f15d7dfec0	only expire link shares	2014-06-06 15:47:37 +02:00
Thomas Müller	fe8bae31dc	adding PK to table encryption ... adding auto increment/PK to table files_trash adding PK to table ldap_user_mapping and ldap_group_members adding PK to table ldap_group_mapping truncate permissions table to allow smooth creation of primary key adding unit test for creating an auto increment column on a table which already contains data remove unneeded table files_trashsizes fix unit test no need to truncate *PREFIX*permissions On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually	2014-06-06 13:33:56 +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	a59b5249d3	add more and fix office mimetypes, migrate wrong mimetypes	2014-06-06 12:00:25 +02:00
icewind1991	c47d4ebbac	Merge pull request #8666 from owncloud/mount-remove ... Support for (re)moving mountpoints	2014-06-06 11:57:43 +02:00
Vincent Petry	0661d737e6	Merge pull request #8900 from guruz/webdav_permission_moveable_renameable ... WebDAV Permissions: Distinguish between renameing and moving	2014-06-06 11:51:39 +02:00
Thomas Müller	26993f2167	No need to create a storage within remove	2014-06-06 11:39:35 +02:00
Jörn Friedrich Dreyer	56470fa9b3	fix namespace for legacy search classes	2014-06-06 11:01:35 +02:00
Vincent Petry	6e2358c3a6	Added hacky fix for long path cleanup routine	2014-06-06 10:41:49 +02:00
Vincent Petry	5e27ac3e0d	Added CLI arguments for upgrade simulation steps ... Added "dry run" argument to only run the update simulation. Added argument to disable migration (useful for bigger setups where table duplication would take too much space)	2014-06-06 10:11:14 +02:00
Thomas Müller	ff651a3e0d	Merge pull request #8909 from owncloud/fix-temporary-storage-rmdirr-master ... use system function to recursive remove the directory used by temporary ...	2014-06-06 10:02:23 +02:00
Robin Appelman	46f70aabfd	Dont connect hooks twice	2014-06-06 09:56:02 +02:00
Bjoern Schiessle	3459f99dd6	make sure that we only delete shares for the current user	2014-06-06 09:56:02 +02:00
Bjoern Schiessle	eec1c4398a	only unshare user share if it was shared with the current user	2014-06-06 09:56:02 +02:00
Bjoern Schiessle	5bbfdc35d7	make sure that we remove all shares refering to the same parent	2014-06-06 09:56:02 +02:00
Bjoern Schiessle	86d7371d0c	fix unshareFromSelf()	2014-06-06 09:56:02 +02:00
Robin Appelman	e362373a30	Movable storage root can always be moved and deleted	2014-06-06 09:56:01 +02:00
Robin Appelman	a432459685	use triple equals	2014-06-06 09:56:01 +02:00
Robin Appelman	42a362f249	Fix phpdoc and comments	2014-06-06 09:56:01 +02:00
Bjoern Schiessle	b0a74edbb2	allow moving files to the root	2014-06-06 09:56:00 +02:00
Bjoern Schiessle	329bfd81c3	remove encryption keys if user unshares a file	2014-06-06 09:55:59 +02:00
Robin Appelman	dea5219244	Fix folder name for storage root	2014-06-06 09:55:59 +02:00
Bjoern Schiessle	bf5e9357fc	don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it	2014-06-06 09:55:59 +02:00
Robin Appelman	4fbc991ea2	Add the removing logic for mounts	2014-06-06 09:55:59 +02:00
Robin Appelman	8abe1c3f1a	Don't do rename hooks for cache when moving the mountpoint	2014-06-06 09:55:58 +02:00
Robin Appelman	60a659c87e	Add a system for (re)movable mount points	2014-06-06 09:55:58 +02:00
Thomas Müller	79b65269c9	Merge pull request #8877 from owncloud/getpath-storage-check ... Verify that we have a valid storage in View->getPath	2014-06-06 09:44:57 +02:00
Thomas Müller	d359765bdc	Update PHPDoc	2014-06-06 09:44:34 +02:00
Georg Ehrke	a110973b3a	some additional type checks	2014-06-06 09:41:53 +02:00
Thomas Müller	ad4ec414c9	use system function to recursive remove the directory used by temporary storage	2014-06-06 09:29:31 +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
Georg Ehrke	0fe8f77c17	Merge branch 'master' into update_shipped_apps_from_appstore ... Conflicts: lib/private/app.php settings/templates/apps.php	2014-06-05 22:54:27 +02:00
Jörn Friedrich Dreyer	5034bd1b12	minor phpdoc cleanup and imports	2014-06-05 19:49:21 +02:00
Andrew Brown	7a224f5762	Move new search results to 'lib/private/search'	2014-06-05 19:23:44 +02:00
Andrew Brown	8a223eb62d	Move legacy search to 'lib/private/legacy' ... This fixes errors where apps would try to start providers using OC_Search and would fail. Also, made OC_Search simply inherit from \OC\Search.	2014-06-05 19:23:44 +02:00
Andrew Brown	70be98f6d0	Add audio and image result types	2014-06-05 19:22:22 +02:00
Andrew Brown	c46d514733	Add audio and image result types	2014-06-05 19:22:22 +02:00
Jörn Friedrich Dreyer	afd24385a8	fix formatting	2014-06-05 19:22:22 +02:00
Andrew Brown	ac72828eae	Move to new namespace convention and add new result sub-classing	2014-06-05 19:21:47 +02:00
Thomas Müller	70e0ae0637	Merge pull request #8483 from owncloud/encryption_use_oc_preferences ... [encryption] use oc preferences	2014-06-05 18:54:25 +02:00
Vincent Petry	1c59808517	Merge pull request #8865 from owncloud/improve_share_settings ... Improve share settings	2014-06-05 17:23:42 +02:00
Bjoern Schiessle	2d83424a29	allow to set pre-condition for setValue	2014-06-05 16:54:03 +02:00
Thomas Müller	4b650a20a4	Merge pull request #8893 from owncloud/feature/get-users-by-preference ... Add method to get users by their preference	2014-06-05 16:52:00 +02:00
Thomas Müller	fad3bd7fc0	reenable checkCode()	2014-06-05 16:32:46 +02:00
Robin Appelman	00539cf8f9	Verify that we have a valid storage in View->getPath	2014-06-05 15:50:19 +02:00
Bjoern Schiessle	6578f00b4b	unify share settings	2014-06-05 15:49:34 +02:00
Thomas Müller	3dbfd1fe46	Merge pull request #8529 from owncloud/remove-legacy-routing ... Remove legacy routing code	2014-06-05 15:22:46 +02:00
Markus Goetz	e6665a0542	WebDAV Permissions: Distinguish between renameing and moving	2014-06-05 14:39:06 +02:00
Thomas Müller	e1beb8c6c3	Merge pull request #8889 from owncloud/mtime-reuse ... Don't update the mtime if the storage mtime hasn't changed	2014-06-05 13:18:18 +02:00
Vincent Petry	bbdcbb9911	Merge pull request #8866 from owncloud/flock-quotafix ... Fixed quota wrapper to return the value from flock()	2014-06-05 13:11:45 +02:00
Joas Schilling	4b18967129	Hack around oracle for CLOB fields	2014-06-05 12:19:48 +02:00
Joas Schilling	879237f32a	Add method to get users by their preference	2014-06-05 11:50:43 +02:00
Lukas Reschke	ac7fb1b23e	Remove legacy routing code ... The getfile routing code was absolutely legacy and not needed anymore. Additionally \OC::$REQUESTEDAPP was never set to the actually accessed application. This commit removes the legacy routing code and ensures that $REQUESTEDAPP is always set so that other applications (e.g. the firewall or a two-factor authentication) can intercept the currently accessed app. Testplan: [x] Installation works [x] Login with DB works [x] Logout works [x] Login with alternate backend works (tested with user_webdavauth) [x] Other apps are accessible [x] Redirect on login works (e.g. index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fapps%3Finstalled) [x] Personal settings are accessible [x] Admin settings are accessible [x] Sharing files works [x] DAV works [x] OC::$REQUESTEDAPP contains the requested application and can be intercepted by other applications	2014-06-05 11:45:45 +02:00
icewind1991	bd373d9621	Merge pull request #7878 from owncloud/quota-extstorageswitch ... Added switch to count external storage data in quota	2014-06-05 11:23:32 +02:00
Jörn Friedrich Dreyer	f1bf06f8cf	Merge pull request #8884 from owncloud/move-flock-to-app ... remove file locking - code will continue to live in it's own app	2014-06-05 10:54:24 +02:00
Vincent Petry	71b86136c2	Merge pull request #8878 from owncloud/update-checkmigrationforapps ... Simulate apps database schema update on upgrade	2014-06-05 10:28:30 +02:00
Robin Appelman	3e73251750	Don't update the mtime if the storage mtime hasn't changed	2014-06-05 10:08:25 +02:00
Thomas Müller	ff3ded6cb2	Merge pull request #8852 from owncloud/kill-permissions-master ... Kill permissions table	2014-06-05 10:05:05 +02:00
Thomas Müller	da3974bcb2	- drop permissions table and related code ... - the file/folder's permission is now stored in the file cache - BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs - increase version to trigger database migration	2014-06-05 08:22:01 +02:00
josh4trunks	ea162c8a39	Fix variable not always being defined.	2014-06-04 23:03:13 -07:00
josh4trunks	e77c9bb97e	Work with MySQL Sockets ... This passes anything that is not a valid port (0<int<65535) as a unix socket. I tested this with unix sockets; this needs to be tested with a non-standard mysql port as well but I don't foresee any issues. To use a unix socket, even one different than PHP's mysql.default_socket.. * Database Host = localhost:/path/to/socket	2014-06-04 22:50:23 -07:00
Thomas Müller	c044ff99ce	Merge pull request #8724 from owncloud/update-sabre-2.0 ... Update SabreDAV to 1.8.10	2014-06-04 23:05:34 +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
Thomas Müller	a2db53b928	Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size ... [versioning] let the file cache track the size of the versions	2014-06-04 18:19:48 +02:00
Vincent Petry	d4ffafe467	Removed simulate db update flag and split into separate methods	2014-06-04 18:17:46 +02:00
Thomas Müller	48eee0b432	use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface	2014-06-04 17:47:09 +02:00
Vincent Petry	5b97369b00	Simulate apps database schema update on upgrade ... When upgrade, also simulate the database schema update for apps before doing the actual upgrade.	2014-06-04 17:16:44 +02:00
Georg Ehrke	724d027f19	add unit test	2014-06-04 16:29:41 +02:00
Vincent Petry	da889ff029	Added experimental switch to count external storage data in quota ... This includes all mountpoints except the Shared one in the used space calculation. Added unit tests for ext storage inclusion in quota calculation	2014-06-04 16:08:59 +02:00
Vincent Petry	b5f0a17918	Merge pull request #8822 from owncloud/cache-change-propagator ... [WIP] Improved propagation of cache changes	2014-06-04 13:03:14 +02:00
Vincent Petry	3507964820	Fixed quota wrapper to return the value from flock()	2014-06-04 12:36:53 +02:00
Thomas Müller	76e04027bc	Upgrade SabreDAV to 1.8.10 ... Updating SabreDAV namespaces	2014-06-04 12:22:23 +02:00
ringmaster	0a417b1174	Use ->instanceOfStorage() not instanceof for Storage instances.	2014-06-04 07:55:46 +02:00
Bjoern Schiessle	48eb0515e9	only lock if unlink is called for a file	2014-06-04 07:55:46 +02:00
Bjoern Schiessle	ab6680e9ab	name the storage wrapper to make sure that we don't apply the wrapper multiple times	2014-06-04 07:55:46 +02:00
ringmaster	cda87fd9c4	Normalize lock exception messages.	2014-06-04 07:55:45 +02:00
ringmaster	ba887d2b17	Restore the reference to this used exception class.	2014-06-04 07:55:45 +02:00
ringmaster	54865815f5	Move Lock to private namespace, add interface. Update PHPDoc.	2014-06-04 07:55:45 +02:00
ringmaster	c9c6a0ab1e	Don't error out on console.	2014-06-04 07:55:45 +02:00
ringmaster	392a1b6662	Removed unused vars/declarations, update PHPDoc.	2014-06-04 07:55:45 +02:00
Lukas Reschke	826b14e36b	Fix typo	2014-06-04 07:55:45 +02:00
Lukas Reschke	9bbc4b0034	Fix typo	2014-06-04 07:55:44 +02:00
ringmaster	896bc526e6	Remove unused methods.	2014-06-04 07:55:44 +02:00
ringmaster	6b94732bdf	Respect locked files, surface correct exception.	2014-06-04 07:55:44 +02:00
ringmaster	428510a4f8	Simpler log unique id.	2014-06-04 07:55:44 +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
Robin Appelman	a6bb1e1bf8	Fix size calculation during recursive scan	2014-06-03 19:54:59 +02:00
Thomas Müller	6764d5b122	Merge pull request #8698 from owncloud/sharing_improve_permissions ... get permissions directly from share storage to avoid additional db calls	2014-06-03 19:13:51 +02:00
icewind1991	cdf8a123e7	Merge pull request #8264 from owncloud/app-enable-by-group ... Add the option to enable apps only for specific groups	2014-06-03 19:01:12 +02:00
Thomas Müller	e4c3ff03d6	Merge pull request #8809 from owncloud/appconfig-caching ... Improve caching in AppConfig	2014-06-03 18:59:37 +02:00
icewind1991	68b15f3282	Merge pull request #7015 from owncloud/db-migration-check-copy ... Check database migration on a copy of the table first	2014-06-03 16:27:06 +02:00
Georg Ehrke	19129b3db2	use isset() instead of array_key_exists()	2014-06-03 16:23:33 +02:00
Thomas Müller	587159c73e	Merge pull request #8838 from owncloud/backgroundjob-legacy-gc ... Support having legacy `OC_Cache_FileGlobalGC` background jobs	2014-06-03 15:06:35 +02:00
Thomas Müller	79b3558c6d	Merge pull request #7151 from owncloud/user-jquery ... Continuing the New User management	2014-06-03 15:04:30 +02:00
Thomas Müller	2b1a7a76c3	Merge pull request #8425 from owncloud/columns_should_be_nullable_by_default ... columns should be nullable by default	2014-06-03 12:55:42 +02:00
Robin Appelman	3b1f291c60	Fix sorting of apps	2014-06-03 12:42:35 +02:00
Robin Appelman	c09852e006	Fix phpdoc	2014-06-03 12:42:35 +02:00
Robin Appelman	53dc30af4f	Add option to enable app for specific groups	2014-06-03 12:42:35 +02:00
Robin Appelman	b4025b3174	Allow enabling apps by group by setting the config value to a json encoded array of groups	2014-06-03 12:42:35 +02:00
Robin Appelman	6ed3194863	Use a map to prevent having to use search	2014-06-03 12:40:23 +02:00
Robin Appelman	bff9e11ff9	Remove duplicate cache cleanup	2014-06-03 12:38:15 +02:00
Robin Appelman	4429b54ce4	Fix typo	2014-06-03 12:00:39 +02:00
Robin Appelman	82b982a4eb	Better unique names for temporary tables	2014-06-03 11:24:31 +02:00
Robin Appelman	3be2643168	Add `generateChangeScript()` back	2014-06-03 11:19:58 +02:00
Robin Appelman	397a763c49	add a getter for the table	2014-06-03 11:18:46 +02:00
Robin Appelman	c6053b2830	Quote identifiers on mysql	2014-06-03 11:18:45 +02:00
Robin Appelman	6f71419f2b	Skip migration checks for all sql backends besides mysql, postgres and sqlite	2014-06-03 11:18:45 +02:00
Robin Appelman	a59f6818eb	Only quote identifiers for oracle during migration	2014-06-03 11:18:45 +02:00
Robin Appelman	3b4555ca91	Try and check migration before applying it	2014-06-03 11:18:17 +02:00
Robin Appelman	adeac7aa39	Check sqlite migration on a copy of the database file	2014-06-03 11:17:21 +02:00
Robin Appelman	35550e8d9a	Fix migrator for postgres	2014-06-03 11:17:21 +02:00
Robin Appelman	be80dce585	Fix temporary schema creation	2014-06-03 11:17:21 +02:00
Robin Appelman	58c61c8336	Fix generating migration test schemas	2014-06-03 11:17:21 +02:00
Robin Appelman	0035147be9	Create unique names for temporary indexes	2014-06-03 11:17:21 +02:00
Robin Appelman	9c6a93a87c	Add a mechanism to try the database migration on a copy of the tables before running it on the "real" data	2014-06-03 11:17:21 +02:00
Robin Appelman	ec9bf8a2d6	Support having legacy `OC_Cache_FileGlobalGC` background jobs	2014-06-03 11:01:01 +02:00
Georg Ehrke	eea501b847	various fixes as requested by pr reviewers	2014-06-02 21:39:15 +02:00
Robin Appelman	6689d67a5b	Fix recursive scanning	2014-06-02 21:04:36 +02:00
Bjoern Schiessle	e0a5f3b570	get permissions directly from share storage to avoid additional db calls	2014-06-02 20:17:40 +02:00
Bjoern Schiessle	7ad0fee0b5	let file cache handle the versions size	2014-06-02 18:55:13 +02:00
Morris Jobke	57ef089aac	drop allowZIPdownload and maxZIPSize as options	2014-06-02 16:29:03 +02:00
Robin Appelman	e002ff6065	propagate changes in the scanner	2014-06-02 15:24:08 +02:00
Robin Appelman	0158788a2a	Split of cache writes in the scanner to their own methods	2014-06-02 14:52:21 +02:00
Robin Appelman	a31f089266	Add a change propagator class to handle propagating etag and mtime changes	2014-06-02 14:39:12 +02:00
Arthur Schiwon	e235de98e6	this line was lost on rebase	2014-06-02 13:22:06 +02:00
Arthur Schiwon	b15a5a7ca0	undo lastLogin changes in base and user/user as this has now been properly done in #8681	2014-06-02 12:55:45 +02:00
Arthur Schiwon	2d83c68f05	make search parameter optional, which is already the case in the medthod it is passed to	2014-06-02 12:53:59 +02:00
Arthur Schiwon	a9e8d53c8f	fix PHPDoc	2014-06-02 12:53:59 +02:00
Arthur Schiwon	122ebf28f7	typo	2014-06-02 12:53:59 +02:00
Arthur Schiwon	f9f9550969	small fixes / cleanup	2014-06-02 12:53:57 +02:00
Arthur Schiwon	734dd7013e	add MetaData class for groups	2014-06-02 12:53:56 +02:00
Arthur Schiwon	2a8afb0ad9	add PHP doc	2014-06-02 12:53:56 +02:00
Arthur Schiwon	57ffaddf26	add Last Login column	2014-06-02 12:53:51 +02:00
Vincent Petry	4e957c7b18	Merge pull request #8443 from owncloud/csrf-on-login-and-logout ... Add CSRF check on login and logout	2014-06-02 11:27:20 +02:00
Robin Appelman	a4949f4b31	Simplify AppConfig->getValues()	2014-06-01 14:14:30 +02:00
Robin Appelman	91180bfef4	Add caching to AppConfig->getApps	2014-06-01 14:04:17 +02:00
Georg Ehrke	c8a8c7e933	read ocsid from shipped apps on install	2014-05-31 18:02:59 +02:00
Georg Ehrke	020255b4e5	add button for properly uninstalling apps	2014-05-31 17:50:39 +02:00
Georg Ehrke	c8636ca4d9	Merge branch 'master' into update_shipped_apps_from_appstore ... Conflicts: lib/private/app.php lib/private/installer.php	2014-05-31 14:55:00 +02:00
Georg Ehrke	2bcfd8e084	make it possible to update shipped apps via the appstore	2014-05-31 12:17:54 +02:00
Thomas Müller	86b06c72bb	Merge pull request #8800 from owncloud/db-changes-as-required-by-8483 ... Database code cleanup	2014-05-31 00:47:03 +02:00
Thomas Müller	999f6216dc	- fix dropTable() and introduce tableExists() ... - kill replaceDB() - this function is unused and it's implementation obviously wrong - add method annotation OC_DB_StatementWrapper::fetchAll - remove duplicate code in Test_DBSchema and reuse OC_DB::tableExists - remove unused variables	2014-05-30 23:34:42 +02:00
Thomas Müller	5dd3e34f57	Merge pull request #8444 from owncloud/cleanup-list-code ... Cleanup code of files_sharing/ajax/ a little bit	2014-05-30 22:40:28 +02:00
Thomas Müller	555b9cc245	Merge pull request #7614 from owncloud/test_annotations_working ... Check if ReflectionMethod::getDocComment is working	2014-05-30 22:17:30 +02:00
Owen Winkler	da6aae28ad	Merge pull request #8607 from owncloud/filescan_app_hook ... Allow apps to control via a hook skipping add/remove a file during filescan	2014-05-30 12:38:37 -04:00
ringmaster	19f0c47842	Missed one.	2014-05-30 10:40:26 -04:00
Thomas Müller	31ad1cbdd8	Merge pull request #5365 from owncloud/filesize-improvements-32bit ... Add LargeFileHelper / Add CURL filesize workaround / Fix some 32-bit filesize issues	2014-05-30 16:13:48 +02:00
ringmaster	16ae63bdfd	Updates per comments on PR: ... * Use "filesystem_cache_readonly" config setting, update comment in config.sample * Use $this->cacheActive to cache config setting * Add public Scanner::setCacheActive() to set $cacheActive programmatically	2014-05-30 09:42:41 -04:00
icewind1991	2ba5701b1a	Merge pull request #8778 from owncloud/storage-instanceof ... Add storage->instanceOfStorage() to handle instanceof with storage wrappers	2014-05-30 14:58:59 +02:00
Lukas Reschke	45d93cc6ec	Merge pull request #8759 from owncloud/fix-phpunit ... fix 8757, get rid of service locator antipattern	2014-05-29 21:35:47 +02:00
Lukas Reschke	705242d390	Merge pull request #8727 from owncloud/upgrade-overview ... Added update overview page	2014-05-29 21:28:47 +02:00
Andreas Fischer	2929d19c7f	Document exceptions thrown by \OC\LargeFileHelper.	2014-05-29 16:26:02 +02:00
Andreas Fischer	ea246d058e	Use "file size" instead of "filesize", then also apply camel case.	2014-05-29 16:26:02 +02:00
Andreas Fischer	0417e52134	Increase file size limit from 2 GiB to 4 GiB when workarounds are unavailable.	2014-05-29 16:26:02 +02:00
Andreas Fischer	fb4556033a	Cast '{DAV:}getcontentlength' to number instead of int.	2014-05-29 16:26:02 +02:00
Andreas Fischer	0bae68017e	Cast to number instead of integer in OC\Files\Cache\HomeCache	2014-05-29 16:26:02 +02:00
Andreas Fischer	a34aa1959a	Cast to number instead of integer in OC\Files\Cache\Cache	2014-05-29 16:26:01 +02:00
Andreas Fischer	a9b28323dd	Add LargeFileHelper::__construct() verifying that our assumptions hold.	2014-05-29 16:26:01 +02:00
Andreas Fischer	2c36a4b07a	Add helper method for turning int|float into base-10 unsigned integer string.	2014-05-29 16:26:01 +02:00
Andreas Fischer	fb7ec2bb22	Only call $this->filesize() for files.	2014-05-29 16:26:01 +02:00
Andreas Fischer	df29eec72b	Windows exec() implementation.	2014-05-29 16:26:01 +02:00
Andreas Fischer	626e87aa54	Output validation for exec() method.	2014-05-29 16:26:01 +02:00
Andreas Fischer	c8fa1fd687	Refactor Large File handling code.	2014-05-29 16:26:01 +02:00
Andreas Fischer	3f8f8027d2	Cast to numeric instead of float, i.e. use an integer if possible.	2014-05-29 16:17:13 +02:00
Andreas Fischer	6195f13bda	Use CURL to get filesize on 32bit systems.	2014-05-29 16:17:13 +02:00
Robin Appelman	998fa2d9be	Pass any methods custom to specific storage implementations to the wrapped storage	2014-05-29 16:13:05 +02:00
Robin Appelman	0ae7a49c8e	Fix storage wrapper being called with null	2014-05-29 14:15:48 +02:00
Robin Appelman	99d46af0b4	Use instanceOfStorage instead of instanceof	2014-05-29 13:52:58 +02:00
Robin Appelman	8c5521fdfc	Add $storage->instanceOfStorage to handle instanceof for storage wrappers	2014-05-29 13:45:50 +02:00
icewind1991	c0f02be50a	Merge pull request #3908 from owncloud/storage-folder-copy-rename ... Recursive copy and remove for local storage backends	2014-05-29 13:29:24 +02:00
Thomas Müller	3ef9570d02	Merge pull request #8547 from owncloud/path-length-master ... Handling long paths properly in \OC\Files\View	2014-05-29 00:08:29 +02:00
Lukas Reschke	1af293dc13	Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailer ... upgraded phpmailer into v5.2.8 via composer	2014-05-28 22:42:45 +02:00
ringmaster	f79948f519	Prevent apps from affecting the scanner via hook.	2014-05-28 13:20:20 -04:00
Lukas Reschke	ce9d5df6df	Merge pull request #8681 from owncloud/logintimestamp ... Record login timestamp per user. Required for new user managament.	2014-05-28 19:06:47 +02:00
Robin Appelman	467e9c2bb0	Remove code duplication	2014-05-28 18:16:24 +02:00
Robin Appelman	af35b6ad9d	Fix LocalStorage->unlink to work on folder as expected	2014-05-28 18:16:24 +02:00
Robin Appelman	8187164fe1	re-use rescursive copy from common storage	2014-05-28 18:16:24 +02:00
Robin Appelman	488fc402e4	remove unneeded check	2014-05-28 18:16:23 +02:00
Robin Appelman	d15ed9b4d3	use \OC\Files\Filesystem::isIgnoredDir	2014-05-28 18:16:23 +02:00
Robin Appelman	ea44f0e20f	fix recursive copy and rename for common storage backend	2014-05-28 18:16:23 +02:00
Robin Appelman	c3c9612c99	fix recursive copy and rename for mapped local storage backend	2014-05-28 18:16:23 +02:00
Robin Appelman	03ba497a8c	add recursive copy to local storage backend	2014-05-28 18:16:23 +02:00
Robin Appelman	38c1da0976	fix recursive rename for local storage backend	2014-05-28 18:16:23 +02:00
Robin Appelman	e83b41493f	remove unneeded delTree	2014-05-28 18:16:23 +02:00
Thomas Müller	a2e4bc8d33	# This is a combination of 2 commits. ... # The first commit's message is: adding tests for long paths increment path field in database up to 4000 (maximum for Oracle - otherwise we could use php's 4096) increment version to trigger database migration adding unit test for too long path # This is the 2nd commit message: fix too long path	2014-05-28 15:30:44 +02:00
ringmaster	3d1ba574e4	Change visibility of scanner internals ... so that descendant classes can access them.	2014-05-28 07:59:38 -04:00
Bernhard Posselt	5e9ea2b365	fix 8757, get rid of service locator antipattern	2014-05-28 02:15:16 +02:00
Volkan Gezer	c100da33bb	upgraded phpmailer into v5.2.8 via composer	2014-05-27 23:33:18 +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
ringmaster	26d169b27c	Use 'filesystem_check_enable' as a config option.	2014-05-27 16:01:16 -04:00
ringmaster	3b287f8274	Allow the default behavior to come from the config.	2014-05-27 15:21:35 -04:00
ringmaster	fdf26c5a3f	Rename variable to something more appropriate.	2014-05-27 15:12:56 -04:00
ringmaster	645e7035a4	Allow apps to control via a hook to skip adding/removing a file during filescan	2014-05-27 15:12:54 -04:00
Vincent Petry	02f682b156	Now showing disabled apps as upgrade status line ... - Added app id in update overview. - Added status message for disabled app for CLI upgrade and web upgrade	2014-05-27 15:20:33 +02:00
Vincent Petry	d43a7c5f6e	Added requiremin/requiremax fields for apps ... Apps can now specify a minimum and maximum version of ownCloud in which they are supported.	2014-05-27 11:54:12 +02:00
Arthur Schiwon	4a4ea67a31	drop superflous statement in phpdoc	2014-05-26 13:56:08 +02:00
Arthur Schiwon	748a219243	add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook	2014-05-26 13:53:26 +02:00
Vincent Petry	a34491e288	Merge pull request #8687 from owncloud/recursive-remove-smb ... Make the recursive delete more robust	2014-05-26 11:06:13 +02:00
Frank Karlitschek	48d0cebc42	Merge pull request #8674 from owncloud/watch-policy ... Add a config option for setting the filesystem watcher policy	2014-05-26 10:48:44 +02:00
Robin Appelman	be8326668a	Make the recursive delete more robust	2014-05-23 13:31:45 +02:00
Robin Appelman	151c48494e	Add a config option fro setting the filesystem watcher policy	2014-05-23 12:20:31 +02:00
Arthur Schiwon	2e85d5a852	increase scrutinizer happyiness by removing minor/informational issues	2014-05-23 11:20:46 +02:00
Björn Schießle	050df76830	Merge pull request #8599 from owncloud/sharing_disable_for_groups ... allow admin to disable sharing for specific groups of users	2014-05-22 08:19:27 -04:00
Robin Appelman	ff1f341d97	Fix phpdoc	2014-05-22 13:30:32 +02:00
Bjoern Schiessle	12338e0ef0	allow admin to disable sharing for specific groups of users	2014-05-22 10:43:44 +02:00
Vincent Petry	25ecd2bdda	Merge pull request #8659 from owncloud/get-preference-multiple-user ... Add a method to get the values for multiple users to OC\Preferences	2014-05-22 09:59:20 +02:00
Arthur Schiwon	2c89962919	clean up tryRememberLogin and save the timestamp of users last login	2014-05-21 18:03:37 +02:00
Joas Schilling	e20fb37038	Correctly create list of placeholders	2014-05-21 14:35:59 +02:00
Bjoern Schiessle	5f403f3e92	move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists	2014-05-21 13:19:17 +02:00
Joas Schilling	4fbfe077fb	Move return to new line	2014-05-21 13:10:23 +02:00
Joas Schilling	cf3cd572b0	Add a method to get the values for multiple users to OC\Preferences	2014-05-21 11:14:52 +02:00
Thomas Müller	06af8e09da	adding annotation check to checkServer()	2014-05-19 21:51:35 +02:00
Thomas Müller	30f1ec2521	Merge branch 'master' into test_annotations_working ... Conflicts: lib/private/util.php	2014-05-19 21:42:30 +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
Thomas Müller	51a6764f31	Merge branch 'master' into cleanup-list-code ... Conflicts: apps/files_sharing/ajax/list.php	2014-05-19 20:52:25 +02:00
Thomas Müller	f8cb8f4803	Merge branch 'master' into csrf-on-login-and-logout ... Conflicts: core/templates/login.php	2014-05-19 20:40:55 +02:00
Thomas Müller	b6d2d6329d	Merge pull request #8639 from owncloud/drop-brief ... Remove all occurences of @brief and @returns from PHPDoc	2014-05-19 20:18:32 +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
Frank Karlitschek	090d127050	Merge pull request #6457 from owncloud/db-convert-tool ... Command line tool to convert current database to others, except sqlite	2014-05-19 16:41:31 +01: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
Morris Jobke	48977c8579	Merge pull request #7286 from owncloud/issue/4823 ... Set expiration date by default when adding additional shares	2014-05-19 10:26:54 +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
Morris Jobke	804020bb6d	Merge pull request #7363 from owncloud/optimize-startup-queries ... Optimize some queries that are always executed when loading base.php	2014-05-19 01:21:37 +02:00
Björn Schießle	42b99b6d0f	Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links ... use default expire date only for link shares	2014-05-16 14:57:11 -04: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	7a48f24459	use default expire date only for link shares	2014-05-16 18:12:13 +02:00
Bjoern Schiessle	b6e14af861	allow admin to enforce passwords for public link shares	2014-05-16 17:41:09 +02:00
Vincent Petry	04f73275ba	Now settings CSS class with appid in content DIV	2014-05-15 17:51:04 +02:00
Bernhard Posselt	d8020c3506	use registerService method instead of array access	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
Thomas Müller	37ba6f503a	fixing variable naming	2014-05-13 19:09:15 +01:00
Thomas Müller	fa503a4772	fix PHPDoc	2014-05-13 19:09:15 +01:00
Thomas Müller	650a55e2ba	object -> \OC\Preview	2014-05-13 19:09:14 +01:00
Thomas Müller	7853bc4cac	adding PHPDoc	2014-05-13 19:09:14 +01:00
Thomas Müller	147007bdd8	fixing typo and missing @throws	2014-05-13 19:09:14 +01:00
Robin McCorkell	4755392c65	More PHPDoc for file functions	2014-05-13 19:09:14 +01: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	bac8962bbc	Fix Scrutinizer errors	2014-05-13 19:08:14 +01:00
Robin McCorkell	8ab01599a9	Use OC_User_Interface instead of OC_User_Backend	2014-05-13 19:08:14 +01:00
Lukas Reschke	7e448a376f	Fix PHPDoc and typos ... Some things my IDE complained about while creating a custom backend. Fix PHPDoc and typos Some things my IDE complained about while creating a custom backend. Conflicts: lib/private/group/database.php lib/private/group/dummy.php lib/private/group/example.php	2014-05-13 19:08:14 +01:00
Robin McCorkell	3bed3d2a23	Change parameter type for useBackend	2014-05-13 19:08: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	f5bc680f9c	Merge pull request #8572 from owncloud/core-getabsolutepathwithzero ... Fixed getAbsolutePath case when path is "0"	2014-05-13 17:41:18 +02:00
Vincent Petry	bab8c1f8e5	Fixed getAbsolutePath case when path is "0" ... Make sure to correctly check for string emptiness when the passed path is "0".	2014-05-13 17:38:46 +02:00
Björn Schießle	b8de1e5d71	Merge pull request #8398 from owncloud/enc_backup_keys ... backup the encryption key after the encryption was disabled	2014-05-13 09:25:16 -04:00
Bjoern Schiessle	a9ac11718e	backup the encryption key after the encryption was disabled so that the user ... can restore them if needed	2014-05-13 12:35:25 +02:00
Bernhard Posselt	a152e320f6	make it possible to omit parameters and use the default parameters from the controller method	2014-05-13 10:40:49 +02:00
Vincent Petry	e3f6abf1f0	Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-master ... Rotate thumbnail when encryption is enabled	2014-05-13 10:27:41 +02:00
Thomas Müller	8314e5f4d1	fixing typos and adding PHPDoc	2014-05-12 21:58:09 +02:00
Thomas Müller	408189b7e4	Merge pull request #8556 from owncloud/kill-legacy-code-master ... Kill legacy code master	2014-05-12 20:55:24 +02:00
Lukas Reschke	aea44ee0d5	Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap ... Use proper PHPDoc and variable names in the LDAP lib	2014-05-12 19:31:43 +02:00
Thomas Müller	ee8a7b53da	Merge pull request #8553 from owncloud/fix-8549-master ... adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeade...	2014-05-12 17:45:08 +02: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
Thomas Müller	f5ed92bf31	remove legacy aka deprecated code: OC_Cache_FileGlobalGC	2014-05-12 16:34:47 +02:00
Thomas Müller	e0dd69e4e6	remove legacy aka deprecated code: OC_FilesystemView	2014-05-12 16:30:39 +02:00
Thomas Müller	33987eea83	remove legacy aka deprecated code: OC_Cache	2014-05-12 16:23:33 +02:00
Thomas Müller	4dd1a49a68	remove legacy aka deprecated code: OC_Filesystem	2014-05-12 16:20:07 +02:00
Thomas Müller	3cd32dcb7c	adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeaders() to OC_Response, which seems to be a more reasonable place	2014-05-12 15:14:01 +02:00
Morris Jobke	9d95fff427	fix missing spaces	2014-05-12 13:32:03 +02:00
Thomas Müller	da0e37ef03	Rotate thumbnail when encryption is enabled ... When a picture is encrypted, save it to a temporary file first so that the PHP function for rotation can access it as file.	2014-05-12 11:27:39 +02:00
Thomas Müller	d853c60d7e	adding interpolation as requested by PSR-3	2014-05-12 10:54:09 +02:00
Morris Jobke	2054837d01	Merge pull request #8541 from owncloud/hardenIsSubDirectory ... Harden issubdirectory()	2014-05-12 01:42:25 +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	63f2f16b85	use new controllermethodreflector for corsmiddleware	2014-05-11 17:55:59 +02:00
Bernhard Posselt	474b8f071d	Fix typo	2014-05-11 17:54:09 +02:00
Bernhard Posselt	3e58a767ad	Fix method signature	2014-05-11 17:54:09 +02:00
Bernhard Posselt	fcb1aa36f0	default to null to not fail if type is not annotated via phpdoc	2014-05-11 17:54:09 +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	c590244fa1	add private property for reflector in security middleware	2014-05-11 17:54:08 +02:00
Bernhard Posselt	ede7325772	fix broken if	2014-05-11 17:54:08 +02:00
Bernhard Posselt	d8da79cab0	add test for not failing when adding more comments after type parameters, do not limit x-www-form-urlencoded to POST	2014-05-11 17:54:08 +02:00
Bernhard Posselt	4dca2038bf	add request to dispatcher class	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	a252f59cd4	Merge pull request #8504 from owncloud/cors-middleware ... Add cors middleware	2014-05-11 16:54:34 +02:00
Lukas Reschke	fd5b2d11d6	Rename issubdirectory to isSubDirectory	2014-05-11 15:50:59 +02:00
Lukas Reschke	a40e49cae5	Harden issubdirectory() ... realpath() may return false in case the directory does not exist since we can not be sure how different PHP versions may behave here we do an additional check whether realpath returned false	2014-05-11 15:49:19 +02:00
Lukas Reschke	cd3ed01483	Fix Typo ... I guess that should be `default` and not `defautl`, wondering how this ever worked.	2014-05-11 15:24:42 +02:00
Bernhard Posselt	e05192a23d	Fix method signature	2014-05-11 14:03:58 +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
Thomas Tanghus	287c8981bc	Check if ReflectionMethod::getDocComment is working	2014-05-09 22:44:55 +02:00
Lukas Reschke	1083085e6e	Merge pull request #7546 from owncloud/no_freaking_tag_dupes ... Tags cleanup	2014-05-09 22:10:45 +02:00
Thomas Müller	e5ee84ca9b	- update permissions ... - change xml tag to perm	2014-05-09 17:18:43 +02:00
Andreas Fischer	bd4d315d78	Merge pull request #8512 from owncloud/fix-memcached-hasKey ... Be more strict in checking the resultCode of memcached hasKey function * owncloud/fix-memcached-hasKey: Memcached hasKey should test for success, the get can fail for other reasons.	2014-05-09 12:41:46 +02:00
Vincent Petry	6e7c274d2e	Merge pull request #8499 from owncloud/shareextstoragemountpointfix ... Fix sharing of ext storage mount points	2014-05-08 22:35:01 +02:00
Bart Visscher	88225db4af	Memcached hasKey should test for success, the get can fail for other reasons. ... One of the other failures is no running server.	2014-05-08 18:11:29 +02:00
Vincent Petry	05dc694c5c	Fix getPathById for Oracle ... Added extra code to handle the case of Oracle which saves empty strings as null values.	2014-05-08 13:33:55 +02:00
Andreas Fischer	8ede209ea3	Merge pull request #8493 from owncloud/we-certainly-don't-want-type-juggling-on-that ... Use strict type comparison * owncloud/we-certainly-don't-want-type-juggling-on-that: Use strict type comparison	2014-05-08 13:02:48 +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
Bart Visscher	9f88141bcd	Use 'boolean' as type instead of 'bool'	2014-05-07 20:46:08 +02:00
Bart Visscher	f569c721a6	Merge branch 'master' into optimize-startup-queries ... Conflicts: apps/files_sharing/lib/sharedstorage.php tests/lib/group/manager.php removed hasFilesSharedWith from lib/public/share.php and sharedstorage.php to fix merge	2014-05-07 17:54:38 +02:00
Lukas Reschke	c4109d9aef	Use strict type comparison ... We certainly don't want to have type juggling on that.	2014-05-07 15:11:42 +02:00
Lukas Reschke	254fa5eb22	Merge pull request #8488 from owncloud/sabre-notfoundloglevel ... Some expected Sabre exceptions are now logged with DEBUG level	2014-05-07 15:05:17 +02:00
Vincent Petry	75d81eefc1	Merge pull request #8223 from owncloud/fix_linkToPublic ... Fix linkToPublic and linkToAbsolute.	2014-05-07 14:40:59 +02:00
Vincent Petry	4a493c8835	Some expected Sabre exceptions are now logged with DEBUG level	2014-05-07 11:43:50 +02:00
Vincent Petry	d16bb09aed	Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uri ... Send URI instead of filepath to NGINX for X-Accel	2014-05-06 18:41:06 +02:00
Bart Visscher	72864d1c53	Typo	2014-05-06 18:05:06 +02:00
Morris Jobke	9411ba2acd	Merge pull request #8459 from owncloud/fix-getUserFolder ... fix getUserFolder() of server container	2014-05-05 23:08:42 +02:00
Morris Jobke	91a5e728c0	fix getUserFolder() of server container	2014-05-05 18:15:48 +02:00
Robin Appelman	578eb33c20	Dont create borders around previews when scaling up is disabled	2014-05-05 14:54:34 +02:00
Vincent Petry	1a454f61ed	Merge pull request #8386 from owncloud/fix_6946_master ... Fix 6946 master	2014-05-05 14:08:45 +02:00
Thomas Müller	341fcdc37a	Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master ... Images on public sharing get downscaled to increase use experience - thi...	2014-05-05 10:12:40 +02:00
Lukas Reschke	0b7d9e2668	Cleanup code a little bit ... - Use OCP\Response constants instead of the HTTP error code - Use checkAppEnabled() instead of OC_App::isEnabled with an if statement - Remove uneeded variable $baseURL - Rename $isvalid to $isValid	2014-05-04 15:51:08 +02:00
Lukas Reschke	73b914ddbc	Add CSRF check on login and logout ... This is a minor issue and not worth a backport in my opinion as it could break more things than it's worth having it.	2014-05-04 13:56:21 +02:00
Lukas Reschke	5cfc9d973d	Fix PHP Doc and use readable variable name	2014-05-04 13:02:58 +02:00
Lukas Reschke	6f57911b44	Does also take int or string	2014-05-04 13:01:57 +02:00
Lukas Reschke	d091cca636	Fix typo	2014-05-04 12:53:06 +02:00
Morris Jobke	623161b9a9	Merge pull request #8023 from flyser/master ... Fix setting the max-upload-size for really large values.	2014-05-03 11:49:38 +02:00
Bernhard Posselt	906061a07b	Merge pull request #8171 from owncloud/fix-import ... be nice and use a relative import so people can use the class without fi...	2014-05-02 22:43:19 +02:00
Vincent Petry	9e18be6422	Merge pull request #8377 from youngguns-nl/issue_8376 ... RecursiveDirectoryIterator does not work on NFS	2014-05-02 18:45:09 +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
Thomas Müller	20893cc3b3	Images on public sharing get downscaled to increase use experience - this will speed up loading time ... - adding keep aspect to core/ajax/preview.php - remove duplicate method Preview::show() - no more hard coded mimetype of preview - remove .png from the preview urls - keep old route preview.png for backwards compatibility - aspect preserving previews are now cached	2014-05-02 17:02:57 +02:00
Jörn Friedrich Dreyer	6694129cbc	columns should be nullable by default	2014-05-01 23:03:45 +02:00
Bart Visscher	50f49c57b5	Some more params are optional	2014-05-01 18:11:30 +02:00
Thomas Müller	11404b2b12	Merge pull request #8391 from owncloud/router-parameter-sorting ... Preserve keys when sorting parameters when generatings urls	2014-04-30 15:10:36 +02:00
Thomas Müller	4481a8412c	Merge pull request #8132 from owncloud/issue/8131 ... Issue/8131 Fix emitting of filesystem related hooks	2014-04-30 13:57:44 +02:00
Robin Appelman	77e6278d09	Preserve keys when sorting parameters when generatings urls	2014-04-29 11:55:19 +02:00
icewind1991	b95aa43a5d	Merge pull request #8285 from owncloud/better_getmountby_handling ... Handle return values better from Filesystem::getMountBy*	2014-04-29 11:22:11 +02:00
Joas Schilling	c060f6ec7b	Deduplicate code	2014-04-29 10:34:28 +02:00
Joas Schilling	c1caaa6241	Correctly emit create/update hooks when a large file is being created/update ... after being uploaded in .part files Fix #8131	2014-04-29 10:34:27 +02:00
Joas Schilling	4fa9e46d2b	Emit a new hook, when a file is being updated only ... The write-hook also is triggered for created files Fix #8131	2014-04-29 10:34:26 +02:00
Thomas Müller	6935364b33	add class Pimple to autloader	2014-04-28 20:57:44 +02:00
Volkan Gezer	e7c6111ae3	Update outdated comment	2014-04-28 20:23:18 +02:00
Sjors van der Pluijm	e8a287f5bb	refs #8376; spaces=>tabs	2014-04-28 19:52:06 +02:00
Sjors van der Pluijm	54f482ff9c	refs #8376; added comment and applied patch on other files	2014-04-28 19:32:25 +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
Arthur Schiwon	45e42c25de	Group Database backend must not gather user details itself but ask user ... backends. This is a port to master from PR #7745 remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends Conflicts: lib/private/group/backend.php LDAP: getDisplayNamesInGroup is not an option for group backends anymore Conflicts: apps/user_ldap/group_ldap.php apps/user_ldap/group_proxy.php clean up group backends Conflicts: lib/private/group/database.php remove now unnecessary test implement getDisplayNames in group manager adjust user manager tests test for group manager's displayNamesInGroup trim must not be used in empty in PHP < 5.5 keep the constant to not provoke PHP warnings Conflicts: lib/private/group/backend.php	2014-04-28 13:49:56 +02:00
Sjors van der Pluijm	d7ec1fe447	rewind iterator before iteration starts	2014-04-28 13:05:20 +02:00
Georg Ehrke	b68098ebba	remove preview office fallback as it makes too much trouble and generates inacceptable results	2014-04-28 12:05:10 +02:00
Sjors van der Pluijm	d8be9d96ed	fixes #8376	2014-04-28 10:20:24 +02:00
Thomas Müller	5fd776debf	Merge pull request #7473 from owncloud/append-error-document ... Remove .htaccess creation code	2014-04-28 08:50:42 +02:00
Bart Visscher	7c0370105a	Fix wrong var name	2014-04-26 11:15:09 +02:00
Bart Visscher	fc9371ae10	Merge branch 'master' into contactsmanager-register ... Conflicts: lib/private/contactsmanager.php	2014-04-26 10:55:25 +02:00
icewind1991	7599fa94ce	Merge pull request #8350 from owncloud/share-search-mime ... fix search by mime for shared single files	2014-04-25 15:54:36 +02:00
icewind1991	5194f014c9	Merge pull request #7504 from owncloud/webdav-injection ... Proper injection of filesystem view into the webdav connector	2014-04-25 14:42:43 +02:00
Robin Appelman	194ea66cb5	Merge branch 'master' into share-search-mime	2014-04-25 14:04:41 +02:00
Robin Appelman	672a8248ce	Correct the path returned by getFolderContent for substorages	2014-04-25 13:56:45 +02:00
Robin Appelman	456ca0cf7d	fix paths of searchByMime results on substorages	2014-04-25 12:31:44 +02:00
Robin Appelman	6c20a014ea	merge master into webdav-injection	2014-04-25 11:47:06 +02:00
Robin McCorkell	77e3d067f0	Better handle return values from Filesystem::getMountBy* ... getMountByStorageId and getMountByNumericId return an empty array on error, which should be detected to avoid possible errors. This commit also adds in some new logging points and throws to aid debugging	2014-04-25 09:50:34 +01:00
Lukas Reschke	1cafd1e3b9	Merge pull request #8337 from owncloud/flv-to-mimes ... Add flv to known mimetypes	2014-04-24 19:09:01 +02:00
Björn Schießle	f520305848	Merge pull request #8026 from owncloud/remove_shared_folder ... remove the "Shared" folder	2014-04-24 18:45:45 +02:00
Victor Dubiniuk	fc4be3d0ad	Add flv to known mimetypes	2014-04-24 19:09:31 +03:00
Bjoern Schiessle	35321c7d41	add additional rows to the select statement, 'stime' is needed for the expire check	2014-04-24 15:18:25 +02:00
Bjoern Schiessle	6650be9913	add setting to set default expire date	2014-04-24 13:34:31 +02:00
Robin Appelman	cd0c5990f8	properly quote etags	2014-04-24 11:12:39 +02:00
Robin Appelman	49b44e7e22	Normalize paths when moving properties	2014-04-24 11:12:39 +02:00
Volkan Gezer	ff0dab6e92	This adds one more missing untranslated text from lib/share ... Also displays the untrusted domain warning in English	2014-04-24 01:42:18 +02:00
Thomas Müller	4ba6f4839d	fixing typos and PHPDoc	2014-04-23 15:36:01 +02:00
Robin Appelman	e77d89fc4b	Revert changes to OC_Connector_Sabre_Server	2014-04-23 14:21:09 +02:00
icewind1991	c8801a41d8	Merge pull request #8324 from owncloud/expired-link-error ... Fix error when viewing expired link	2014-04-23 14:13:44 +02:00
Bjoern Schiessle	b312d38d38	remove hard-coded shared folder	2014-04-23 12:59:22 +02:00
Bjoern Schiessle	7ef8f6d352	always allow to rename the share mount point	2014-04-23 12:54:26 +02:00
Bjoern Schiessle	93469ca468	make it possible to move files out of a shared mount point	2014-04-23 12:54:26 +02:00
Bjoern Schiessle	fb88aba8f4	some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code	2014-04-23 12:54:26 +02:00
Bjoern Schiessle	652d417a58	we don't allow to share a folder if it contains a share mount point	2014-04-23 12:54:26 +02:00
Bjoern Schiessle	bffcbac7a7	allow to rename group share mount points	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	dfb69e9418	allow user to delete shared files/folders	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	4c840cb61d	fix target generation for group shares	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	ed981294f1	fix share api tests	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	27c5a978f9	we no longer need to handle the Shared folder different from any other folder	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	c4e0fb75a4	add api to get shares from a specific user	2014-04-23 12:54:24 +02:00
Bjoern Schiessle	a02fb3722b	user should be able to rename/delete shared files if the owner allowed it	2014-04-23 12:54:24 +02:00
Bjoern Schiessle	72bbb9ca20	allow to remove and change mount points	2014-04-23 12:54:24 +02:00
Bjoern Schiessle	cfc52ccc3d	add some action items	2014-04-23 12:54:24 +02:00
Robin Appelman	3d0661a1e7	Fix error when viewing expired link	2014-04-23 12:54:18 +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
Thomas Müller	535e6ff71f	Merge pull request #7617 from nishiki/cache_user ... Cache user	2014-04-23 12:32:30 +02:00
Thomas Müller	dcc48f9b46	Merge pull request #8068 from wakeup/fix-share.php-string-extraction ... Make lib/** share.php strings extractable for translation	2014-04-23 09:58:10 +02:00
Robin Appelman	b42ce6c30a	Prevent error if previously cached data doesn't have an etag	2014-04-22 15:24:38 +02:00
Volkan Gezer	6e857de6b7	Make lib/** share.php strings extractable for translation ... They were not ready for translation as they had no placeholders and/nor wrapper function to be translated This should fix: #8011	2014-04-22 14:56:44 +02:00
Thomas Müller	0330481c5e	Merge pull request #8263 from LEDfan/add-key-to-contacts ... Add key to every contact	2014-04-22 14:20:53 +02:00
Tobia De Koninck	efff7dd2a4	Change key to addressbook-key	2014-04-22 12:46:09 +02:00
Robin Appelman	3821a09689	merge master into webdav-injection	2014-04-22 12:25:49 +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
Andreas Fischer	f2f5a53d36	Merge pull request #7988 from owncloud/routing-cache-webroot ... Keep cached urls with different hostnames or baseurls seperate * owncloud/routing-cache-webroot: Sort parameters and cast to int add delimiter between host and baseurl Keep cached urls with different hostnames or baseurls seperate	2014-04-20 18:27:23 +02:00
Bernhard Posselt	7e447f4f42	make download and redirectresponse public	2014-04-20 16:12:46 +02:00
Andreas Fischer	f2e5494edc	Merge pull request #8203 from owncloud/correct-link ... Use direct link instead of JS * owncloud/correct-link: Link to previous directory Use direct link instead of JS	2014-04-20 15:58:53 +02:00
Lukas Reschke	e930ce6436	Add type hinting	2014-04-20 00:55:01 +02:00
Bernhard Posselt	0c736feaba	remove useless import	2014-04-19 19:31:49 +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	f260951825	port database layer from appframework to core	2014-04-19 14:56:16 +02:00
LEDfan	b78c1373b6	Add key to every contact	2014-04-18 14:30:44 +02:00
Bart Visscher	9583549556	camelCase vars in OC\ContactsManager	2014-04-17 17:56:23 +02:00
Morris Jobke	707658c00a	Merge pull request #8205 from owncloud/fix-8202 ... Add one more LOWER.	2014-04-17 16:10:33 +02:00
Morris Jobke	a2a0eb370b	Merge pull request #8222 from owncloud/type-hinting ... Type hinting fixes	2014-04-17 16:08:15 +02:00
Robin McCorkell	13b463cc17	Merge pull request #8189 from Xenopathic/misc_fixes ... Various fixes	2014-04-17 11:56:51 +01:00
Jörn Friedrich Dreyer	8a0c8a1956	Merge pull request #8240 from owncloud/thumbnail-on-short-videos-master ... videos which are shorter then 5 seconds will now get a proper thumbnail ...	2014-04-17 11:15:05 +02:00
Morris Jobke	5a1a056c6d	Merge pull request #8183 from owncloud/move-security-headers ... Move security headers	2014-04-16 23:46:20 +02:00
Lukas Reschke	81c23b02da	Link to previous directory	2014-04-16 21:10:14 +02:00
Thomas Müller	a4389340b8	escape $second + update PHPDoc	2014-04-16 19:45:55 +02:00
Thomas Müller	d0f8cc20c5	videos which are shorter then 5 seconds will now get a proper thumbnail at 1 second	2014-04-16 17:16:03 +02:00
Thomas Tanghus	da99e403bc	Also fix linkToAbsolute	2014-04-16 14:30:24 +02:00
Thomas Tanghus	6fe3fd4a0b	Fix linkToPublic. Refs #8218	2014-04-15 23:04:35 +02:00
Bart Visscher	a4b7f5155f	Fix PHPdoc in lib/private ... using scrutinizer patch	2014-04-15 22:55:20 +02:00
Thomas Müller	8bc7174bdc	Merge pull request #8104 from owncloud/lukepolo-master ... Added the ability to Drag and Drop folders [chrome]	2014-04-15 21:39:32 +02:00
Bart Visscher	a9bf3df82d	Fix PHPdoc in OC\Share\Share and OCP\Share	2014-04-15 21:05:44 +02:00
Lukas Reschke	8322a9e5c2	Merge pull request #8210 from owncloud/enhance-assets-management-master ... adding checks and log messages regarding the assets folder	2014-04-15 20:07:07 +02:00
Robin Appelman	295b75cca9	merge master into webdav-injection	2014-04-15 20:05:43 +02:00
Robin Appelman	c82adb8c5d	merge master into webdav-injection	2014-04-15 20:03:00 +02:00
Lukas Reschke	ffab31e3ee	Merge pull request #8197 from owncloud/secure_mimetypes ... White-list known secure mime types. Refs. #8184	2014-04-15 19:50:33 +02:00
Arthur Schiwon	64679b2e62	Remove limit and offset manipulation when getting users or groups, because it does not work when more than one user or group backend. Fixing it would be too costly performancewise, so we switch back to the model used in OC 5: limit and offset are effective per backend, and not a general constraint	2014-04-15 17:46:48 +02:00
Andreas Fischer	714343cd74	Add Bart to PgSqlTools copyright.	2014-04-15 16:29:43 +02:00
Thomas Müller	02726acbc8	adding checks and log messages regarding the assets folder	2014-04-15 16:26:12 +02:00
Robin Appelman	7f77b08098	Sort parameters and cast to int	2014-04-15 15:48:02 +02:00
Andreas Fischer	bd37010f35	Merge remote-tracking branch 'owncloud/master' into db-convert-tool ... * owncloud/master: (61 commits) [tx-robot] updated from transifex Make email display name change translatable again Ignore jquery.multiselect.js - it's 3rdparty javascript code cleanup + fixing syntax errors Revert "close-button for share_dropdown" close-button for share_dropdown [tx-robot] updated from transifex The latest developer manual link The latest developer manual link p() and print_unescaped() also take arrays as parameter Check whether the user has permissions to add personal storage backends [tx-robot] updated from transifex Fix a wrong WebDAV Warning with self-signed-certs fix translation link upda mailinglist address fix contribute link default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute Correctly process request parameters other than GET or POST, dont use globals in the class but inject it [tx-robot] updated from transifex use references for middleware to fix problems on 5.3 ...	2014-04-15 15:44:44 +02:00
Thomas Müller	e125dc60cd	introduce new function to force a language	2014-04-15 15:12:25 +02:00
Björn Schießle	2dbb2db7e0	Merge pull request #7780 from owncloud/share-file-exists ... Verify that a file exists before we share it	2014-04-15 11:23:17 +02:00
Victor Dubiniuk	91d40f5033	remove unneeded LOWER. Fixes #8202	2014-04-14 22:19:21 +03:00
Lukas Reschke	340089f270	Merge pull request #8059 from owncloud/countUsersInGroup ... add optional countUsersInGroup method to group backends	2014-04-14 20:45:12 +02:00
Lukas Reschke	9046f7b2f8	Merge pull request #8178 from owncloud/fix-request-parameters ... Correctly process request parameters other than GET or POST, dont use gl...	2014-04-14 20:42:26 +02:00
Lukas Reschke	2bda3f9ae0	Use direct link instead of JS ... Due to our CSP policy this link won’t work as it it considered as inline Javascript. This commit replaces the link with a static link to the files app. Reimplementation of #8067 - fixes #7742	2014-04-14 20:16:52 +02:00
Andreas Fischer	9cc41a2460	Move PostgreSQL sequence resynchronisation out into PgSqlTools class.	2014-04-14 18:37:47 +02:00
Thomas Tanghus	2fb68c120b	Added explanation to mimetypes.list.php to avoid future confusion.	2014-04-14 18:21:19 +02:00
Thomas Tanghus	51e47319ef	White-list known secure mime types. Refs. #8184	2014-04-14 17:17:50 +02:00
Thomas Müller	fe364656a4	Merge pull request #8181 from owncloud/fix_wrong_webdav_warning ... Fix a wrong WebDAV Warning with self-signed-certs	2014-04-14 16:53:06 +02:00
Thomas Müller	8df19c4379	Merge pull request #8019 from owncloud/thumbnail_fixes ... Thumbnail fixes	2014-04-14 16:23:03 +02:00
Thomas Müller	71de321869	Merge pull request #8156 from owncloud/fix-middleware-container ... fix the middleware registration process in the container	2014-04-14 14:53:58 +02:00
Robin McCorkell	eeee9eacea	Prevent error from cache update on deleted files	2014-04-13 16:17:13 +01:00
Lukas Reschke	eecc400698	p() and print_unescaped() also take arrays as parameter ... This fixes some scrutinizer issues.	2014-04-13 16:18:05 +02:00
Lukas Reschke	b04d95b116	Remove uneeded usages of nosniff	2014-04-13 12:48:16 +02:00
Lukas Reschke	a2a850dd91	Fix indentation	2014-04-13 11:52:31 +02:00
Lukas Reschke	df67a04385	Move security headers to base.php ... Some headers were currently only added to the templates but not to other components (e.g. SabreDAV / JSON / etc...) The migration to base.php ensures that the headers are served to all requests passing base.php	2014-04-13 11:51:03 +02:00
kondou	d98ae4f9b2	Fix a wrong WebDAV Warning with self-signed-certs ... Occuring in the admin interface	2014-04-13 05:24:29 +02:00
Bernhard Posselt	62cce982bb	default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute	2014-04-12 16:17:49 +02:00
Bernhard Posselt	e7fa2790f3	Correctly process request parameters other than GET or POST, dont use globals in the class but inject it	2014-04-12 15:02:19 +02:00
Bernhard Posselt	526100dc90	be nice and use a relative import so people can use the class without firing up owncloud	2014-04-12 01:33:21 +02:00
Bernhard Posselt	4af72a076d	use references for middleware to fix problems on 5.3	2014-04-11 20:50:49 +02:00
Lukas Reschke	77ecfdd1a4	Only encode dangerous dangerous characters ... There is no need to encode all characters into HTML entities, only potential dangerous characters as &, ", ', < and > should get encoded. This may fix issues like https://github.com/owncloud/calendar/pull/394	2014-04-11 19:42:15 +02:00
Bernhard Posselt	763da4258e	fix the middleware registration process in the container	2014-04-10 20:51:03 +02:00
Bernhard Posselt	2fc6fb36ad	Merge pull request #8139 from owncloud/fix-middleware-registration ... register middleware as string to not force request to be instantiated to...	2014-04-10 20:24:30 +02:00
Bart Visscher	694244f2e0	Supply the contactsmanager object to the callbacks	2014-04-10 18:07:15 +02:00
Bart Visscher	5c412f480c	$key is not needed for registering contactsmanager callbacks	2014-04-10 18:06:31 +02:00
Thomas Müller	e401df26bc	Merge pull request #8107 from owncloud/dav-negativetimestampfix ... Fixed Sabre Node implementation to correctly return timestamps as int	2014-04-10 17:37:53 +02:00
Thomas Müller	26a89e369e	Merge pull request #8137 from owncloud/routeing-requirements ... add requirements to routing	2014-04-10 16:23:01 +02:00
Thomas Müller	ecd74d3630	Merge pull request #8138 from owncloud/allow-app-in-routes.php ... To isolate the variable scope used inside the $file it is required in it...	2014-04-10 16:09:23 +02:00
Tom Needham	654d5af394	Merge pull request #8027 from owncloud/routes-ocs ... Load all routes when matching an ocs route	2014-04-10 12:22:34 +01:00
Vincent Petry	6cc578d1a7	Merge pull request #8018 from owncloud/ocs_result_success_is_100 ... OC_OCS_Result Class, Only accept 100 code as success	2014-04-10 13:03:10 +02:00
Vincent Petry	8d05848391	Merge pull request #7825 from owncloud/hash-stream ... Use streams when generating hashes of remote files	2014-04-10 10:42:04 +02:00
Vincent Petry	9a8457aca0	Merge pull request #8053 from owncloud/preview-hook-root ... Pass the correct root to the preview on post_write	2014-04-10 10:31:40 +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
Thomas Müller	98a5f121fd	To isolate the variable scope used inside the $file it is required in it's own method	2014-04-09 22:45:34 +02:00
Thomas Müller	d2961dcf11	Merge branch 'master' into lukepolo-master ... Conflicts: apps/files/js/filelist.js	2014-04-09 22:00:25 +02:00
Bernhard Posselt	70c88027db	add requirements to routing	2014-04-09 21:57:32 +02:00
Bart Visscher	511816b878	Implement the register function of OC\ContactsManager	2014-04-09 21:53:06 +02:00
Vincent Petry	4f11786a3d	Fixed Sabre Node implementation to correctly return timestamps as int ... Negative timestamps were returned as string and were confusing other Sabre API like Sabre_DAV_Property_GetLastModified. This fix makes sure the timestamp is returned as int when defined.	2014-04-09 15:46:51 +02:00
Andreas Fischer	78ee4c1327	Merge remote-tracking branch 'owncloud/master' into db-convert-tool ... * owncloud/master: (137 commits) add comment to clearify when a skip in the foreach happens remove obsolete code Always define sendmail_is_available [tx-robot] updated from transifex Make hardcoded exception messages translatable Disable sharing in trashbin app class Test_Config is already declared [tx-robot] updated from transifex using array_key_exists() instead of isset() - required because in case the value is null isset is returning false fixing undefined exception classes unit test testSetAppValueIfSetToNull() added unit tests for dynamic backend registration ignore underscore.js in scrutinizer.yml adding ownCloud globals to jshintrc: OC, t, n Use git checkout on directory as some files may not be in git resulting in, e.g.: adding underscore.js reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085 translations for oc-dialogs reside in code Fix copy conflict dialog translation [tx-robot] updated from transifex ...	2014-04-09 15:20:18 +02:00
Joas Schilling	352063cf0a	Fix Undefined index: storage in share.php ... There parameter was removed when the code was cleaned up: {"app":"PHP","message":"Undefined index: storage at E:\\ownCloud\\owncloud\\lib\\private\\share\\share.php#1160", "level":0,"time":"2014-04-09T12:56:23+00:00"}	2014-04-09 15:14:44 +02:00
Joas Schilling	d418e176ce	Do not query when the list is empty	2014-04-09 15:02:06 +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
Volkan Gezer	a4f42676ea	Make hardcoded exception messages translatable	2014-04-08 20:07:25 +02:00
Arthur Schiwon	5f8d9b3a4e	ask implementsAction instead of checking method_exists for easier testing	2014-04-08 12:31:11 +02:00
Arthur Schiwon	698297feb3	add optional countUsersInGroup method to group backends	2014-04-08 12:04:38 +02:00
Thomas Müller	7dd0074655	fixing mkdir code to respect external file systems as well	2014-04-07 23:17:35 +02:00
Thomas Müller	3587c88fe9	Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master ... Conflicts: apps/files/js/file-upload.js	2014-04-07 22:28:16 +02:00
Thomas Müller	c1fd300048	using array_key_exists() instead of isset() - required because in case the value is null isset is returning false	2014-04-07 21:05:48 +02:00
Thomas Müller	0fe32eee13	Merge pull request #8083 from owncloud/fix-link-to-sync ... Remove wrong whitespace from URL and use HTTPS	2014-04-07 14:38:47 +02:00
Robin Appelman	51fbf0bcbc	add delimiter between host and baseurl	2014-04-07 13:27:18 +02:00
Robin Appelman	84285011ce	Merge branch 'master' into routing-cache-webroot	2014-04-07 13:24:51 +02:00
Lukas Reschke	6babf90175	Switch to HTTPS	2014-04-06 22:06:38 +02:00
Lukas Reschke	5679f5c37e	Remove wrong whitespace from URL and use HTTPS ... The whitespace caused the generated links to begin with a whitespace (e.g. `<a href=" http://owncloud.org/sync-clients/" target="_blank">`) Additionally I switched the link to HTTPS.	2014-04-06 22:04:14 +02:00
Lukas Reschke	1b55c312e5	Removed two unused functions ... These two functions were actually not usable and only a todo since ages. I think it's better to remove it than having dead and unmaintained code.	2014-04-04 22:27:05 +02:00
icewind1991	4028301dea	Merge pull request #8055 from owncloud/getfileinfo-exists ... dont scan not existing files in View->getFileInfo	2014-04-04 18:07:29 +02:00
Vincent Petry	0597c5226a	Merge pull request #8039 from owncloud/chunking-removeexpireinhaskey ... Do not expire chunks while checking for their existence	2014-04-04 17:18:54 +02:00
Thomas Müller	ccf1287fbf	adding unit test for cache mechanism	2014-04-04 16:21:50 +02:00
Robin Appelman	b61ec7352b	dont scan not existing files in View->getFileInfo	2014-04-04 15:10:07 +02:00
Robin Appelman	e76c246718	Pass the correct root to the preview on post_write	2014-04-04 15:02:08 +02:00
Thomas Müller	f029312e5b	fixing typos/spellings	2014-04-04 11:37:47 +02:00
Vincent Petry	8a10c44eb3	Merge pull request #8015 from owncloud/storageinfo-reuse ... Allow reusing FileInfo for getStorageInfo	2014-04-04 10:18:02 +02:00
josh4trunks	9b4643f386	Send URI instead of filepath to NGINX for X-Accel	2014-04-03 20:46:54 -07:00
Vincent Petry	ab56f69416	Do not expire chunks while checking for their existence ... The expiration should be done by the gc() function on login, not while isComplete() is calling hasKey() for every chunk.	2014-04-03 21:12:35 +02:00
Thomas Müller	20f26068e7	Merge pull request #7476 from owncloud/type-hinting ... Type hinting	2014-04-03 20:02:27 +02:00
Robin Appelman	db95f49b7e	Load all routes when matching an ocs route	2014-04-03 13:01:20 +02:00
Jörn Friedrich Dreyer	c7324f7e44	fix float comparison for negative results	2014-04-03 12:00:53 +02:00
Fabian Henze	7cdb16979a	Fix setting the max-upload-size for really large values. ... php can only parse filesize units up to gigabytes, not terabytes or petabytes.	2014-04-03 01:17:28 +02:00
Jörn Friedrich Dreyer	b9a8bd7e1f	extract more methods	2014-04-02 18:32:32 +02:00
Jörn Friedrich Dreyer	436a78db44	extract method isCachedBigger	2014-04-02 18:00:21 +02:00
tomneedham	6b017201b8	Only accept success as 100 like the OCS spec does	2014-04-02 15:50:51 +00:00
Jörn Friedrich Dreyer	bca6cc6f74	remove unnecessary code	2014-04-02 17:34:48 +02:00
Jörn Friedrich Dreyer	b8248f4a0a	compare floats with epsilon	2014-04-02 17:32:27 +02:00
Robin Appelman	da5541ac02	Allow reusing FileInfo for getStorageInfo	2014-04-02 17:10:57 +02:00
Robin Appelman	850a0e7388	Verify that a file exists before we share it	2014-04-02 13:47:11 +02:00
Morris Jobke	7bdc085022	Merge pull request #8006 from wakeup/master ... Fix admin-dir_permissions redirection when cannot write warning is shown.	2014-04-02 13:21:53 +02:00
Vincent Petry	c0746f6b49	Merge pull request #7968 from owncloud/core-overwritewebrootwithroot ... Allow using "/" in "overwritewebroot"	2014-04-02 12:56:36 +02:00
Volkan Gezer	b6ad7c3cdd	Fix admin-dir_permissions redirection when cannot write warning ... is shown.	2014-04-02 12:41:46 +02:00
Vincent Petry	4cc70ec39d	Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop ... Correctly read the full stream in file_get_contents	2014-04-02 10:55:50 +02:00
Thomas Müller	7086c386fd	Merge branch 'master' into append-error-document ... Conflicts: lib/private/setup.php lib/private/updater.php	2014-04-02 08:48:37 +02:00
Robin Appelman	1c7a71ca77	use binary safe read	2014-04-02 04:38:54 +02:00
Robin Appelman	54a15a8001	Use streams when generating hashes of remote files	2014-04-02 04:38:54 +02:00
Thomas Müller	82d1ea240e	Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available ... idn_to_ascii is only used if available	2014-04-01 22:51:23 +02:00
Vincent Petry	d811026ec9	Merge pull request #7935 from owncloud/getpath-shared ... Make getPath work for shared files	2014-04-01 21:59:09 +02:00
Vincent Petry	6e6a131b32	Merge pull request #7696 from owncloud/chunk-remainingspacefix ... Fixed chunking and insufficient storage check	2014-04-01 16:09:19 +02:00
Robin Appelman	9c8596e95b	Keep cached urls with different hostnames or baseurls seperate	2014-04-01 15:43:27 +02:00
Morris Jobke	a94ac41512	Merge pull request #7966 from owncloud/url_generation_hack ... Check if web root has already been appended	2014-04-01 10:59:53 +02:00
Vincent Petry	0067a4eac2	Added missing fclose in file_get_contents and file_put_contents	2014-04-01 10:08:16 +02:00
Vincent Petry	d6ce45fe61	Correctly read the full stream in file_get_contents ... When using user-defined stream wrappers, PHP will return a maximum of 8192 bytes even if more was requested. This fix uses stream_get_contents to make sure the full stream is read and not only the first 8 KB. Added unit test with a bigger test file to cover this case.	2014-04-01 10:07:16 +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
Andreas Fischer	f9853b253c	Deduplicate connection handling code into \OC\DB\ConnectionFactory	2014-03-31 20:09:07 +02:00
Vincent Petry	cf361b6b4a	Allow using "/" in "overwritewebroot" ... Whenever the reverse proxy is using "/" as the webroot, it is now possible to set that value in "overwritewebroot"	2014-03-31 15:36:48 +02:00
Bjoern Schiessle	3a731a01b1	select statement always need to contain file_source respectively item_source	2014-03-31 15:03:35 +02:00
Robin Appelman	0c2585f3ac	Improve phpdoc	2014-03-31 14:29:55 +02:00
Thomas Tanghus	6292aa57af	Check if web root has already been appended	2014-03-31 14:24:38 +02:00
Vincent Petry	65e3f63400	Merge pull request #7939 from owncloud/wring_redirect_on_login ... Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936	2014-03-31 10:50:05 +02:00
Thomas Tanghus	7278f2f567	Sub-dir was prepended twice	2014-03-29 20:40:49 +01:00
Thomas Tanghus	3a7829f784	Sub-dir was prepended twice	2014-03-29 20:39:55 +01:00
Morris Jobke	73c81ae709	Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master ... adding @method annotation to declare methods which can be called on the ...	2014-03-28 21:20:09 +01:00
Thomas Tanghus	c14107550d	Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936	2014-03-28 18:05:48 +01:00
Robin Appelman	f331d5f9d4	Give storages the option to implement the getById behaviour for View->getPath	2014-03-28 15:15:56 +01:00
Morris Jobke	e4069e1553	Emit event after setting a new expiration for a share ... all credits to @frisco82 https://github.com/owncloud/core/pull/5335	2014-03-28 15:00:13 +01:00
Thomas Müller	70db348475	Merge pull request #7824 from owncloud/hash-parameter-order ... Fix parameter order for Storage\Local::hash	2014-03-28 13:06:07 +01:00
Thomas Müller	f1b085df01	adding @method annotation to declare methods which can be called on the wrapped statement object	2014-03-28 12:57:27 +01: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
Vincent Petry	5068c57845	Merge pull request #7613 from owncloud/fix_urlGenerator2 ... Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()	2014-03-28 12:12:49 +01:00
Thomas Müller	2d592ddc8f	Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled. ... Squashed commit of the following: commit eaf4f43f687db59137a0b00bc0e12ed4eb0d0943 Merge: 1e9c5be 1e7d7bd Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Mar 28 11:49:04 2014 +0100 Merge branch 'master' of https://github.com/kev300/core into kev300-master commit 1e7d7bdd8b5c7f301501cb822cdf2ef0ad3f2872 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:11:42 2013 +0100 Update util.php commit 3f0723f054a27a506be7f26932ccb54fff6f2be9 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:09:15 2013 +0100 Update util.php commit 512176abdcfbe5b2b060b91033abc9608912d1f8 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:02:04 2013 +0100 Update util.php commit 6cbefd080188d287024e0b047b88dd4525d6c2c1 Author: kev300 <admin@gadeco.de> Date: Mon Dec 16 16:44:46 2013 +0100 Update util.php Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.	2014-03-28 12:09:29 +01:00
Vincent Petry	040f430f0c	Merge pull request #7829 from owncloud/cachefolderlocation ... Cache folder is now configurable	2014-03-28 12:08:38 +01:00
Thomas Müller	5fa8f7cf12	Merge pull request #7107 from owncloud/load-apps-proper-master ... Load apps proper master	2014-03-28 10:33:55 +01:00
Vincent Petry	c9ccacb9ea	Merge pull request #7902 from owncloud/ext-xsendfileextstoragefix ... Use the correct resolve method to resolve file storage (x-sendfile)	2014-03-27 09:31:17 +01:00
Vincent Petry	b48510c978	Use the correct resolve method to resolve file storage ... When detecting whether the file to be downloaded is on external storage, the correct path needs to be used. It turns out that \OC\Files\View is needed to resolve the path correctly relative to the user's home.	2014-03-26 18:14:35 +01:00
Thomas Müller	10e62bfd68	Merge pull request #7893 from owncloud/no-routed-link-for-css-files ... css files are not to be routed through index.php anymore	2014-03-26 16:48:54 +01:00
Thomas Müller	93b984ecf8	css files are not to be routed through index.php anymore	2014-03-26 15:36:55 +01:00
Robin Appelman	371a924c92	merge master into webdav-injection	2014-03-26 14:26:07 +01:00
Robin Appelman	9b2bb7c6ab	fix undefined index warning in router	2014-03-26 13:02:11 +01:00
Thomas Müller	83b4bcfdbf	idn_to_ascii is only used if available	2014-03-26 11:17:23 +01:00
Vincent Petry	e76be308eb	Remove unused setUserVars utility method ... That method was moved to the external storage recently so isn't needed here any more.	2014-03-26 09:39:09 +01:00
Thomas Müller	743ca4581d	Merge pull request #7748 from owncloud/postgresversionwarning ... Added PostgreSQL version warning on upgrade	2014-03-25 23:17:18 +01:00
Thomas Müller	6bfeb342db	fixing code style	2014-03-25 23:17:00 +01:00
Thomas Müller	1816f43722	Merge pull request #7864 from owncloud/routing-performance ... Routing performance	2014-03-25 23:00:36 +01:00
Thomas Müller	ed97d872af	Merge pull request #7325 from owncloud/recursive-mkdir-local ... Recursive mkdir fixes #7047	2014-03-25 22:45:14 +01:00
Thomas Müller	1ae10b9da3	Merge pull request #7420 from owncloud/cachehooks-first ... Manually triger the filecache update hooks before any other hook	2014-03-25 22:41:09 +01:00
Thomas Müller	bbc2e37259	Merge pull request #7477 from owncloud/foldersize-reuse ... Allow re-using already known fileinfo when calculating folder sizes	2014-03-25 22:33:24 +01:00
Bjoern Schiessle	31681a3a27	finally fix the paths for the OCS Share API	2014-03-25 17:52:45 +01:00
Bjoern Schiessle	3653a51af2	fix path creation for re-shares, issue #7662	2014-03-25 17:48:50 +01:00
Bjoern Schiessle	2d8607fae9	don't assign variables in if condition	2014-03-25 17:47:24 +01:00
Bjoern Schiessle	5db3b049fd	add todo	2014-03-25 17:47:24 +01:00
Bjoern Schiessle	bc0292c16d	always return an array	2014-03-25 17:47:24 +01:00
Bjoern Schiessle	154277ab11	seperate formatResults()	2014-03-25 17:47:24 +01:00
Bjoern Schiessle	ecde48fce8	don't assign variables in if conditions	2014-03-25 17:47:24 +01:00
Bjoern Schiessle	078fafdc5a	use variable	2014-03-25 17:47:24 +01:00
Bjoern Schiessle	3a459db358	seperate transformDBResults	2014-03-25 17:47:24 +01:00
Bjoern Schiessle	6607f7cb5e	seperate creation of select statement	2014-03-25 17:47:24 +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	d75c3d5f9a	Fix routes getting lost when loading app routes twice	2014-03-25 14:28:30 +01:00
Robin Appelman	e1d3d0e948	fix incorect array	2014-03-25 14:04:18 +01:00
Robin Appelman	c17f415356	Only load core routes for ocs and settings	2014-03-25 13:42:47 +01:00
Robin Appelman	9e89ad07c6	Only load core routes when matching a core route	2014-03-24 16:38:01 +01:00
Robin Appelman	0e1cb001b6	Cache generated urls for routes	2014-03-24 15:42:21 +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
Thomas Müller	fb7f3008d3	idn have to be converted before being used	2014-03-24 13:46:31 +01:00
Vincent Petry	10c9b8eb99	Cache folder is now configurable ... When using an external cache folder, it is automatically mounted in FileSystem::initFileSystem so that any app can use it transparently by creating a view on the "/$user/cache" directory.	2014-03-24 12:57:11 +01:00
Vincent Petry	a25b86a30e	Log exception when PostgreSQL version check failed	2014-03-24 11:54:44 +01:00
adrien	0da61a26ee	remove cache all user	2014-03-21 15:50:25 +01:00
Morris Jobke	43313d120d	Merge pull request #7820 from owncloud/core-macwarning ... Added warning for Mac OS on setup page	2014-03-21 15:06:11 +01:00
Thomas Müller	6ff96b34ad	Merge branch 'master' into load-apps-proper-master ... Conflicts: apps/files/ajax/rawlist.php cron.php ocs/v1.php	2014-03-21 14:05:08 +01:00
Robin Appelman	7a8f1389fe	fix temporary file based common hash	2014-03-21 13:23:14 +01:00
Vincent Petry	a52bc333a2	Merge pull request #7611 from owncloud/fix-updater ... Use $installedVersion instead of $currentVersion	2014-03-21 12:16:51 +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
Robin Appelman	fffe330bbc	Fix parameter order for Storage\Local::hash	2014-03-20 15:32:12 +01:00
Vincent Petry	316a22b463	Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknown ... Still return quota value when free space is unknown	2014-03-20 15:29:14 +01:00
Vincent Petry	6de9033d86	Added warning for Mac OS on setup page	2014-03-20 12:57:55 +01:00
Vincent Petry	36c0f08ec0	Merge pull request #7732 from owncloud/datafolderexistence ... Added .ocdata file to check for data folder validity	2014-03-20 11:31:28 +01:00
Thomas Müller	8a81df0f2c	Merge pull request #7651 from owncloud/close-session-faster-master ... Close session faster	2014-03-20 11:07:21 +01:00
Vincent Petry	66bc0f0848	Still return quota value when free space is unknown ... Fixed the quota storage wrapper to correctly return the quota value when the free space is not known (which usually happens when the disk_free_space function is disabled)	2014-03-19 19:07:11 +01:00
Lukas Reschke	9abe6b7f87	Add mimetype for MKV videos ... This will make oC create previews for MKVs. Test file: http://www.auby.no/files/video_tests/h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.mkv To test this just apply this change and upload the test file, if an preview is generated this change is most likely working as expecting.	2014-03-19 17:45:20 +01:00
Vincent Petry	4cb53f77b2	Moved external storage mounting code to files_external app ... Moved the mounting code for external storage from OC\Filesystem::initMountPoint to files_external using the post_initMountPoints hook	2014-03-19 12:45:38 +01:00
Thomas Müller	c216c4777b	Merge branch 'master' into close-session-faster-master ... Conflicts: apps/files/ajax/upgrade.php	2014-03-19 11:44:21 +01:00
Thomas Müller	6b9ae27b90	drop file cache migration OC5 -> OC6	2014-03-18 17:14:38 +01:00
Thomas Müller	effea790c7	redefine reopen() in class \OC\Session\Internal to avoid accidental calls in productive code	2014-03-18 11:44: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	6bbbf8536f	introduce reopen() method to be used for unit test execution only - right after a unit test has been executed the session will be reopened	2014-03-17 21:57:10 +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
Vincent Petry	3cd09f2b09	Added PostgreSQL version warning on upgrade	2014-03-17 18:58:00 +01:00
icewind1991	6fbf3dd7c4	Merge pull request #7764 from owncloud/datadir-chmod ... use a non-recursive chmod on the datadir	2014-03-17 15:52:44 +01:00
icewind1991	5c72b526a3	Merge pull request #7760 from owncloud/core-roundbytes ... Correctly round bytes when converted from human readable format	2014-03-17 15:21:57 +01:00
Lukas Reschke	239069c838	Use $installedVersion instead of $currentVersion	2014-03-17 13:27:42 +01:00
icewind1991	4112d63a40	Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning ... Added warning for trusted_domains after CLI upgrade	2014-03-17 13:21:54 +01:00
Vincent Petry	4033eba374	Fixed chunking and insufficient storage check ... - fixed free space detection based on the already uploaded chunks - now deleting chunks as soon as it is read out before writing it into the part file, which reduces the space needed when assembling part files	2014-03-17 13:04:34 +01:00
Vincent Petry	bd98538a36	Merge pull request #7704 from owncloud/preview_use_pre_instead_of_post_delete_hook_2 ... use preDelete instead of postDelete hook	2014-03-17 12:59:35 +01:00
Robin Appelman	166dfbf58b	use a non-recursive chmod on the datadir	2014-03-17 12:53:55 +01:00
Vincent Petry	145db370d1	Correctly round bytes when converted from human readable format ... Instead of leave two decimal places which is confusing, round the byte values correctly to the closest byte.	2014-03-17 12:15:12 +01:00
Thomas Müller	cd038604d3	unit tests for specific image type output added	2014-03-17 08:40:59 +01:00
Thomas Müller	79ba930ef9	fixing PHPDoc	2014-03-17 08:17:56 +01:00
Vincent Petry	b619ff6076	Return 503 when a config/data dir error exists	2014-03-14 21:05:15 +01:00
Georg Ehrke	3527adbbe1	OC_Image::_output() - throw exception instead of falling back to png	2014-03-14 18:19:16 +01:00
Georg Ehrke	9dee3772eb	remove image/pjpeg from OC_Image::_output	2014-03-14 18:12:33 +01:00
Vincent Petry	3c46dcd7dd	Added .ocdata file to check for data folder validity ... In environments where the data folder is mount from another partition, it is important to check that the data folder we see is actually the real one. If the mount failed for some reasons, this fix will make ownCloud temporarily unavailable instead of causing unpredictable behavior.	2014-03-14 15:36:35 +01:00
Georg Ehrke	c140010e81	don't change mimetype of whole image object	2014-03-14 11:17:20 +01:00
Vincent Petry	1a116828cf	Added warning for trusted_domains after CLI upgrade ... If trusted_domains is not set after a CLI upgrade, show a warning in the output.	2014-03-14 11:16:45 +01:00
Georg Ehrke	0c3c75efd5	always output a png	2014-03-14 11:14:09 +01:00
Georg Ehrke	6f96ab3e90	make it possible to influence output type of \OC_Image	2014-03-14 11:13:45 +01:00
Robin Appelman	eabeedb306	Merge branch 'master' into cachehooks-first	2014-03-13 15:22:00 +01:00
Georg Ehrke	f438337493	improve validation of getFileInfo in \OC\Preview	2014-03-13 12:32:13 +01:00
Georg Ehrke	8048868bd7	use preDelete instead of postDelete hook	2014-03-13 03:14:42 +01:00
Vincent Petry	b2ac8755ce	Merge pull request #6632 from eduardosan/master ... Fix PostgreSQL port configuration on install	2014-03-12 18:52:47 +01:00
Vincent Petry	ce790119ae	Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptions ... set content-type on ocs exceptions	2014-03-12 10:19:40 +01:00
Thomas Müller	88f6dd7db1	fixing method names	2014-03-12 10:00:22 +01:00
Thomas Müller	743addd1e3	set content-type on ocs exceptions	2014-03-12 00:35:19 +01:00
Thomas Müller	7c78368e8b	sanitize fallbackId	2014-03-12 00:18:51 +01:00
adrien	ea6f8ba352	fix remove cache when delete	2014-03-11 16:58:10 +01:00
Robin Appelman	d55c7223a9	Merge branch 'master' into foldersize-reuse ... Conflicts: lib/private/files/cache/homecache.php	2014-03-11 13:04:20 +01:00
Vincent Petry	c1cb9ee9b0	Merge pull request #7650 from owncloud/quota-totalspace ... Fixed total space display when data size exceeds quota	2014-03-11 12:40:59 +01:00
adrien	f827761e71	remove static variable, add limit and offset	2014-03-11 11:56:46 +01:00
Thomas Müller	0de43f1fbe	remove magic handling of recipient lists by exploding the string - this functionality is nowhere used this way and nowhere documented - and broken because only $toaddress will be exploded not $toname	2014-03-10 21:56:37 +01:00
Thomas Müller	f1ecc758f5	send an individual email to each recipient	2014-03-10 21:54:23 +01:00
Vincent Petry	1cde17d60b	Merge pull request #7602 from owncloud/flush-updater-cache ... Reset time of last update feed polling after successful update	2014-03-10 19:54:00 +01:00
Vincent Petry	010eef95c0	Fixed total space display when data size exceeds quota ... The total space display in the personal page now shows the quota value instead of used space when used space exceeds the quota (soft quota).	2014-03-10 17:59:14 +01:00
Vincent Petry	f4f61f03c9	Disable XML entities when parsing XML	2014-03-10 17:51:13 +01:00
adrien	415b1d03bc	fix cache when remove an user	2014-03-10 17:27:51 +01:00
Thomas Müller	9fe5033f1e	PHPDoc updated	2014-03-10 17:15:19 +01:00
Thomas Müller	41f814515e	Merge branch 'master' into close-session-faster-master	2014-03-10 17:00:09 +01:00
Vincent Petry	4fdf7682c9	Merge pull request #7398 from owncloud/trash_dont_rely_on_db ... [trash] fall back if file is not in db	2014-03-10 16:04:47 +01:00
Thomas Müller	a074adb2af	fix close() implementation in \OC\Session\Internal	2014-03-10 15:36:20 +01:00
Bjoern Schiessle	4562909a20	get trash size from file cache	2014-03-10 15:13:28 +01:00
Thomas Müller	3c5185edab	Merge pull request #7632 from owncloud/fix-7582-master ... we first shall check if the current session is valid - otherwise the ses...	2014-03-10 15:10:19 +01:00
Thomas Müller	f0603a971d	close the session for all DAV calls right after authentication - no need to write to the session afterwards	2014-03-10 14:40:36 +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	26793e1f94	switch OC::getRouter usages to OC::$server->getRouter	2014-03-10 14:06:47 +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
Vincent Petry	26513bc17b	Merge pull request #7624 from owncloud/enc-encryptedusedspacefix ... [master] Fixed used space to be based on unencrypted size	2014-03-10 09:38:24 +01:00
Thomas Tanghus	212699e389	Merge pull request #7628 from owncloud/fileinfo-type ... Fix FileInfo->getType errors	2014-03-09 23:34:01 +01:00
nishiki	ba9d8f7c1a	fix undifined uid	2014-03-09 12:47:19 +01:00
nishiki	75011c2e09	add query result (boolean) for update or delete	2014-03-09 12:22:47 +01:00
nishiki	d8843f6cd3	minor clean code	2014-03-09 12:01:35 +01:00
Thomas Müller	25f523680a	fixing ident	2014-03-07 20:06:06 +01:00
Thomas Müller	0d90b90d94	we first shall check if the current session is valid - otherwise the session-id will be regenerated on login via basic auth	2014-03-07 20:00:34 +01:00
Robin Appelman	51165a1a04	Check if value exists before returning	2014-03-07 15:16:35 +01:00
Vincent Petry	48d63a6278	Return unencrypted_size of folder when queried ... This fixes the "used space" to be based on the unencrypted size, not encrypted size, to be consistent with how quota/space is handled when encryption is enabled	2014-03-07 14:59:09 +01:00
Robin Appelman	65f52fee4f	Fix FileInfo->getType errors	2014-03-07 14:52:44 +01:00
Robin Appelman	db6fb198fe	don't throw errors in getType	2014-03-07 14:27:23 +01:00
icewind1991	3eb58d9973	Merge pull request #7529 from owncloud/getlocalfile-cache ... Add caching for getLocalFile on remote storages	2014-03-07 13:29:47 +01:00
Vincent Petry	7f24d42ca5	Propagate unencrypted_size up to the file cache root	2014-03-07 11:00:22 +01:00
Vincent Petry	ba3f5fe53a	Merge pull request #7583 from owncloud/trusteddomainerrorpage ... [master] Show warning page when accessing server from an untrusted domain	2014-03-07 10:37:16 +01:00
adrien	fbde24c89a	fix undefined in loadUsers	2014-03-07 08:46:34 +01:00
Thomas Tanghus	ceb5b918d7	Add \OC:: to URLGenerator::getAbsoluteURL()	2014-03-06 23:56:11 +01:00
adrien	5cdfc56867	update the cache when add user	2014-03-06 22:34:43 +01:00
adrien	dde4f2f917	upgrade the cache user	2014-03-06 22:23:17 +01:00
adrien	08a46e3080	add cache for single users	2014-03-06 17:57:09 +01:00
Vincent Petry	536c33895f	Merge pull request #7592 from owncloud/fixstoragefreespace ... Fixed upload issue when free space is not known (ex: FTP)	2014-03-06 17:22:40 +01:00
Vincent Petry	1b8cf18c91	Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fix ... Fix imagerotate and move loadFromBase64() one up	2014-03-06 17:18:17 +01:00
Victor Dubiniuk	242cbb802a	Reset time of last update feed polling	2014-03-06 18:19:58 +03:00
Vincent Petry	6e4ea09d52	Merge pull request #7494 from owncloud/fix-7307 ... Replace OC.Router.generate() with OC.generateUrl()	2014-03-06 14:49:12 +01:00
Robin Appelman	895fc0fa26	Fix check if fileinfo is valid	2014-03-06 14:23:27 +01:00
Vincent Petry	0dcac65aa1	Fixed upload issue when free space is not known	2014-03-06 13:53:55 +01:00
Robin Appelman	84cf40ed82	merge master into webdav-injection	2014-03-06 13:35:06 +01:00
Georg Ehrke	eb5265b106	fix merge conflicts	2014-03-06 11:55:45 +01:00
Vincent Petry	9136e6ad30	Fixed X-Forwarded-Host parsing	2014-03-06 11:51:25 +01:00
Vincent Petry	f8fe2753b1	Added localhost as trusted domain	2014-03-06 11:51:10 +01:00
Vincent Petry	421cff00bd	Show warning page when accessing server from an untrusted domain ... Added early check for the requested domain host and show a warning page if the domain is not trusted.	2014-03-06 11:51:08 +01:00
Thomas Müller	32b29c9d73	Merge branch 'master' into fix-7307 ... Conflicts: core/js/router.js settings/js/admin.js	2014-03-06 00:15:08 +01:00
Lukas Reschke	e3156fa5ad	Merge pull request #7354 from pschmitt/master ... Use 'command -v' to detect whether and where software is installed (instead of 'which')	2014-03-05 19:25:09 +01:00
Björn Schießle	9111af0478	Merge pull request #7531 from owncloud/dont_create_shared_folder ... don't allow to create a file or folder named 'Shared' in the root folder	2014-03-05 18:13:31 +01:00
Georg Ehrke	dbf83aada2	fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case	2014-03-05 15:57:45 +01:00
Georg Ehrke	32a5d51fa6	add fclose, fixes issue from bdb96b9af8	2014-03-05 15:37:26 +01:00
Georg Ehrke	bdb96b9af8	fix issue with spamming logging files when loading cached thumbnail	2014-03-05 13:20:50 +01:00
Bjoern Schiessle	2e73c957e5	don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters	2014-03-05 13:16:25 +01:00
Thomas Müller	7edd8df07f	Merge pull request #7521 from owncloud/docstrings_2_kondou ... Fix some more docstrings	2014-03-05 00:40:49 +01:00
Thomas Tanghus	b54b0b2153	Yet another cleanup	2014-03-05 00:26:06 +01:00
Tom Needham	9986b470ee	Merge pull request #7251 from owncloud/fix-ocsapi-getuser ... Add displayname for admins on external api	2014-03-04 15:37:45 +00:00
Vincent Petry	620dd4afbd	Merge pull request #7481 from tripflex/fix_downloadlink_spaces ... replace spaces in download link without encoding entire URL	2014-03-04 16:33:41 +01:00
Robin Appelman	a8c67dc675	Add caching for getLocalFile on remote storages	2014-03-04 15:44:58 +01:00
Robin Appelman	5ef37c28d1	Remove the need for a custom SabreDav server constructor	2014-03-04 13:28:48 +01:00
Vincent Petry	ad195a881e	Merge pull request #7453 from owncloud/preview-fileinfo ... Cache the fileinfo in OC\Preview	2014-03-03 18:52:25 +01:00
kondou	5e3b6f1fd9	Fix some more docstrings	2014-03-03 17:32:29 +01:00
Frank Karlitschek	7983c90fdc	Merge pull request #7500 from owncloud/theme-mailtemplate ... Enable theming of the mail template header	2014-03-03 17:22:33 +01:00
Robin Appelman	06c6163265	Check if fields we need are actually set to prevent errors	2014-03-03 16:48:28 +01:00
Vincent Petry	79ae3c4527	Allow XML entity loader for MDB2 schema loader ... Forward port of 762b0d9 from stable6 to master	2014-03-03 14:17:51 +01:00
Robin Appelman	fe994669cd	Make path for dummy fileinfo absolute	2014-03-03 13:57:08 +01:00
Robin Appelman	9231195c98	Fix FileInfo->getType	2014-03-03 13:51:49 +01:00
Robin Appelman	c87658feda	Fix updater when getFileInfo fails	2014-03-03 12:56:08 +01:00
Jan-Christoph Borchardt	b8d0fc9494	make mail notification header color themable	2014-03-03 12:43:22 +01:00
Thomas Müller	1291303c5a	Replace OC.Router.generate() with OC.generateUrl()	2014-03-02 22:30:24 +01:00
kondou	5d5306175f	Fix some docstrings in l10n.php	2014-03-01 03:38:35 +01:00
Bart Visscher	8951328a87	More PHPDoc updates	2014-02-28 21:03:43 +01:00
Myles McNamara	195bdff91f	move replace to inside isset	2014-02-28 11:19:19 -05:00
Myles McNamara	4ab7f58745	replace spaces in download link without encoding entire URL	2014-02-28 11:15:49 -05:00
Thomas Müller	dd32091016	Merge pull request #7444 from owncloud/fix/7443 ... remove unused code and fix wrong variable names - some PHPDoc updated	2014-02-28 14:48:21 +01:00
Robin Appelman	da386aad59	Allow re-using already known fileinfo when calculating folder sizes	2014-02-28 14:23:07 +01:00
Robin Appelman	3ff12ef4ec	Also send explicit cache hooks when calling file_put_contents with a resource	2014-02-28 14:21:33 +01:00
Morris Jobke	d3866754a4	Merge pull request #7471 from owncloud/fix-css-loading ... CSS is now loaded directly instead via PHP	2014-02-28 14:19:36 +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
Lukas Reschke	d1c04e1136	Typo + use regular assignment	2014-02-28 13:32:09 +01:00
icewind1991	8a93a2e7d5	Merge pull request #7455 from owncloud/rawlist-fileinfo ... Update rawlist to work with new fileinfo object	2014-02-28 12:36:56 +01:00
Lukas Reschke	357fdb1a4d	Remove .htaccess creation code ... 1. We're maintaining the same code twice which leads inevitably to problems as this one. The createHtaccess routine is only used to use the correct paths to the 404 and 403 document. 2. Updating the ownCloud instance as described in our documentation (`Delete everything from your ownCloud installation directory, except data and config.`) will break the links to the ErrorDocuments anyways and show the default error handlers if ownCloud is not installed in the root directory.	2014-02-28 11:59:30 +01:00
Lukas Reschke	4c4bb70cb6	CSS is now loaded directly instead via PHP ... 269f24cf96 was not changed in setup.php which prevented loading of CSS files in some environments (e.g. my local setup) for apps.	2014-02-28 11:14:18 +01:00
Bart Visscher	cb37a2716a	Also clear cached UserGroup when a user is added/removed	2014-02-27 20:09:07 +01:00
Bart Visscher	00e27d5343	Clear the cached user groups when a group is deleted	2014-02-27 19:12:03 +01:00
Morris Jobke	49b331be39	add BMP mimetype for BMP previews	2014-02-27 14:39:16 +01:00
Robin Appelman	7c92e2e3ad	Update rawlist to work with new fileinfo object	2014-02-27 14:04:19 +01:00
Robin Appelman	8282cfff04	Cache the fileinfo in OC\Preview	2014-02-27 13:15:18 +01:00
Vincent Petry	22adc397de	Also quote old column name during DB migration ... This fixes alter table commands that didn't quote the old column name	2014-02-27 09:09:16 +01:00
Thomas Müller	ab850b961d	remove unused code and fix wrong variable names - some PHPDoc updated	2014-02-26 23:56:46 +01:00
Robin Appelman	bc49c6be04	Manually triger the filecache update hooks before any other hook	2014-02-26 14:29:13 +01:00
icewind1991	59df3ffdf4	Merge pull request #7279 from owncloud/folderid-reuse ... Reuse the folder id in View->getFolderContents	2014-02-26 12:18:34 +01:00
Jan-Christoph Borchardt	8759c35e74	Merge pull request #7399 from owncloud/themable-doc-links ... introduce new theme function to allow full creation of documentation lin...	2014-02-26 12:04:52 +01:00
Vincent Petry	5c98e0c7c7	Merge pull request #7328 from owncloud/McNetic-zipstreamer ... McNetic zipstreamer	2014-02-26 10:19:12 +01:00
Thomas Müller	574883c47a	introduce new theme function to allow full creation of documentation links: buildDocLinkToKey()	2014-02-25 23:06:23 +01:00
Robin Appelman	3a21755963	Pass the filesystem view as argument in the sabredav connectors and use the fileinfo object	2014-02-25 16:23:09 +01:00
Vincent Petry	7f7d674c2a	Merge pull request #7335 from owncloud/fix-7333 ... Fix code to search for mount.json in custom data folders	2014-02-25 15:27:47 +01:00
Vincent Petry	9b4af31bac	Merge pull request #7371 from owncloud/core-storagemovedeleteall ... Replace deleteAll call with unlink call on rename	2014-02-25 14:52:21 +01:00
Björn Schießle	e10ca7c2e9	Merge pull request #7374 from owncloud/enc_dont_overwrite_keys ... [encryption] don't overwrite keys if rename was done by a stream copy	2014-02-25 12:34:49 +01:00
Vincent Petry	432a42d846	Fix case where port is missing ... Forward port of 6d3b5b24fd to master	2014-02-25 11:40:05 +01:00
Bjoern Schiessle	ebd73aee8f	don't overwrite keys if rename was done by a stream copy	2014-02-24 17:24:43 +01:00
Thomas Müller	0d78d9c180	Merge branch 'master' into McNetic-zipstreamer ... Conflicts: 3rdparty	2014-02-24 12:53:55 +01:00
Vincent Petry	a23ef25010	Removed unused deleteAll method on Common storage class ... The "deleteAll" method on the Common storage class isn't used anywhere. Also, it isn't defined on the Storage interface so this fix removes it completely.	2014-02-24 12:21:48 +01:00
Vincent Petry	c465835e85	Replace deleteAll call with unlink call ... The method deleteAll() doesn't officially exist on the Storage class as it's not defined on the interface, which means it fails on the Quota storage wrapper and might fail on some external storage classes. Also, this here is the only use case for that one method.	2014-02-24 12:20:11 +01:00
Lukas Reschke	c9ab11a9bd	Merge pull request #7259 from owncloud/overwritehost-always ... Add overwritehost config on setup and upgrade	2014-02-22 07:35:56 +01:00
Bart Visscher	f4f72e77d8	Delay fetching the display name until it is requested	2014-02-21 23:07:35 +01:00
Bart Visscher	6f4ecd32b3	Add more caching in the group manager	2014-02-21 23:07:35 +01:00
Robin Appelman	f86dffd56c	Merge branch 'master' into recursive-mkdir-local	2014-02-21 15:43:54 +01:00
Robin Appelman	3487a95eab	Remove fileid parameter for getFolderContent	2014-02-21 15:36:24 +01:00
Robin Appelman	dd98e6333f	Split getFolderContentById	2014-02-21 15:35:12 +01:00
Robin Appelman	3980a7d9c6	Merge branch 'master' into folderid-reuse	2014-02-21 15:33:12 +01:00
Lukas Reschke	fe44ac264b	Add overwritehost config on setup and upgrade	2014-02-21 15:19:01 +01:00
Thomas Müller	27ad69eea5	Merge branch 'master' into no-css-js-delivery-via-php	2014-02-21 14:01:24 +01:00
Thomas Müller	a40cedf507	Merge branch 'master' into McNetic-zipstreamer	2014-02-21 13:57:18 +01:00
Philipp Schmitt	43b1d81f77	Use 'command -v' to detect whether and where software is installed (instead of 'which')	2014-02-21 13:45:57 +01:00
Thomas Müller	f19276f7bc	Merge branch 'master' into no-css-js-delivery-via-php ... Conflicts: config/config.sample.php	2014-02-21 09:51:51 +01:00
Lukas Reschke	f7fa8662e2	Remove `session_id_regenerate` from here ... Jenkins somewhat complains that there are already sent headers.	2014-02-21 08:12:45 +01:00
Lukas Reschke	69325c5eeb	Move session_regenerate_id to `login()`	2014-02-21 08:11:07 +01:00
Lukas Reschke	f11658698d	Fix path to the mount file	2014-02-20 18:53:37 +01:00
Thomas Müller	ec45a3c0e2	Merge pull request #6962 from owncloud/quota-space-root ... Allow passing a root folder to get the used space from in the quota wrapper	2014-02-20 16:47:59 +01:00
Thomas Müller	b35cd54e87	Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer ... Conflicts: lib/private/files.php	2014-02-20 16:36:37 +01:00
Robin Appelman	d1c392d9ad	Also make "regular" local storage's mkdir recursive	2014-02-20 15:36:30 +01:00
Joshua Medeiros	76aa4714cf	Recursive mkdir fixes #7047	2014-02-20 15:35:00 +01:00
Lukas Reschke	c869e0116b	Merge pull request #6999 from kofemann/mount-config ... mount: make location of mount.json configurable	2014-02-20 15:15:00 +01:00
Björn Schießle	4eadc36094	Merge pull request #6935 from owncloud/fix_urlGenerator ... Add missing slash in URLGenerator::getAbsoluteURL().	2014-02-20 14:57:03 +01:00
Lukas Reschke	e4c3ef2ca6	Merge pull request #7289 from owncloud/fix-filetype-icons ... Fix filetype icons	2014-02-20 14:53:41 +01:00
Lukas Reschke	0241ddc759	Merge pull request #6519 from nhirokinet/master ... Security Update: session fixation	2014-02-20 14:28:26 +01:00
Thomas Müller	fbea02bebb	kill $coreStyles and $coreScripts	2014-02-20 14:18:01 +01:00
Thomas Müller	a0e790227e	remove unused functions - have been introduced with the old minimizer approach	2014-02-20 14:11:31 +01:00
Thomas Müller	31bab55847	Merge branch 'master' into no-css-js-delivery-via-php	2014-02-20 13:52:53 +01:00
icewind1991	742f54b6d5	Merge pull request #7301 from owncloud/fix-fuckup ... fix master - #7274 brokes it	2014-02-20 13:40:12 +01:00
Thomas Müller	8cf73ca42f	integrate assetic for asset pipeline-ing	2014-02-20 13:28:27 +01:00
Thomas Müller	7242d00aa6	enable static delivery of css files	2014-02-20 13:27:46 +01:00
Thomas Müller	ac8e6b15b6	kill references to core.js and core.css	2014-02-20 13:23:24 +01:00
Thomas Müller	bf22ed7bdb	kill old minimizer code	2014-02-20 13:10:56 +01:00
Björn Schießle	16eb43c033	Merge pull request #7247 from owncloud/sharing_cleanup_step1 ... clean up the sharing ajax calls, add mail notification class	2014-02-20 11:56:20 +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
Jan-Christoph Borchardt	3e235b2699	merge master	2014-02-20 10:51:13 +01:00
Jan-Christoph Borchardt	a6fb6abbe0	fix filetype icons for gzip, tex, perl, csv, sh	2014-02-20 10:45:11 +01:00
Morris Jobke	b76a3993d4	fix master - #7274 brokes it	2014-02-20 09:47:59 +01:00
Luke Policinski	b01492fecd	Feature Added : Ability to drag and drop in Chrome	2014-02-19 21:28:32 +00:00
Luke Policinski	79a6d89bcc	Feature Added : Ability to drag and drop in Chrome	2014-02-19 21:23:39 +00:00
Bjoern Schiessle	2fd75d8f1c	clean up the sharing ajax calls, add mail notification class	2014-02-19 19:33:00 +01:00
Jan-Christoph Borchardt	cac4652c10	coding style: spaces around =>	2014-02-19 16:28:29 +01:00
Jan-Christoph Borchardt	937a25593b	fix lots of file type icons for archives, js, flash, ics, fonts, code, ...	2014-02-19 16:27:38 +01:00
Lukas Reschke	2d5b3899a6	Hardening: Remove dangerous characters + Subdirectory Check ... If an user is able to create folders in /core/l10n/ he is able to execute arbitrary code. Therefore I've added an `issubdirectory` check and removed all potential dangerous characters from `$lang`.	2014-02-19 15:38:00 +01:00
Vincent Petry	952584e9c7	Merge pull request #7195 from owncloud/files-selectall ... Do not send file list for select all on Download/delete	2014-02-19 14:33:24 +01:00
Morris Jobke	bcad6e641a	Merge pull request #7274 from owncloud/scrutinizer-patch-1 ... Scrutinizer Auto-Fixes	2014-02-19 11:51:04 +01:00
Morris Jobke	f944707a15	fix wrong removes	2014-02-19 11:50:17 +01:00
icewind1991	2d5ab1a5c4	Merge pull request #7260 from owncloud/watcher-policy ... Allow setting the frequency of which the file watcher checks for updates	2014-02-19 11:17:27 +01:00
Robin Appelman	1331de554c	Reuse the folder id in View->getFolderContents	2014-02-19 10:46:02 +01:00
Vincent Petry	e517e642be	Merge pull request #7257 from owncloud/filelist-fileinfo ... use a FileInfo object of the directory when generting the filelist	2014-02-19 09:40:11 +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	1e321406ee	Merge pull request #7114 from owncloud/scrutinizer_documentation_patches ... polish documentation based on scrutinizer patches	2014-02-19 07:04:37 +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
icewind1991	3cc7228c7c	Merge pull request #7253 from owncloud/preferences-caching ... Add caching to OC\Preferences	2014-02-18 18:17:58 +01:00
Thomas Müller	8991e4505a	Merge pull request #6796 from owncloud/statementwrapper-bindparam ... Add bindParam to the database statement wrapper	2014-02-18 18:13:57 +01:00
Thomas Müller	1e84d6b14b	Merge pull request #7190 from owncloud/appconfig-legacy-apps ... Remove usage of legacy OC_Appconfig	2014-02-18 18:10:22 +01:00
Vincent Petry	bd71a1b7b6	Added file name check in webdav connector ... - added file name check for the put, rename and setNames() methods which throw a "Bad Request" whenever invalid characters are used - replaced \OC\Filesystem usage with $this->getFS() to be able to write unit tests	2014-02-18 17:54:32 +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
Tom Needham	a573fe7d76	Merge pull request #6650 from owncloud/migration_unit_tests ... User migration fix, and basic unit test	2014-02-18 17:35:49 +01:00
Lukas Reschke	3b1083f46e	Merge pull request #7176 from owncloud/style ... Some style fixes	2014-02-18 17:30:26 +01:00
tomneedham	0beaeed713	Remove unused variables	2014-02-18 16:28:04 +00:00
Robin Appelman	2166683e3b	Allow setting the frequency of which the file watcher checks for updates	2014-02-18 16:34:25 +01:00
Robin Appelman	d18b9f6ea4	use a FileInfo object of the directory when generting the filelist	2014-02-18 15:39:35 +01:00
Robin Appelman	ac2e3ab373	remove some unneeded isset's	2014-02-18 14:27:55 +01:00
Robin Appelman	2e97a4cd32	Fix some phpdoc	2014-02-18 14:26:27 +01:00
tomneedham	df38d4ef1a	Return 101 if user doesnt exist	2014-02-18 10:36:18 +00:00
Robin Appelman	b6f44e9a1d	Add caching to OC\Preferences	2014-02-18 11:21:39 +01:00
tomneedham	2f1a24eee7	Add displayname for admins	2014-02-18 09:50:46 +00:00
Thomas Müller	5d3fc03750	Merge pull request #7239 from owncloud/cbr-filetype-icon ... add cbr/cbz file type icon, fix #6953	2014-02-18 10:23:54 +01:00
Jan-Christoph Borchardt	c2adf033f2	use file icon as fallback instead of application icon, fix #7237	2014-02-17 20:58:33 +01:00
Jan-Christoph Borchardt	0f434038a7	add cbr/cbz file type icon, fix #6953	2014-02-17 20:48:32 +01:00
tomneedham	a4b6d66703	Merge branch 'master' into migration_unit_tests	2014-02-17 11:03:57 +00: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
Morris Jobke	df282d9ef8	Merge pull request #7207 from owncloud/fileinfo-serializable ... Remove the JsonSerializable interface from \OC\Files\FileInfo	2014-02-14 22:11:54 +01:00
Thomas Müller	41f0ad2d13	Merge pull request #7204 from owncloud/groupexists-duplicate ... Remove duplicate call to groupExists	2014-02-14 21:53:03 +01:00
Robin Appelman	09502fcb36	remove the JsonSerializable interface from \OC\Files\FileInfo	2014-02-14 19:26:06 +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
Robin Appelman	b35f679483	Fix test cases for group manager	2014-02-14 15:07:08 +01:00
Robin Appelman	0ba0596341	remove duplicate call to groupExists	2014-02-14 14:25:45 +01:00
Georg Ehrke	f62f1658ce	suppress error msg caused by php bug	2014-02-14 11:23:39 +01:00
Vincent Petry	d5397d813c	Do not send file list for select all on Download/delete ... - When all files are selected, do not send the whole file list - Download will trigger download for the parent folder, also works with root - Delete will send "allfiles" to the server that will find the file list or the passed directory by itself	2014-02-13 20:28:52 +01:00
Robin Appelman	181bbd4325	Remove usage of legacy OC_Appconfig	2014-02-13 16:28:49 +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
kondou	fc01a13811	Fix imagerotate and move loadFromBase64() one up. ... imagerotate() with third parameter being -1 does not seem to work in PHP 5.5 loadFromBase64() one up, so debug-logs aren't spammed (as much) with urlencoded base64-data from loadFromFile() debug output.	2014-02-12 22:35:49 +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	d6576c640c	Add unit tests for JobList	2014-02-12 13:52:13 +01:00
Robin Appelman	62288971ca	Additional phpdoc	2014-02-12 13:32:16 +01:00
Robin Appelman	60bd9d512d	Merge branch 'master' into backgroundjob-public	2014-02-12 13:21:47 +01:00
Bart Visscher	1fb5f96c37	Style fixes	2014-02-12 09:09:51 +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	50cc6a85e5	Add explicit sorting	2014-02-11 14:26:40 +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
Arthur Schiwon	af781bdea7	fix DI	2014-02-11 10:50:03 +01:00
Arthur Schiwon	32afdcbefe	Inject logger	2014-02-11 10:49:59 +01:00
Arthur Schiwon	20bfbb0fd9	wrong tld	2014-02-11 10:49:54 +01:00
Arthur Schiwon	82716ced48	sort following entries in alphabetical order	2014-02-11 10:49:41 +01:00
Arthur Schiwon	41e8d44cf7	move sorter into a class	2014-02-11 10:49:34 +01:00
Bart Visscher	082abdc620	Merge branch 'master' into migration_unit_tests	2014-02-10 21:32:17 +01:00
Vincent Petry	bea80ffe20	Merge pull request #6881 from owncloud/remove-user-storage-entry ... Also remove the user's home storage from the storage table when deleting a user	2014-02-10 15:04:05 +01:00
Tom Needham	84607db284	Merge pull request #6988 from owncloud/oc_api_fix_warinigs ... [ocs API] getData() always needs to return an array	2014-02-10 13:43:16 +00:00
Robin Appelman	e6df86f4cb	Merge branch 'master' into quota-space-root	2014-02-10 14:03:06 +01:00
Robin Appelman	753af3a3ff	Merge branch 'master' into storagestatistics-reuse	2014-02-10 14:01:32 +01:00
Robin Appelman	5ffc43cba0	Merge branch 'master' into remove-user-storage-entry	2014-02-10 13:53:01 +01:00
Thomas Müller	45d07906b8	Merge pull request #7131 from owncloud/issue/6269 ... Change MySQL to MariaDB/MySQL in the frontend	2014-02-10 11:09:03 +01:00
Thomas Müller	8c7fb64b8b	Merge pull request #7066 from owncloud/check_svg_installed ... properly check if pdf and svg modules are installed	2014-02-10 10:28:32 +01:00
Thomas Müller	8de9758fee	Merge pull request #7071 from jcfischer/master ... close statement in MimeType detection is executed [#7069]	2014-02-10 10:27:21 +01:00
Andreas Fischer	bbfd97ce03	Merge pull request #6247 from owncloud/memcached-multiple-servers ... Add support for multiple memcached servers. * owncloud/memcached-multiple-servers: Readd support for memcached_server config variable. Add support for multiple memcached servers.	2014-02-08 14:21:19 +01:00
Joas Schilling	b330d07b51	Fix more documentation failes ... Issue #7111	2014-02-08 11:47:55 +01:00
Robin Appelman	8ad3fc89be	Merge branch 'master' into quota-space-root	2014-02-07 23:29:26 +01:00
Thomas Tanghus	2ff0d3a255	Test if $url is already prefixed by '/'	2014-02-07 17:39:19 +01:00
Joas Schilling	dbec143f09	Change MySQL to MySQL/MariaDB in the frontend ... Fix issue #6269	2014-02-07 17:03:43 +01:00
Bjoern Schiessle	dc53c83e7b	getData() always needs to return an array	2014-02-07 16:38:15 +01:00
Robin Appelman	cd3ef0bb9d	Add caching to appconfig	2014-02-07 14:03:39 +01:00
Thomas Müller	f0afbffaef	Merge pull request #6997 from owncloud/fix_l10n_warnings ... change order of issubdirectory() calls to avoid error messages for non-apps	2014-02-07 13:47:33 +01:00
Robin Appelman	b537d90e58	use the 'new' server container for appconfig	2014-02-07 13:45:59 +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
Vincent Petry	be47e156a5	Merge pull request #6952 from MartialGeek/add_freebox_support ... New user agent added for the Freebox.	2014-02-06 18:12:32 +01:00
Vincent Petry	5ab12a8b85	Merge pull request #6445 from owncloud/fix_5956 ... fix issue with logging non utf8 chars	2014-02-06 17:47:13 +01:00
Jörn Friedrich Dreyer	2a6a9a8cef	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
Thomas Müller	79fc4f3126	Within OC:init() the minimum set of apps is loaded - which is filesystem, authentication and logging	2014-02-06 11:34:27 +01:00
Thomas Müller	0db5fead8e	remove some more global variable $RUNTIME_NOAPPS	2014-02-06 10:04:18 +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
Jens-Christian Fischer	11f46e121c	close statement in MimeType detection is executed [#7069] ... close statement was never executed due to it being after a return statement.	2014-02-04 17:03:52 +01:00
Vincent Petry	bd6734291c	Merge pull request #6081 from owncloud/partfilewebdavfix ... Allow getting info or renaming part files through WebDAV	2014-02-04 07:48:37 -08:00
Robin Appelman	f830ad0e47	Don't create new thumbnails on the write hook	2014-02-04 16:28:41 +01:00
Morris Jobke	3c80071807	Merge pull request #4795 from owncloud/setup ... Move core setup code to controller class	2014-02-04 06:04:21 -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
Georg Ehrke	d55ef442cd	properly check if pdf and svg modules are installed	2014-02-04 12:59:14 +01:00
Bjoern Schiessle	36838b2837	add test for password remove method	2014-02-04 11:18:04 +01:00
Björn Schießle	c0aeaf9ec0	Merge pull request #7013 from owncloud/dont_write_passwords_to_log ... wrap stat() call in a try/catch block	2014-02-03 07:58:44 -08:00
Robin Appelman	0ae4022fb4	Also clean up the filecache table when deleting a storage entry	2014-02-03 16:36:21 +01:00
Robin Appelman	8d6a3a00b4	Revert "Use Cache->clear to cleanup the filecache for removed users" ... This reverts commit 5a5b6f187e.	2014-02-03 16:29:04 +01:00
Bjoern Schiessle	cf5277b558	also load error handler if debugging is enabled	2014-02-03 12:08:28 +01:00
Bjoern Schiessle	44b637470c	remove passwords in URLs from all log messages	2014-02-03 12:07:56 +01:00
Bart Visscher	f1c60c7f8b	Remove unused functions from OC_Helper ... init_var and init_radio where only used in the installation template	2014-01-31 17:33:15 +01:00
Bart Visscher	bca725dc32	Merge branch 'master' into setup ... Conflicts: core/setup.php	2014-01-31 16:43:12 +01:00
Robin Appelman	0d9fe770f3	Mark an app as loaded before we start loading it	2014-01-31 15:12:21 +01: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
Tigran Mkrtchyan	8cc9727520	mount: make location of mount.json configurable ... do not share users data with config files Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>	2014-01-29 17:14:23 +01:00
Robin Appelman	4e2b52a376	merge master into fileinfo	2014-01-29 16:33:27 +01:00
Jan-Christoph Borchardt	f5f918b8bf	Merge pull request #6903 from owncloud/fix-ms-office-icons ... Add/fix Microsoft Office file icons.	2014-01-29 07:31:25 -08:00
Bjoern Schiessle	229f13adc0	change order of issubdirectory() calls to avoid error messages for non-apps	2014-01-29 14:40:59 +01:00
Martial Saunois	0f1c587e6b	The regexp of the Freebox user agent is now more strict. ... A new unit test has been added in consequence.	2014-01-29 10:58:34 +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	20c2aaab00	Actually rename the variable	2014-01-27 16:26:54 +01:00
Robin Appelman	c8207312c7	Fix phpdoc	2014-01-27 16:00:10 +01:00
Robin Appelman	3c1ab66eda	Reuse the calculated free_space in buildFileStorageStatistics	2014-01-27 15:56:57 +01:00
Robin Appelman	a521949baf	Allow passing a root folder to get the used space from in the quota wrapper	2014-01-27 15:41:56 +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
Martial Saunois	c2ed8d5aa1	New user agent added for the Freebox. ... The Freebox is the multimedia device of a french Internet provider: Free. This device provides a seedbox which uses the user agent "Mozilla/5.0". In the "Content-Disposition" header, if the "filename" key is used with the "filename*=UTF-8''" value, the seedbox does not take care about the header and saves the file name with the origin URL. This patch brings the support for the Freebox users.	2014-01-26 18:46:09 +01:00
Thomas Tanghus	5f610a1cbc	Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840	2014-01-24 16:40:32 +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
Otto Sabart	2f8ebd03b0	Add check for apc.enabled option ... Sometimes it's not possible to disable APC entirely and some of apc_functions are disabled. Only thing which is possible is to disable apc.enable option.	2014-01-24 15:52:28 +01:00
Vincent Petry	5ad28f4d1f	Allow getting info or renaming part files through WebDAV ... When mounting an ownCloud (backend OC) inside another ownCloud (frontend OC), the frontend OC will use WebDAV to upload file, which will create part files. These part files need to be accessible for the frontend OC to rename them to the actual file name. This fix leaves the file cache untouched but gives direct access to part file info when requested. This means that part file can be accessed only when their path and name are known. These won't appear in file listtings. Fixes #6068	2014-01-23 18:42:56 +01:00
Andreas Fischer	96f194c0f6	Add icons for mdb and accdb files.	2014-01-23 03:06:14 +01:00
Andreas Fischer	47ea7704ca	Fix icons for xml,ppt,dot,dotx files.	2014-01-23 02:46:05 +01:00
Andreas Fischer	689516ebd7	Remove duplicate mimetypes while keeping previous behaviour.	2014-01-23 02:23:20 +01:00
Andreas Fischer	6241655df4	Bring mimetype list into alphabetical order.	2014-01-23 02:15:42 +01:00
Robin Appelman	02aa44d055	Merge branch 'master' into memcache-public	2014-01-22 13:19:49 +01:00
Robin Appelman	5a5b6f187e	Use Cache->clear to cleanup the filecache for removed users	2014-01-22 13:00:45 +01:00
Nicolai Ehemann	99ad4e8000	switched zip file creation to ZipStreamer to create zip files directly in memory	2014-01-22 12:49:52 +01:00
Nicolai Ehemann	791772abea	refactored/cleaned up lib/files.php ... cleaned up get() logic fixed get() to only send headers if requested (xsendfile could get in the way) do no longer readfile() when already using mod_xsendfile or similar	2014-01-22 11:53:03 +01:00
Robin Appelman	374e3475c9	Also remove the user's home storage from the storage table when deleting a user	2014-01-21 23:58:48 +01:00
Jörn Friedrich Dreyer	0dd54a1250	Merge pull request #6844 from owncloud/fix-css-loading-master ... Revert "use getAppWebPath() in here as well"	2014-01-21 08:31:22 -08:00
Thomas Müller	262f221d11	Merge branch 'master' into fix-setupfs-only-for-existing-users-master	2014-01-21 15:35:32 +01:00
Jörn Friedrich Dreyer	267e1f3c40	use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'	2014-01-21 12:41:10 +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	0f794b6889	Merge pull request #6820 from owncloud/phpunit-test-config ... Load a separate config (if present) when running unit tests	2014-01-20 12:14:09 -08:00
Robin Appelman	3d6d8d1bb6	Reuse the data retrieved from the cache in checkUpdate	2014-01-20 15:21:21 +01:00
Vincent Petry	62dd58aa19	Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix ... Fixed quota wrapper to not wrap failed fopen streams	2014-01-20 05:29:27 -08:00
Thomas Müller	221e656e91	Revert "use getAppWebPath() in here as well" ... This reverts commit 6254f0a403.	2014-01-20 10:10:34 +01:00
Thomas Müller	39be83ca8b	Merge pull request #6676 from aseques/check_internet_proxy ... Fix internet detection to use OC_Util::getUrlContent	2014-01-19 12:08:55 -08:00
Vincent Petry	1af7dab535	Fixed quota wrapper to not wrap failed fopen streams ... When calling fopen() on some storage types, these return false instead of throwing an exception. This fix makes sure that in case the stream wasn't opened (for example when a file doesn't exist any more) the stream isn't wrapped. Also added 'rb' as another case that doesn't need to be wrapped. Fixes #6832	2014-01-19 18:51:36 +01:00
Morris Jobke	3a2e03a7f0	Merge pull request #6784 from owncloud/fix-activation-of-unknown-apps ... Fix activation of unknown apps	2014-01-18 08:13:57 -08:00
Nicolai Ehemann	66aa9b4e27	lib/files.php: make use of === instead of ==	2014-01-18 15:16:17 +01:00
Bjoern Schiessle	bf0471a92e	show link to app documentation	2014-01-17 14:56:25 +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
Robin Appelman	6b4c3df087	Load a separate config (if present) when running unit tests	2014-01-17 14:40:48 +01:00
Robin Appelman	504645cf00	Add bindParam to statement wrapper	2014-01-16 14:07:16 +01:00
Thomas Müller	7f68497b39	error handling in case a requested app doesn't exists	2014-01-15 17:11:29 +01:00
Robin Appelman	729210daa0	Merge branch 'master' into memcache-public ... Conflicts: apps/user_ldap/lib/connection.php	2014-01-15 13:02:15 +01:00
Thomas Müller	d4519125db	Merge pull request #6744 from owncloud/fix_ocs_response_messages ... keep response message	2014-01-15 03:17:24 -08:00
Vincent Petry	34559ef114	Merge pull request #6768 from owncloud/scanner-use-storage-mtime ... Use storage_mtime when determining if we can reuse cached data while scanning	2014-01-15 01:31:33 -08:00
Robin Appelman	c01949ec0e	Merge branch 'master' into fileinfo	2014-01-14 16:31:08 +01:00
Vincent Petry	c3a0b0d7f3	Merge pull request #6704 from owncloud/encryptedfoldersizecalc ... Fix calculated folder size to use unencrypted size	2014-01-14 07:20:16 -08:00
Robin Appelman	203d5d01ca	Use storage_mtime when determining if we can reuse cached data while scanning	2014-01-14 13:54:07 +01:00
Robin Appelman	e706cf6c06	add Support for passing a FileInfo instance to View->putFileInfo	2014-01-13 15:57:49 +01:00
Robin Appelman	82762bb462	remove ArrayAccess, JsonSerializable from the public part of FileInfo	2014-01-13 15:13:45 +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
Bjoern Schiessle	6845860470	keep response message	2014-01-13 12:27:05 +01:00
st3so	a2cae551f3	fixing typo in redirection query string	2014-01-12 15:49:32 +01:00
Georg Ehrke	6f21da12e8	encode imagePath and fix documentation of loadFromFile	2014-01-11 12:07:28 +01:00
Joan	2abea96462	Disabled internet checking as mentioned when in proxy mode	2014-01-10 09:33:35 +01:00
Andreas Fischer	acd81f6c69	Readd support for memcached_server config variable.	2014-01-10 00:57:40 +01:00
Andreas Fischer	320353c237	Add support for multiple memcached servers.	2014-01-10 00:57:34 +01:00
Vincent Petry	4faba49f0a	Fix calculated folder size to use unencrypted size ... The encrypted size was used when calculating folder sizes. This fix now also sums up the unencrypted size and shows that one when available.	2014-01-09 17:47:50 +01:00
Vincent Petry	b24c21b00f	Merge pull request #6687 from owncloud/sharing-fixpartfilehandling ... Removed special handling of part files in shared storage rename	2014-01-09 06:16:43 -08:00
Robin Appelman	5d456c7cc2	Merge branch 'master' into memcache-public	2014-01-09 13:54:58 +01:00
Thomas Müller	22bd69f75c	set login name within apache auth backend	2014-01-09 10:28:24 +01:00
Thomas Müller	9b7c3a5c66	fixing PHPDoc and use cameCase names	2014-01-09 10:27:47 +01:00
blizzz	d8b8abb429	Merge pull request #6681 from owncloud/userreport ... add command line option to get user number statistics	2014-01-08 10:41:39 -08:00
Arthur Schiwon	4585b4ea3f	Infowarning about 32bit	2014-01-08 19:41:10 +01:00
Vincent Petry	8eaa39f4e2	Removed special handling of part files in shared storage rename ... This fixes the issue introduced by the transfer id which itself wasn't taken into account by the shortcut code for part file in the shared storage class.	2014-01-08 18:43:20 +01:00
Thomas Müller	e35bca1c26	Fix ownCloud for php5.3.x	2014-01-08 16:07:01 +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
Arthur Schiwon	d7cb5ab080	add tests for user counting	2014-01-08 13:26:48 +01:00
Arthur Schiwon	cb6a3e2617	if backends have the same class name, sum their users up instead of overwriting	2014-01-08 13:24:28 +01:00
Vincent Petry	f642ad3961	Prevent deleting storage root ... Storage mount points are not deletable, so make sure that the unlink operation and its hooks aren't run in such cases. Note that some storages might recursively delete their contents when calling unlink on their root. This fix prevents that as well.	2014-01-08 13:17:36 +01:00
Thomas Müller	4c93b00990	Merge branch 'master' into disable-mod_pagespeed	2014-01-08 10:19:16 +01:00
Vincent Petry	1614ad42b3	Merge pull request #6673 from owncloud/master-quota-insufficientstorageforfilesfix ... Now also preventing to override "files" dir size with -1	2014-01-08 00:55:11 -08:00
Thomas Müller	5eef107344	turn off mod_pagespeed	2014-01-08 07:56:08 +01:00
Jörn Friedrich Dreyer	f356894aa3	Merge pull request #6594 from owncloud/kill-index.php-from-url ... Kill index.php from url	2014-01-07 22:28:58 -08:00
eduardo	428d2b6e0f	Remove unused spaces	2014-01-08 00:16:37 -02:00
eduardo	938ece1a3f	Remove name from code	2014-01-08 00:15:08 -02:00
Arthur Schiwon	1e1ced7772	Introduce user count action to user management	2014-01-07 23:05:37 +01:00
Vincent Petry	5be4af9f51	Now also preventing to override "files" dir size with -1 ... Fixes #6526	2014-01-07 22:34:01 +01:00
Thomas Müller	b6474506eb	Merge pull request #6660 from owncloud/fixing-disabled-function-checks ... Fixing disabled function checks	2014-01-07 11:10:45 -08:00
Thomas Müller	2d5427efa9	Merge pull request #6290 from owncloud/files-androidcontentdisposition ... Files androidcontentdisposition	2014-01-07 11:06:20 -08:00
Thomas Müller	09d7882571	trimming all array elements	2014-01-07 19:47:01 +01:00
Thomas Müller	3abe4c3e88	Merge pull request #6663 from owncloud/fix_empty_mimetypes ... remove duplicate exe mimetype, add correct msi mimetype	2014-01-07 07:31:12 -08:00
Jörn Friedrich Dreyer	9404a8f40c	remove duplicate exe mimetype, add correct msi mimetype	2014-01-07 15:51:08 +01:00
Thomas Müller	9d869ab596	we shall explode on ',' only	2014-01-07 14:53:02 +01:00
Thomas Müller	07a84aa5eb	reuse existing helper function OC_Helper::is_function_enabled	2014-01-07 14:52:18 +01:00
Thomas Müller	970eed2867	Merge pull request #6530 from owncloud/prevent-corruption-on-parallel-upload-master ... Adding a random postfix to the part file.	2014-01-07 03:25:26 -08:00
Thomas Müller	ed469a7d2c	in order to work properly with encryption ocTransferId is added to the file path - questionable usage of magic string	2014-01-07 11:53:33 +01:00
tomneedham	5c3c379f35	Merge branch 'fix-5388-master' into migration_unit_tests	2014-01-07 00:40:36 +00:00
Robin Appelman	4d65a80892	Remove the static dependency on OC_Util from Memcache	2014-01-06 13:11:38 +01:00
Robin Appelman	cd147bb37a	Use APCIterator for Memcache\APC::clear()	2014-01-06 12:58:43 +01:00
Robin Appelman	1df1b55b66	expose memory cache in public api	2014-01-06 12:55:56 +01:00
Morris Jobke	ce3df44699	Merge pull request #6031 from s0taka/master ... No decimal points for Kilobyte and Byte #5371.	2014-01-05 11:52:10 -08:00
eduardo	569851fa0e	Add tabs to conformance with owncloud code standards	2014-01-05 12:38:54 -02:00
eduardo	d258ade35e	Fix PostgreSQL port configuration on install	2014-01-04 19:23:25 -02:00
tomneedham	1824ae1222	Merge branch 'master' into fix-5388-master	2014-01-04 13:46:08 +00:00
icewind1991	f016a3ead3	Merge pull request #6610 from owncloud/apcu-clear ... Fix APCIterator syntax in \OC\Memcache\APCu::clear	2014-01-03 05:30:49 -08:00
Thomas Müller	1ce45713bd	Merge pull request #6605 from owncloud/free_space_disabled ... Return SPACE_UNKNOWN if disk_free_space is disabled	2014-01-02 08:19:52 -08:00
Robin Appelman	83f968ace2	Fix APCIterator syntax in \OC\Memcache\APCU::clear ... see http://www.php.net/manual/en/apciterator.construct.php	2014-01-02 16:12:56 +01:00
icewind1991	14e0b1b6d1	Merge pull request #6513 from owncloud/user-no-change-displayname ... Re-add the config options to remove the ability for users to change their displayname	2014-01-02 05:04:27 -08:00
Robin Appelman	25370fcb82	Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free space on a local storage	2014-01-02 13:19:10 +01:00
Thomas Müller	25a9311e94	Merge pull request #6601 from AdamWill/pimple-include ... don't specify path to 3rdparty directory when registering Pimple autoloader	2014-01-01 15:25:58 -08:00
Adam Williamson	9b4a827e0b	don't specify path to 3rdparty directory when registering Pimple autoloader ... The core 3rdparty directory is in the include_path from lib/base.php anyway, so this is unnecessary, and causes problems for downstream distributors who unbundle Pimple.	2014-01-01 09:52:19 -08:00
lolozere	d5382ac05d	Add support mimetype ... Add support mimetype for extension .sh, .bash and .sh-lib	2014-01-01 14:09:02 +01:00
Niklas Sombert	4c179850ab	Revert "Added support for extra backends (see pull request #5043)" ... This reverts commit 2d75914f2a, reversing changes made to 760fa9ea30.	2014-01-01 13:43:23 +01:00
Niklas Sombert	2d75914f2a	Added support for extra backends (see pull request #5043) ... Somebody had forgotten "OC_User::setupBackends();"...	2014-01-01 11:53:27 +01:00
Thomas Müller	6254f0a403	use getAppWebPath() in here as well	2013-12-31 15:12:17 +01:00
Thomas Müller	ae5671d281	new config parameter 'front_controller_active' which will instruct the url generator to generate urls without index.php	2013-12-31 14:36:02 +01:00
Thomas Müller	97031ba45c	Merge pull request #6520 from owncloud/tests-testcleanuplistener ... Added test cleanup listener to detect untidy tests	2013-12-24 14:27:39 -08:00
Thomas Müller	efdeba7416	Merge pull request #6449 from owncloud/core-appsorderfix ... Fixed apps loading order	2013-12-24 14:26:11 -08:00
Andreas Fischer	63a2bea7ec	Remove OC_DB_StatementWrapper::numRows(). ... Using this method will result in an unneccesary extra SQL query (which also may return an incorrect result because the underlying table changed in the meantime). In general: If you are performing an UPDATE, DELETE or equivalent query, OC_DB_StatementWrapper::execute() will already give you the number of "affected rows" via \Doctrine\DBAL\Driver\Statement::rowCount(). This will not work for SELECT queries, however. If you want to know whether a table contains any rows matching your condition, use "SELECT id FROM ... WHERE ... LIMIT 1". If you want to know whether a table contains any rows matching your condition and you also need the data, use "SELECT ... FROM ... WHERE ...", then use one of the fetch() methods. If you want to count the number of rows matching your condition, use use "SELECT COUNT(...) AS number_of_rows FROM ... WHERE ...", then use one of the fetch() methods.	2013-12-21 19:36:14 +01:00
nhirokinet	c2e2c59ca7	Update user.php to fix duplicate session-duplicate	2013-12-22 01:31:04 +09:00
Vincent Petry	c6377e9125	Fixed apps loading order ... On SQLite the app order can be arbitrary and cause strange bugs. On MySQL, the app order seems to be always alphabetical. This fix enforces alphabetical order to make sure that all environments behave the same and to reduce bugs related to app loading order. Fixes #6442	2013-12-20 17:16:57 +01:00
Thomas Müller	1c0b8ed214	Adding a random postfix to the part file.	2013-12-20 13:48:46 +01:00
Bart Visscher	ac85dea267	Fix migration import of user files	2013-12-20 12:22:49 +01:00
Bart Visscher	34fcf1e9d0	Wrap the import/export db in a wrapper to make it compatible with the old style	2013-12-20 12:09:19 +01:00
Frank Karlitschek	dc45141f4a	Merge pull request #6262 from nickvergessen/issue/4375 ... correctly mark app management active	2013-12-20 02:27:52 -08:00
Vincent Petry	1c340444a4	Added test cleanup listener to detect untidy tests ... After each test suite, detects whether there are stray datafiles, hooks or proxies, then show a warning and clear them.	2013-12-19 20:18:09 +01:00
NARUKAWA Hiroki	068688063e	Security Update: session fixation ... Previous version is vulnerable to session fixation attack in some situations, guessing non-apache-module-php5 environment. Regeneration of session id should be done here.	2013-12-20 03:38:51 +09:00
Vincent Petry	09bd5bd517	Added isUserAgent() method to request ... - added isUserAgent() method to OC_Request which makes it possible to test it - OC_Response::setContentDisposition now uses OC_Request::isUserAgent()	2013-12-19 18:40:22 +01:00
Andreas Fischer	526e873073	Merge pull request #6219 from leo-b/fix_router_deprecation ... Symfonys addCollection() with multiple arguments is deprecated * leo-b/fix_router_deprecation: Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning	2013-12-19 17:38:37 +01:00
Robin Appelman	321d961353	Merge branch 'master' into user-no-change-displayname	2013-12-19 15:57:04 +01:00
Thomas Müller	ae3df84e20	Merge pull request #6491 from owncloud/fix-warning-array_walk_recursive-json ... only walk an array	2013-12-19 03:25:58 -08:00
icewind1991	3ea01e2152	Merge pull request #6492 from owncloud/appconfig-cache ... Fetch all appconfig values for an app at once and cache the results	2013-12-19 03:25:20 -08:00
Thomas Müller	9b18a4fd87	Merge pull request #4378 from owncloud/fixing-3417-master ... Don't use xcache in case admin auth is enabled	2013-12-19 03:24:37 -08:00
Frank Karlitschek	748d90592a	Merge pull request #6502 from owncloud/core-extramimetypes ... Added missing mime types	2013-12-18 23:41:36 -08:00
Thomas Müller	62fdc2b0dc	Merge pull request #6476 from ogasser/dbal_precision_scale ... DB: Support DECIMAL(precision,scale) syntax in XML	2013-12-18 15:15:26 -08:00
Vincent Petry	b109d411d8	Added missing mime types ... This is mostly to fix acceptance tests that have a .cc file. Also fixed typo in python mime type.	2013-12-18 22:40:58 +01:00
Andreas Fischer	38f4ecaeac	Merge remote-tracking branch 'owncloud/master' into fixing-3417-master ... * owncloud/master: (30 commits) Added entry with ext storage info [tx-robot] updated from transifex [tx-robot] updated from transifex clarifying license remove unused method tail() reliable detect encrypted files [tx-robot] updated from transifex remove duplicated code add missing quotes + field declarations Do not use xcache variable cache if cache size is 0. always show home breadcrumb in files view Use DEBUG instead of ERROR when favourites not found. Fix #6419 update file cache for target file only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted Fixed JS plural function to be per app call set password hook because it doesn't get triggered during test execution and fix paths Do not use L10n when logging exceptions Also add default to the \OCP\IConfig interface add default parameter for AllConfig->get*Value() always show 'Deleted Files' breadcrumb ... Conflicts: lib/private/memcache/xcache.php	2013-12-18 15:44:46 +01:00
Robin Appelman	2e195dbdae	dont re-read the config values for an app when a non existing key is fetched	2013-12-18 15:28:32 +01:00
Thomas Müller	6c707323f2	only walk an array	2013-12-18 15:25:28 +01:00
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