12880 Commits (d544a371bfb84f36a3b789d19d44d6694de21c48)

 

All Branches   

Search

Author	SHA1	Message	Date
Bjoern Schiessle	d544a371bf	revert changes to 3rdparty submodule reference	13 years ago
Bjoern Schiessle	1be11bb03d	don't change the etags if a file gets encrypted/decrypted to avoid that the sync client downloads all files again	13 years ago
Bjoern Schiessle	cabe92ef12	Merge branch 'master' into decrypt_files_again ... Conflicts: apps/files_encryption/tests/keymanager.php	13 years ago
Björn Schießle	d3e2f31ada	Merge pull request #4352 from owncloud/encryption_clean_up ... crypt.php clean up	13 years ago
Arthur Schiwon	c538ac3081	LDAP: only connect to LDAP once on login	13 years ago
Thomas Müller	69350c4e0d	Merge pull request #4471 from owncloud/password-icon ... use proper password icon, three dots are 'more'	13 years ago
Thomas Müller	264ee9df9a	Merge pull request #4476 from owncloud/doc-on-master ... fix difference between packaged version and master	13 years ago
Thomas Müller	e761cba808	Merge pull request #4480 from owncloud/remove-ru_RU-master ... remove ru_RU - fixes #3135	13 years ago
Morris Jobke	50147bfbd1	Merge pull request #4193 from owncloud/versions_fix_css ... Versions fix css	13 years ago
Thomas Müller	de52157e76	remove ru_RU - fixes #3135	13 years ago
Bjoern Schiessle	137cd2ca89	increase width of versions dialog	13 years ago
Morris Jobke	746d32eb05	fix difference between packaged version and master	13 years ago
Jan-Christoph Borchardt	b8b24bbae7	use proper password icon, three dots are 'more'	13 years ago
Morris Jobke	837cefd8a3	Merge pull request #4442 from owncloud/no-smb-client-on-windows-master ... no files external for SMB on windows	13 years ago
Jan-Christoph Borchardt	1e8849b04e	Merge pull request #4314 from owncloud/css-fixes ... Design fixes	13 years ago
Morris Jobke	c196985ea3	Merge pull request #4032 from owncloud/more-whitespace ... More whitespace	13 years ago
Jenkins for ownCloud	6bd0ba79df	[tx-robot] updated from transifex	13 years ago
Thomas Müller	0aa7dc9b89	tixing width and position of wider error messages	13 years ago
Jan-Christoph Borchardt	d2767faf61	Merge pull request #4113 from owncloud/delete-fix ... Delete icon fix	13 years ago
Jan-Christoph Borchardt	399adf67b0	merge master into css-fixes	13 years ago
Jan-Christoph Borchardt	b632b8f4e4	force show loading icon also for IE	13 years ago
Jan-Christoph Borchardt	3563eecfff	merge master into more-whitespace	13 years ago
Thomas Müller	bd1895bdf8	Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox ... fix #2711 using a custom event, also use css selectors over filterAttr	13 years ago
Thomas Müller	b3241402b9	Merge pull request #4443 from owncloud/remove-jplayer-from-core-css ... remove jPlayer css rules from core css file	13 years ago
Morris Jobke	5fb7aab7a0	remove jPlayer css rules from core css file	13 years ago
Morris Jobke	b6ac711787	Merge pull request #4448 from owncloud/fixing-4444-master ... Fixing 4444 master	13 years ago
Thomas Müller	ada13a4d40	fixing all broken translation files	13 years ago
Thomas Müller	c71408eaa9	fixing call to join	13 years ago
Bjoern Schiessle	7adfc27caf	remove whitespaces and some leftover code from testing	13 years ago
Markus Goetz	b9f3bb2426	Merge pull request #4441 from guruz/checkServer_cache_result ... Cache OC_Util::checkServer() result in session	13 years ago
Thomas Müller	05549884c6	no files external for SMB on windows	13 years ago
Markus Goetz	3972198b61	Cache OC_Util::checkServer() result in session ... The return value almost never changes but this function is called for every request.	13 years ago
Jenkins for ownCloud	680ac48856	[tx-robot] updated from transifex	13 years ago
Morris Jobke	de89c31f5a	Merge pull request #4302 from synchrone/master ... Fixing owncloud/core#4301	13 years ago
Andreas Fischer	75e9015b54	Merge pull request #4393 from owncloud/fix_4326 ... provide correct path for require_once * owncloud/fix_4326: use __DIR__ instead of realpath provide correct path for require_once	13 years ago
Thomas Müller	06670cef8a	Merge pull request #4304 from tripflex/lostpw-themed ... use theme name and title for password reset	13 years ago
Thomas Müller	994537a5b9	Merge pull request #4372 from owncloud/allow_empty_configvalue ... allow empty configvalue in appconfig	13 years ago
Jörn Friedrich Dreyer	8f3f47e868	Merge pull request #4376 from owncloud/use_plurals ... Use plural translations	13 years ago
Thomas Müller	b3b2b2d64c	Merge pull request #4363 from owncloud/fix-4355 ... Send mime-type for new files	13 years ago
Bjoern Schiessle	7d0e9cc685	use __DIR__ instead of realpath	13 years ago
Bjoern Schiessle	6c3efaf26c	throw exception if encryption was disabled but files are still encrypted to prevent the client from syncing unreadable files	13 years ago
kondou	4002491947	Reword a phrase	13 years ago
Jörn Friedrich Dreyer	435e63b5ee	Merge pull request #4410 from owncloud/fix_sharing_defaults ... Fix sharing defaults	13 years ago
Jörn Friedrich Dreyer	11a404b90b	comment clarification	13 years ago
Jörn Friedrich Dreyer	ca95a475d5	use edit & reshare permission as default	13 years ago
Jörn Friedrich Dreyer	5660f99592	add PERMISSIONS_ALL summary	13 years ago
Jenkins for ownCloud	9492aeffe9	[tx-robot] updated from transifex	13 years ago
Bjoern Schiessle	eb0fdc8380	provide correct path for require_once	13 years ago
icewind1991	77596ace81	Merge pull request #4391 from owncloud/scanner-reuse-recursive ... Fix recursive scanner to reusing etags	13 years ago
Bjoern Schiessle	53bb89824d	check if some encrypted files are left after the app was disabled and warn the user	13 years ago