aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Change support message to be more explicit about the enterprise editionMorris Jobke2014-12-201-1/+1
|
* Fix Undefined variable: result at tags.php#231derkostka2014-12-191-4/+4
| | | | | | | | | | Fix app":"PHP","message":"Undefined variable: result at \/var\/www\/owncloud\/lib\/private\/tags.php#231" by moving the function call into the respective loop Adjust indentation Do it right - indentation sorry, this is my first one
* Merge pull request #12749 from owncloud/server2server-sharing-ngBjörn Schießle2014-12-196-77/+295
|\ | | | | server to server sharing next generation
| * Next step in server-to-server sharing next generation, see #12285Bjoern Schiessle2014-12-196-77/+295
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Beside some small improvements and bug fixes this will probably the final state for OC8. To test this you need to set up two ownCloud instances. Let's say: URL: myPC/firstOwnCloud user: user1 URL: myPC/secondOwnCloud user: user2 Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud". The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined. If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
* | Merge pull request #12101 from owncloud/ldap_split_mappingblizzz2014-12-191-0/+1
|\ \ | |/ |/| Ldap split mapping from Access superclass
| * Split mapping from Access and Helper classes into it's own. Fully test them, ↵Arthur Schiwon2014-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | too. remove unused methods split mapping methods off from Access class fix DB query handling move 'clear mapping' methods from static helper to new mapping class add tests test directly with DB finishing tests and fix return value from setDNbyUUID add corresponding class for groups and make abstract test class neutral. helper tests is now obsolete as the tested functions were moved to the new mapper class. add missing info to PHPDoc add unmap method fix namespaces fix test inheritance PHPDoc and a small code restructure for scrutinizer, no effective changes PostgreSQL does not accept LIMIT in DELETE queries phpdoc fixes, no code changes
* | Merge pull request #12923 from owncloud/ultra-slim-version-of-incognito-modeLukas Reschke2014-12-192-0/+12
|\ \ | | | | | | Add ultra-slim hack for incognito mode
| * | Add ultra-slim hack for incognito modeLukas Reschke2014-12-172-0/+12
| | | | | | | | | | | | As discussed at https://github.com/owncloud/core/pull/12912#issuecomment-67391155
* | | Merge pull request #12956 from owncloud/jenkins-user-backend-namesThomas Müller2014-12-195-6/+38
|\ \ \ | |_|/ |/| | [jenkins only] introduce names for user backends - IUserBackend
| * | introduce names for user backends - IUserBackendMorris Jobke2014-12-195-6/+38
| | | | | | | | | | | | * LDAP with multiple servers also proved backendName
* | | Merge pull request #12954 from owncloud/hhvm-apc-clearLukas Reschke2014-12-191-1/+1
|\ \ \ | | | | | | | | HHVM: In APC cache clear, only request the cache key in APCIterator.
| * | | HHVM: In APC cache clear, only request the cache key in APCIterator.Andreas Fischer2014-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default value of the $format parameter of the APCIterator constructur is APC_ITER_ALL which instructs the iterator to provide all available information on cache values being iterated over. Only the key value is necessary for matching and deletion via apc_delete(), though. This prevents a "Format values FILENAME, DEVICE, INODE, MD5, NUM_HITS, MTIME, CTIME, DTIME, ATIME, REFCOUNT not supported yet." notice on HHVM.
* | | | Merge pull request #12918 from owncloud/use-uid-instead-of-login-nameMorris Jobke2014-12-191-1/+1
|\ \ \ \ | | | | | | | | | | Return UID instead of login name
| * | | | Return UID instead of login nameLukas Reschke2014-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | Without this OCS on LDAP is broken for API requests coming via Basic Authentication...
* | | | | Merge pull request #12865 from owncloud/files-tags-webdavMorris Jobke2014-12-195-7/+431
|\ \ \ \ \ | |_|/ / / |/| | | | Returns tags through WebDAV
| * | | | Fix code style issues for tags pluginVincent Petry2014-12-183-6/+4
| | | | |
| * | | | Remove obsolete methodVincent Petry2014-12-181-8/+0
| | | | |
| * | | | Returns and update tags through WebDAV PROPFIND and PROPPATCHVincent Petry2014-12-175-7/+441
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added oc:tags and oc:favorites in PROPFIND response. It is possible to update them with PROPPATCH. These properties are optional which means they need to be requested explicitly
* | | | | Merge pull request #12748 from owncloud/redis_cacheMorris Jobke2014-12-192-1/+97
|\ \ \ \ \ | | | | | | | | | | | | Add Redis cache implementation, prefer over memcached, tests & config sample doc
| * | | | | Add Redis cache implementation, prefer over memcached, tests & config sampleJörn Friedrich Dreyer2014-12-102-1/+97
| | | | | |
* | | | | | Merge pull request #12879 from owncloud/mountconfigMorris Jobke2014-12-187-19/+95
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add mount specific options
| * | | | | | Allow disabling previews per mountRobin Appelman2014-12-171-0/+5
| | | | | | |
| * | | | | | Add getMountPoint to FileInfoRobin Appelman2014-12-175-17/+59
| | | | | | |
| * | | | | | Load mount specific options from the mount configRobin Appelman2014-12-171-2/+31
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #12759 from owncloud/core-reduce-js-and-cssJörn Friedrich Dreyer2014-12-181-9/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | make sure styles and scripts are only loaded once
| * | | | | | make sure styles and scripts are only loaded onceThomas Müller2014-12-161-9/+25
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #12945 from owncloud/hhvm-imageMorris Jobke2014-12-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | HHVM: Do not call filesize(null), this function expects a string.
| * | | | | | Do not call filesize(null), this function expects a string.Andreas Fischer2014-12-181-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | filesize(null) yields an int on HHVM and thus exif_imagetype(null) is called.
* | | | | | Merge pull request #12940 from drarko/masterMorris Jobke2014-12-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix extra quotes in custom tags in header
| * | | | | | Fix extra quotes in custom tags in headerdrarko2014-12-181-1/+1
| |/ / / / / | | | | | | | | | | | | Fix #12939
* | | | | | Merge pull request #12907 from owncloud/delete-invalid-external-shareRobin Appelman2014-12-181-0/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix deleting invalid s2s shares
| * | | | | Movable mountpoints are always deletableRobin Appelman2014-12-171-0/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #12901 from owncloud/move-ldap-check-to-managerRobin McCorkell2014-12-182-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Move the Null-Byte LDAP check to the user manager
| * | | | | Move the Null-Byte LDAP check to the user managerLukas Reschke2014-12-172-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The existing method is deprecated and just a wrapper around the manager method. Since in the future other code paths might call this function instead we need to perform that check here. Related to http://owncloud.org/security/advisory/?id=oc-sa-2014-020
* | | | | Merge pull request #12913 from owncloud/hhvm-memcached-clearRobin McCorkell2014-12-181-1/+7
|\ \ \ \ \ | | | | | | | | | | | | HHVM: Add workaround for missing Memcached::deleteMulti()
| * | | | | HHVM: Add workaround for missing Memcached::deleteMulti()Andreas Fischer2014-12-171-1/+7
| |/ / / /
* | | | | Merge pull request #12917 from owncloud/fix-ocs-12915-apiMorris Jobke2014-12-182-6/+16
|\ \ \ \ \ | |_|_|_|/ |/| | | | Move basic auth login out of `isLoggedIn`
| * | | | Store result of authenticationLukas Reschke2014-12-171-1/+7
| | | | |
| * | | | Move basic auth login out of `isLoggedIn`Lukas Reschke2014-12-171-5/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/12915 and opens the door for potential other bugs... Please test very carefully, this includes: - Testing from OCS via cURL (as in #12915) - Testing from OCS via browser (Open the "Von Dir geteilt" shares overview) - WebDAV - CalDAV - CardDAV
* | | | Merge pull request #12892 from owncloud/is-addminMorris Jobke2014-12-173-4/+39
|\ \ \ \ | | | | | | | | | | Add isAdmin and isInGroup methods for the group manager
| * | | | add isAdmin and isInGroup methods for the group managerBernhard Posselt2014-12-172-4/+29
| | | | |
| * | | | add a isLoggedIn method to the usersession and deprecate the isLoggedIn ↵Bernhard Posselt2014-12-172-0/+10
| |/ / / | | | | | | | | | | | | method on the api
* / / / HHVM: Call libxml_use_internal_errors() instead of surpressing errors.Andreas Fischer2014-12-171-1/+2
|/ / / | | | | | | | | | In contrast to the previous solution, this also works on HHVM.
* | | Merge pull request #12889 from owncloud/deprecation-timeThomas Müller2014-12-172-0/+15
|\ \ \ | | | | | | | | Deprecate old and replaced appframework apis
| * | | first round of deprecationBernhard Posselt2014-12-162-0/+15
| |/ /
* / / Move timezone logic out of server.phpJoas Schilling2014-12-162-23/+82
|/ /
* | Merge pull request #12360 from owncloud/files-tagsLukas Reschke2014-12-151-1/+6
|\ \ | | | | | | Add favorites to files app
| * | Return file info from Node APIVincent Petry2014-12-151-1/+6
| | |
* | | Merge pull request #12555 from owncloud/app_specific_searchJörn Friedrich Dreyer2014-12-151-9/+12
|\ \ \ | | | | | | | | introduce inApps[] filter for search via ajax query
| * | | introduce inApps[] filter for search via ajax query, make file results show ↵Jörn Friedrich Dreyer2014-12-101-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | up in files app only use more flexible return type check array with !empty instead of count
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 07:52:00 +0000