13884 Commits (8b08b1b455b474de3fa376dfafa3de63727364ea)

 

All Branches   

Search

Author	SHA1	Message	Date
Bjoern Schiessle	8b08b1b455	Merge branch 'master' into sharing_mail_notification_master ... Conflicts: lib/private/util.php	12 years ago
Owen Winkler	535ed8369f	Merge pull request #4894 from owncloud/fixing-4620-master ... Fixing broken layout in master due to APC enabled	12 years ago
Thomas Müller	9eab8b39df	Merge branch 'master' into fixing-4620-master	12 years ago
Morris Jobke	5ade595911	Merge pull request #5039 from owncloud/lib-private-master-2 ... Public API OC6 - introduce lib/private	12 years ago
Thomas Müller	e2fe71b6e7	Merge branch 'master' into lib-private-master-2	12 years ago
Thomas Müller	b66e492d6e	Merge pull request #5026 from owncloud/channels ... put the current version and edition into a seperate file to simplify	12 years ago
Frank Karlitschek	6cda88b49d	add explanation	12 years ago
Frank Karlitschek	bf0f3bf0da	use a 4 digit number	12 years ago
Thomas Müller	02d6976263	Merge branch 'master' into lib-private-master-2	12 years ago
Thomas Müller	7c659eb291	use public api for session access from server container	12 years ago
Thomas Müller	bed27b603d	Merge branch 'master' into channels ... Conflicts: lib/util.php	12 years ago
Frank Karlitschek	2cf26ee0b1	put the current version and edition into a seperate file to simplify packaging. introduce update channels and build version for automated channel updates. More about that later ... Conflicts: lib/ocsclient.php lib/util.php	12 years ago
Frank Karlitschek	69dd6af574	use === ... Shoudn't make a difference in this case but just in case Conflicts: lib/ocsclient.php	12 years ago
Frank Karlitschek	b948c1a1b6	prepare the updater for the new update channels	12 years ago
Thomas Müller	b58a464b86	Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled ... don't remember login if the encrypion app is enabled	12 years ago
Thomas Müller	8e0060405d	reorganize file in lib	12 years ago
Thomas Müller	9c9dc276b7	move the private namespace OC into lib/private - OCP will stay in lib/public ... Conflicts: lib/private/vcategories.php	12 years ago
Jenkins for ownCloud	a711399e62	[tx-robot] updated from transifex	12 years ago
Morris Jobke	d4fed61871	Merge pull request #5012 from owncloud/check_keyfiles_exists ... check not only if the keyfile folder exists but also if it contains keyfiles	12 years ago
Bjoern Schiessle	084f76fd14	grammar fixes	12 years ago
Bjoern Schiessle	17aa49a890	fix mail subject; don't show time for expire date	12 years ago
Thomas Müller	480aeb804f	Merge pull request #4459 from owncloud/appframework-master ... Public API for OC6+ (includes AppFramework)	12 years ago
Thomas Müller	ebb2278a67	Merge pull request #4995 from owncloud/move-aborted-upload-detection-into-plugin-master ... Move aborted upload detection into it's own sabedav plugin	12 years ago
Thomas Müller	629faf6d34	Merge branch 'master' into appframework-master	12 years ago
Bjoern Schiessle	029abc9c43	mail is already themable via the template, no need to provide additional string in OC_Defaults	12 years ago
Thomas Müller	aaba0d83b5	fixing PHPDoc & typo	12 years ago
Bjoern Schiessle	b9a1f63344	go back to old template but add expire date as optional content	12 years ago
Thomas Müller	952433eae6	Merge branch 'master' into move-aborted-upload-detection-into-plugin-master	12 years ago
Thomas Müller	5899485ca1	Merge pull request #4969 from owncloud/fixing-4043-master ... adding privilege check on move and rename operations	12 years ago
Thomas Müller	4032065ec6	Merge pull request #3563 from evgeni/curl-no-timeout ... cURL does not honour default_socket_timeout	12 years ago
Evgeni Golov	b6fc143074	cURL does not honour default_socket_timeout ... SabreDAV uses cURL for the requests and as this does not honour default_socket_timeout, setting it is useless and confusing as people will expect the request to timeout faster than it actually will do. One has to use curl_setopt($curl, CURLOPT_TIMEOUT, x) or curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, x) but there is currently no way to make SabreDAV pass this to cURL.	12 years ago
Andreas Fischer	9ba0edcadb	Merge pull request #4966 from owncloud/text_preview_blacklist ... add blacklist to txt preview backend * owncloud/text_preview_blacklist: rename variable in testIsTransparent rename testTxtBlacklist to txtBlacklist move fileView object initialization to testIsTransparent use dataProvider for txt blacklist test add test for txt blacklist add test data for cal and contact preview add blacklist to txt preview backend	12 years ago
Thomas Müller	a79294771b	Merge pull request #4960 from owncloud/fixing-mirall-1014-master ... handle error situation of rename proper	12 years ago
Thomas Müller	5462e199d3	Merge branch 'master' into appframework-master	12 years ago
Thomas Müller	88d5e8fbca	Merge pull request #5031 from zimba12/master ... followup of #4032 - makes the settings-button bigger...	12 years ago
Alessandro Cosentino	710d3f139f	followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation	12 years ago
Jenkins for ownCloud	59e4ff7d24	[tx-robot] updated from transifex	12 years ago
Thomas Müller	adcb738e47	initialize $middleWares	12 years ago
Thomas Müller	6979fd343b	Merge branch 'master' into appframework-master	12 years ago
Morris Jobke	1097c3ce63	Merge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname ... Base defaultavatar text on displayname	12 years ago
kondou	24d092c4ba	Have uniform (wrong) indention	12 years ago
kondou	4907685405	Base defaultavatar text on displayname ... Fix #4876	12 years ago
Morris Jobke	cb565a5f60	Merge pull request #5004 from owncloud/phpunit-dist-coverage-excludes ... phpunit.xml: Port code coverage excludes from autotest to dist.	12 years ago
Thomas Müller	57f37c876b	delay middleware registrations	12 years ago
Thomas Müller	adff34cb8a	fixing error in initialization of TagManager	12 years ago
Georg Ehrke	c5bcefe4db	rename variable in testIsTransparent	12 years ago
Thomas Müller	687ba053b7	Merge branch 'master' into appframework-master	12 years ago
Thomas Müller	735608f513	Merge pull request #4207 from owncloud/search_shared_files ... add initial search in shared files	12 years ago
Thomas Müller	79da35b698	code cleanup	12 years ago
Bjoern Schiessle	03d5ea6cec	check not only if the keyfile folder exists but also if it contains keyfiles	12 years ago