14168 Commits (46cd3082b013f90fb8ce7269f40bb26d85bbee00)

 

All Branches   

Search

Author	SHA1	Message	Date
Thomas Müller	02d6976263	Merge branch 'master' into lib-private-master-2	13 years ago
Thomas Müller	7c659eb291	use public api for session access from server container	13 years ago
Thomas Müller	bed27b603d	Merge branch 'master' into channels ... Conflicts: lib/util.php	13 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	13 years ago
Frank Karlitschek	69dd6af574	use === ... Shoudn't make a difference in this case but just in case Conflicts: lib/ocsclient.php	13 years ago
Frank Karlitschek	b948c1a1b6	prepare the updater for the new update channels	13 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	13 years ago
Thomas Müller	8e0060405d	reorganize file in lib	13 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	13 years ago
Thomas Tanghus	26785c9e0d	Remove getContent() from IRequest	13 years ago
Thomas Tanghus	4e9a95f3e9	Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request ... Conflicts: lib/appframework/http/request.php tests/lib/appframework/http/RequestTest.php	13 years ago
Thomas Tanghus	b0be2c79dc	Remove JSON request parsing from Server	13 years ago
Thomas Tanghus	1d2466c6d1	Add assertions for ->params and array access with json	13 years ago
Jenkins for ownCloud	a711399e62	[tx-robot] updated from transifex	13 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	13 years ago
Thomas Tanghus	092b4e7b53	Implement PUT an PATCH support	13 years ago
Thomas Tanghus	2115db3892	Add interface docs to IRequest.	13 years ago
Thomas Tanghus	35fae7aaf8	Add patch method to OC_Route	13 years ago
Thomas Tanghus	50fc5e8792	Check if accessor matched request method. ... It's easier to find errors in the code if an exception is thrown.	13 years ago
Bjoern Schiessle	67d4b77e8e	revert changes in personal template	13 years ago
Bjoern Schiessle	4d79e7e673	Merge branch 'master' into encryption_improved_error_messages_4617	13 years ago
Bjoern Schiessle	084f76fd14	grammar fixes	13 years ago
Bjoern Schiessle	17aa49a890	fix mail subject; don't show time for expire date	13 years ago
Thomas Müller	480aeb804f	Merge pull request #4459 from owncloud/appframework-master ... Public API for OC6+ (includes AppFramework)	13 years ago
Bjoern Schiessle	513dc20d4b	also return success if no shares are found.	13 years ago
Bjoern Schiessle	6d830087db	add testUpdateShareUpload()	13 years ago
Bjoern Schiessle	03db954e1a	add getShareFromFolder() test	13 years ago
Bjoern Schiessle	9a2e82c3c5	Make sure that testDeleteShare() has some shares to delete	13 years ago
Thomas Müller	c62dc4fa80	Merge branch 'master' into fixing-4011-master ... Conflicts: lib/connector/sabre/directory.php	13 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	13 years ago
Thomas Müller	fdc87eaeb3	adding test testSimplePutFailsOnRename()	13 years ago
Thomas Müller	92c02e6797	remove commented code	13 years ago
Thomas Müller	e3dee63339	Merge branch 'master' into fixing-4011-master ... Conflicts: lib/connector/sabre/directory.php lib/connector/sabre/file.php	13 years ago
Thomas Müller	629faf6d34	Merge branch 'master' into appframework-master	13 years ago
Bjoern Schiessle	029abc9c43	mail is already themable via the template, no need to provide additional string in OC_Defaults	13 years ago
Thomas Müller	aaba0d83b5	fixing PHPDoc & typo	13 years ago
Bjoern Schiessle	b9a1f63344	go back to old template but add expire date as optional content	13 years ago
Thomas Müller	952433eae6	Merge branch 'master' into move-aborted-upload-detection-into-plugin-master	13 years ago
Thomas Müller	5899485ca1	Merge pull request #4969 from owncloud/fixing-4043-master ... adding privilege check on move and rename operations	13 years ago
Thomas Müller	4032065ec6	Merge pull request #3563 from evgeni/curl-no-timeout ... cURL does not honour default_socket_timeout	13 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.	13 years ago
vsapronov	1efbf7774f	Fixed review issues	13 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	13 years ago
Thomas Müller	258e8d58da	flipping arguments on assertEquals() - first argument contains the expected value and second argument contains the value to be asserted	13 years ago
Thomas Müller	63ea6844e8	- adding unit test testGetShareFromUnknownId() ... - fixing getShareFromId() for Oracle - fixing error message	13 years ago
Thomas Müller	a79294771b	Merge pull request #4960 from owncloud/fixing-mirall-1014-master ... handle error situation of rename proper	13 years ago
Thomas Müller	5462e199d3	Merge branch 'master' into appframework-master	13 years ago
Thomas Müller	88d5e8fbca	Merge pull request #5031 from zimba12/master ... followup of #4032 - makes the settings-button bigger...	13 years ago
Alessandro Cosentino	710d3f139f	followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation	13 years ago
Jenkins for ownCloud	59e4ff7d24	[tx-robot] updated from transifex	13 years ago