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

14086 Commits

Author SHA1 Message Date
Thomas Tanghus fe86182dac OC_Cache namespace changes and add UserCache to server container. 
Refs #4863
 2013-09-17 17:46:33 +02:00
Bjoern Schiessle 72eaf2894a performance improvement, check configuration only if no private key exists 2013-09-17 16:53:52 +02:00
Bjoern Schiessle e52639e4e6 use share ID as REST resource 2013-09-17 15:27:46 +02:00
Bernhard Posselt 2e79aab0ce Merge pull request #4871 from owncloud/add_exists_method_to_jquery 
add exists method to jquery
 2013-09-17 06:07:50 -07:00
Thomas Müller 9b420e8660 use \OC::$server->getPreviewManager() instead of \OCP\Preview 2013-09-17 13:33:47 +02:00
Bjoern Schiessle 86dbb13823 more rest-style API 2013-09-17 11:53:38 +02:00
Thomas Müller b9e943f5d5 fix naming 2013-09-17 09:42:14 +02:00
Thomas Müller 4cd0ee47a8 Merge branch 'master' into appframework-master 2013-09-17 09:39:45 +02:00
Thomas Müller 822daa8f8a class files have to be lowercase 2013-09-17 00:27:22 +02:00
Thomas Müller 981a41e2cd adding interface for middleware 2013-09-17 00:26:55 +02:00
Thomas Müller c8f9efeb94 etag changes are now propagated up the file tree 2013-09-16 23:32:17 +02:00
Andreas Fischer a92d4c2c09 Perform expiration date checking before returning share data for token. 2013-09-16 21:24:17 +02:00
Andreas Fischer 07714d9a72 Tests whether expired/valid link share is still accessible. 2013-09-16 21:24:16 +02:00
Bart Visscher 9d18e16c77 Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle 
Fix Sharing "Expiration Date" on Oracle
 2013-09-16 12:16:44 -07:00
Thomas Müller 3b42ac8eb6 Merge branch 'master' into fixing-4866-master 2013-09-16 18:06:17 +02:00
Bjoern Schiessle ef3307f099 return error if public upload is disabled 2013-09-16 17:42:56 +02:00
Jenkins for ownCloud 5cf12888ad [tx-robot] updated from transifex 2013-09-16 11:38:45 -04:00
Bjoern Schiessle 7aed24fa6c allow to set a different permission during initial share operation 2013-09-16 17:28:17 +02:00
Bjoern Schiessle 14437ffd15 ocs api for file sharing 2013-09-16 17:04:49 +02:00
Jörn Friedrich Dreyer d41e722629 refactor upload progress 2013-09-16 14:14:46 +02:00
Jörn Friedrich Dreyer afe4f6a794 add exists method to jquery 2013-09-16 13:47:37 +02:00
Jörn Friedrich Dreyer 9297b8f678 fix gitignore for all apps* folders 2013-09-16 12:11:15 +02:00
Thomas Müller 3c026b7cf6 recreate an etag within the scanner if the cache contains an empty etag 2013-09-16 12:09:15 +02:00
Bjoern Schiessle 82cbbb8ab8 Merge branch 'master' into encryption_improved_error_messages_4617 
Conflicts:
	apps/files/index.php
 2013-09-16 10:42:37 +02:00
Bjoern Schiessle 534d93d2d3 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
 2013-09-16 10:40:06 +02:00
Thomas Müller 46f59b165e Merge pull request #4838 from owncloud/refactor_upload_js 
refactor upload js & html to always use only js to fill form data
 2013-09-16 01:06:24 -07:00
Thomas Müller c20f01bbf0 Merge pull request #4862 from owncloud/db_to_public 
Add OCP\DB::getErrorMessage() to public namespace.
 2013-09-16 00:51:12 -07:00
Thomas Tanghus eab84d3d96 Add OCP\DB::getErrorMessage() to public namespace. 2013-09-16 02:17:39 +02:00
Thomas Müller 5d4e9e0d25 /OC/Server has created too early causing issues with config operations as OC:$SERVERPATH was not yet initialized 
This fixes unit test execution
 2013-09-15 23:07:18 +02:00
icewind1991 da0631e185 Merge pull request #4860 from owncloud/fixing-potential-null-storage-on-scanner-master 
adding null check on a mount's storage
 2013-09-15 13:47:16 -07:00
Thomas Müller af0069bf03 adding getRootFolder() to server container and hooking up the new files api 2013-09-15 22:24:57 +02:00
Thomas Müller 5acb3c4c0d first log the exception 2013-09-15 21:20:22 +02:00
Thomas Müller ad82a56f79 Merge branch 'master' into appframework-master 2013-09-15 21:18:59 +02:00
Thomas Müller 0f4e214a90 adding null check on a mount's storage 2013-09-15 20:40:40 +02:00
Morris Jobke 339c98e5e6 Merge pull request #4835 from owncloud/fix-apps-height 
use lineheight instead of padding and height
 2013-09-15 07:08:50 -07:00
Morris Jobke 58e6582056 Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter 
Fixes #4465 - Added autoFocus to #shareWith autocomplete options
 2013-09-15 03:07:11 -07:00
Thomas Müller db7e1dd877 Merge pull request #4853 from owncloud/external-shared_mimetype-icons 
Use external and shared icons in OC.Dialogs.filepicker()
 2013-09-15 02:42:14 -07:00
Bernhard Posselt a58e176852 Merge pull request #4506 from owncloud/oc_avatars 
OC Avatars
 2013-09-14 16:00:36 -07:00
Thomas Müller a0c2c2473a Merge pull request #4501 from owncloud/ajaxfilelist 
Ajax calls for "files" and "files_trashbin" apps
 2013-09-14 12:51:16 -07:00
Thomas Tanghus dcc899d0a0 Merge pull request #4806 from owncloud/oc-dialogs-pageleave 
Don't popup meaningless alerts when dialog called on page leave
 2013-09-14 10:35:39 -07:00
Bart Visscher f58fefe5e2 Check all installed apps for console commands 2013-09-14 17:51:49 +02:00
kondou c117e719da Use external and shared icons in OC.Dialogs.filepicker() 2013-09-14 14:35:23 +02:00
kondou 86143beb6a Remove superfluous $ 2013-09-14 14:15:52 +02:00
Jenkins for ownCloud 556bd1ef23 [tx-robot] updated from transifex 2013-09-13 21:49:24 -04:00
Thomas Müller 4480b0b164 Merge branch 'master' into appframework-master 2013-09-13 23:31:59 +02:00
Thomas Müller 6ff07f7681 Merge pull request #4712 from owncloud/fileapi-foreward 
Provide an implementation of the fileapi for oc6 build on top of the old api
 2013-09-13 14:31:11 -07:00
Thomas Müller 6eeb4d165c - giving the user a new id for each test run in order to prevent reuse of e.g. permissions data in the database 
- setting the current user id because \OC\FilesView relies on \OC_User::getUser()
 2013-09-13 21:44:31 +02:00
Vincent Petry ec2f20f720 Fixed files_trashbin to also use hash URL part for IE8 2013-09-13 21:00:15 +02:00
Thomas Müller 4da8fc6907 Merge branch 'appframework-master' of github.com:owncloud/core into appframework-master 2013-09-13 20:57:18 +02:00
Thomas Müller 5b3388c7c4 Merge branch 'master' into appframework-master 2013-09-13 20:56:49 +02:00