mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,075 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

14075 Commits

Author SHA1 Message Date
Bjoern Schiessle 8b08b1b455 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/private/util.php
 2013-10-02 10:11:18 +02:00
Owen Winkler 535ed8369f Merge pull request #4894 from owncloud/fixing-4620-master 
Fixing broken layout in master due to APC enabled
 2013-10-01 17:51:33 -07:00
Victor Dubiniuk 5bb4330ea4 Fix autoloader regression 2013-10-02 00:58:51 +03:00
Thomas Müller 9eab8b39df Merge branch 'master' into fixing-4620-master 2013-10-01 22:57:46 +02:00
Thomas Tanghus 8035787cb9 Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request 2013-10-01 20:16:11 +02:00
Thomas Tanghus a2cabd4c2a Remove getContent() from IRequest 2013-10-01 20:15:04 +02:00
Thomas Tanghus 0f13ffb773 Remove JSON request parsing from Server 2013-10-01 20:15:04 +02:00
Thomas Tanghus 7cd8088845 Add assertions for ->params and array access with json 2013-10-01 20:15:03 +02:00
Thomas Tanghus 973bcccd7c Implement PUT an PATCH support 2013-10-01 20:13:13 +02:00
Thomas Tanghus 36d1156cf8 Add interface docs to IRequest. 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
Morris Jobke 5ade595911 Merge pull request #5039 from owncloud/lib-private-master-2 
Public API OC6 - introduce lib/private
 2013-10-01 09:15:24 -07:00
Thomas Müller e2fe71b6e7 Merge branch 'master' into lib-private-master-2 2013-10-01 16:11:59 +02:00
Thomas Müller b66e492d6e Merge pull request #5026 from owncloud/channels 
put the current version and edition into a seperate file to simplify
 2013-10-01 05:36:00 -07:00
Frank Karlitschek 6cda88b49d add explanation 2013-10-01 14:28:59 +02:00
Frank Karlitschek bf0f3bf0da use a 4 digit number 2013-10-01 12:37:19 +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 7c659eb291 use public api for session access from server container 2013-09-30 20:28:00 +02:00
Thomas Müller bed27b603d Merge branch 'master' into channels 
Conflicts:
	lib/util.php
 2013-09-30 20:21:51 +02:00
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
 2013-09-30 20:19:26 +02:00
Frank Karlitschek 69dd6af574 use === 
Shoudn't make a difference in this case but just in case

Conflicts:
	lib/ocsclient.php
 2013-09-30 20:15:16 +02:00
Frank Karlitschek b948c1a1b6 prepare the updater for the new update channels 2013-09-30 20:14:18 +02:00
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
 2013-09-30 10:53:41 -07: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
Thomas Tanghus 26785c9e0d Remove getContent() from IRequest 2013-09-30 16:30:36 +02:00
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
 2013-09-30 16:27:00 +02:00
Thomas Tanghus b0be2c79dc Remove JSON request parsing from Server 2013-09-30 16:24:47 +02:00
Thomas Tanghus 1d2466c6d1 Add assertions for ->params and array access with json 2013-09-30 16:23:43 +02:00
Jenkins for ownCloud a711399e62 [tx-robot] updated from transifex 2013-09-30 10:19:22 -04:00
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
 2013-09-30 06:55:56 -07:00
Thomas Tanghus 092b4e7b53 Implement PUT an PATCH support 2013-09-30 15:35:07 +02:00
Thomas Tanghus 2115db3892 Add interface docs to IRequest. 2013-09-30 15:35:07 +02:00
Thomas Tanghus 35fae7aaf8 Add patch method to OC_Route 2013-09-30 15:35:07 +02:00
Thomas Tanghus 50fc5e8792 Check if accessor matched request method. 
It's easier to find errors in the code if an exception is thrown.
 2013-09-30 15:35:07 +02:00
Bjoern Schiessle 67d4b77e8e revert changes in personal template 2013-09-30 15:11:01 +02:00
Bjoern Schiessle 4d79e7e673 Merge branch 'master' into encryption_improved_error_messages_4617 2013-09-30 15:08:53 +02:00
Bjoern Schiessle 084f76fd14 grammar fixes 2013-09-30 13:33:49 +02:00
Bjoern Schiessle 17aa49a890 fix mail subject; don't show time for expire date 2013-09-30 13:33:02 +02:00
Thomas Müller 480aeb804f Merge pull request #4459 from owncloud/appframework-master 
Public API for OC6+ (includes AppFramework)
 2013-09-30 04:11:28 -07:00
Bjoern Schiessle 513dc20d4b also return success if no shares are found. 2013-09-30 13:05:34 +02:00
Bjoern Schiessle 6d830087db add testUpdateShareUpload() 2013-09-30 12:57:55 +02:00
Bjoern Schiessle 03db954e1a add getShareFromFolder() test 2013-09-30 12:38:36 +02:00
Bjoern Schiessle 9a2e82c3c5 Make sure that testDeleteShare() has some shares to delete 2013-09-30 12:23:44 +02:00
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
 2013-09-30 02:31:51 -07:00
Thomas Müller 629faf6d34 Merge branch 'master' into appframework-master 2013-09-30 10:42:05 +02:00
Bjoern Schiessle 029abc9c43 mail is already themable via the template, no need to provide additional string in OC_Defaults 2013-09-30 10:03:12 +02:00
Thomas Müller aaba0d83b5 fixing PHPDoc & typo 2013-09-30 10:03:07 +02:00
Bjoern Schiessle b9a1f63344 go back to old template but add expire date as optional content 2013-09-30 10:02:26 +02:00