14599 Commits (1909288fcb9231006ae7703422f046309635b4e2)

 

All Branches   

Search

Author	SHA1	Message	Date
Thomas Müller	1909288fcb	Merge branch 'master' into fix-sharing-code	12 years ago
Thomas Müller	3d5e229ac5	Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinserts ... Ignore duplicate inserts in file cache and mime type	12 years ago
Bjoern Schiessle	2221aa9ca4	run first getUsersItemShared() with the owner	12 years ago
Bjoern Schiessle	60e219da43	update etags for user we haven't checked yet	12 years ago
Bjoern Schiessle	6ae761d946	keep a list of users we already checked to avoid loops	12 years ago
Bjoern Schiessle	dd972f65a8	fix infinite loop while updating etags, fix for #4365	12 years ago
Bjoern Schiessle	efdbcbddef	Merge branch 'master' of github.com:owncloud/core	12 years ago
Markus Goetz	af58360434	files_encryption: Fix getFileSize() ... For certain file sizes, we rounded to the wrong chunk number and the returned bogus results. This should fix https://github.com/owncloud/mirall/issues/1009 Conflicts: apps/files_encryption/tests/util.php	12 years ago
Thomas Müller	8c69a5388e	Merge pull request #5478 from owncloud/core-logexceptionstacktrace ... Expand exception stack trace in log in debug mode	12 years ago
VicDeo	959b0f9125	Merge pull request #5458 from owncloud/fixing-5222-master ... php 5.3 compatibility regarding OC\DB\Connection fixed	12 years ago
Johannes Twittmann	76f831979b	Update CONTRIBUTING.md ... Gave more info on how to search issues.	12 years ago
blizzz	32e02c24a2	Merge pull request #5404 from owncloud/ldap_settings_wizard ... Ldap settings wizard	12 years ago
Vincent Petry	c4dee281e6	Added $app parameter to logException	12 years ago
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	12 years ago
Thomas Müller	3c710696e8	add missing file header	12 years ago
Arthur Schiwon	30c0f5dee6	LDAP Wizard: proper strings and translations for user and group count text	12 years ago
Arthur Schiwon	d78a80a689	merge master with resolved conflicts	12 years ago
Vincent Petry	42c58220de	Moved logException to OCP\Util class	12 years ago
Björn Schießle	2d14daf36b	Merge pull request #5472 from owncloud/enc_init_status_on_enable ... Encryption set init status on enable	12 years ago
Thomas Müller	4bf37f72b2	Merge pull request #5482 from owncloud/fix_weird_http_namespace ... Fix namespace for OCP\Appframework\Http	12 years ago
Thomas Müller	cf61b1a977	Merge pull request #5391 from owncloud/undefined-property-in-schema-master ... removing pointless calls on quoteIdentifier() - reason: name on $tableDi...	12 years ago
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.	12 years ago
Thomas Müller	064fd5ae53	Merge pull request #5451 from owncloud/reuse-session-ocs-master ... Support existing sessions within OCS API calls	12 years ago
Christopher Schäpers	70c0d7d6bc	Merge pull request #5310 from owncloud/hide_filestable-header_when_empty ... Hide files list header, when theres no files to see	12 years ago
Thomas Müller	70b02f0513	Merge pull request #5479 from owncloud/fixing-4502-master ... Fix webdav to fullfil litmus test suite	12 years ago
Thomas Müller	cea1f80c1a	Merge pull request #5466 from owncloud/files-thumbnailloadingdelaystyle ... Fixed ugly white space while loading file thumbnail	12 years ago
Thomas Müller	e6aa7a8643	Merge pull request #5467 from owncloud/fixing-5063-master ... display the original file name - this will change in case of renames	12 years ago
Thomas Müller	d2fa0f5ff2	Merge pull request #5473 from owncloud/files-startviewerfunc ... Added FileList.setViewerMode to hide controls	12 years ago
Thomas Müller	6eec8b2550	Merge pull request #5476 from owncloud/admin-showwarningwhenhomeexists ... Added warning notification when user home already exists	12 years ago
Thomas Müller	09903aa36c	- delete properties on node delete ... - move properties on node move	12 years ago
Vincent Petry	83956b1703	Expand exception stack trace in log in debug mode	12 years ago
Vincent Petry	00f4928866	Added warning notification when user home already exists ... When creating a user and the home already exists in the data dir, a warning notification will be displayed. Fixes #5161	12 years ago
Vincent Petry	263f8bebfe	Added FileList.setViewerMode to hide controls ... Some files app embed themselves under the controls (like the text editor). The new method FileList.setViewerMode() makes it possible to properly show/hide the control buttons using the correct permissions. Apps using this approach must call setViewerMode(true) when starting and setViewerMode(false) upon closing to restore the controls. This is needed for #5284	12 years ago
Bjoern Schiessle	3d1d443529	remove debug output	12 years ago
Bjoern Schiessle	eb348b776c	set the init status to "NOT_INITIALIZED" if the encryption app gets enabled	12 years ago
Bjoern Schiessle	bd450d6f6b	add post_enable hook if a app gets enabled	12 years ago
Thomas Müller	e23433f771	display the original file name - this will change in case of renames	12 years ago
Vincent Petry	3bb7cf939e	Fixed ugly white space while loading file thumbnail ... Preview images are now pre-loaded before being set on the file element. This fixes #5135 and prevents a white space to be displayed while the thumbnails is being loaded.	12 years ago
Thomas Müller	cadd71ec8a	Merge pull request #5455 from owncloud/fixing-2423-master ... introduce link_to_docs() and migrate links	12 years ago
Thomas Müller	9d976013da	Merge pull request #5437 from owncloud/create-custom-logfile ... Try to create custom log file before falling back to default.	12 years ago
Vincent Petry	efd71c80f0	Merge pull request #5426 from owncloud/fix-3612 ... Adds margin to the SSL root certificate button	12 years ago
Thomas Müller	7f1432600c	fixing php 5.3.3 error: ... Undefined variable: this lib/private/appframework/dependencyinjection/dicontainer.php:92	12 years ago
Thomas Müller	d86508e36d	Merge branch 'master' into fixing-5222-master	12 years ago
Arthur Schiwon	76a195a0be	LDAP Wizard: l10n improvements	12 years ago
Thomas Müller	87a09156f8	use OC_Helper::linkToDocs() in lib/private/config.php	12 years ago
Frank Karlitschek	6915367622	Merge pull request #5446 from frisco82/fixNotifyUser ... Fix notify user checkbox	12 years ago
Thomas Müller	e30e4ea1cc	php 5.3 compatibility regarding OC\DB\Connection fixed	12 years ago
Thomas Müller	408e0022dd	Merge pull request #5249 from owncloud/activities-api ... [OC6] Activities api	12 years ago
Vincent Petry	d1c27e08e5	Fixed empty content logic ... - Remove obsolete code that used another approach for hiding emptycontent - Fixed logic for the showing of the empty content message	12 years ago
Vincent Petry	fa1864971e	Merge pull request #5120 from frisco82/sendEmailJS ... Fix disabled status after sending a share link email	12 years ago