summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed undefined variable $dnGroup and variable namealexweirig2016-02-031-7/+7
| | | | | I renamed $memberURL into $dynamicGroup and print that variable in the writeLog. I think this makes more sense.
* Refactored code to avoid performance problemalexweirig2016-02-031-41/+37
| | | | | Moved the dynamic group processing to the top and removed condition in memberOf processing. Also, changed variable name $value to $memberUrl
* code changes for user_ldap Dynamic Group MembershipAlex Weirig2016-02-034-5/+108
| | | | | | | | | | | Added new setting of “Dynamic Group Member URL” (ldapDynamicGroupMemberURL) - see LDAP settings advanced tab. Added public function getDynamicGroupMembers. Updated function _groupMembers. Updated function getUserGroups.
* Merge pull request #22101 from owncloud/comments-filerowThomas Müller2016-02-0313-12/+430
|\ | | | | Add file row indicator for unread comments
| * Reset comments read marker after loading commentsVincent Petry2016-02-038-11/+235
| |
| * Add file row indicator for unread commentsVincent Petry2016-02-036-1/+195
| |
* | Merge pull request #22088 from owncloud/share2_ishareThomas Müller2016-02-0313-690/+603
|\ \ | | | | | | [Share 2.0] Pass around userid/groupid/federatedid
| * | [Share 2.0] Fix public link sharingRoeland Jago Douma2016-02-032-26/+32
| | |
| * | [Share 2.0] Fix OCS endpointRoeland Jago Douma2016-02-032-108/+123
| | |
| * | [Share 2.0] Fix shareManagerRoeland Jago Douma2016-02-034-233/+254
| | |
| * | [Share 2.0] Fix defaultshare providerRoeland Jago Douma2016-02-033-307/+169
| | |
| * | [Share 2.0] Use strings for idsRoeland Jago Douma2016-02-033-17/+26
|/ / | | | | | | | | | | | | | | | | | | | | * sharedWith * sharedBy * shareOwner Now all set/get strings with the id. (userId, groupId, federatedsharerId). This to avoid a huge amount of if statements
* | Merge pull request #22106 from owncloud/use-newly-generated-keysDaniel Molkentin2016-02-034-155/+57
|\ \ | | | | | | Use newly generated certificate authority
| * | Use newly generated certificate authorityLukas Reschke2016-02-034-155/+57
|/ /
* | Merge pull request #22086 from RealRancor/RealRancor-patch-1Thomas Müller2016-02-031-1/+0
|\ \ | | | | | | Remove files_locking from shipped.json
| * | Remove files_locking from shipped.jsonRealRancor2016-02-031-1/+0
| | |
* | | Merge pull request #22095 from owncloud/public_link_with_portThomas Müller2016-02-033-12/+23
|\ \ \ | | | | | | | | Public link downloads should work on instance on non default port
| * | | Construct valid URLRoeland Jago Douma2016-02-032-10/+4
| | | |
| * | | host and hostname are different thingsRoeland Jago Douma2016-02-031-2/+19
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | host can contain the port (host of http://example.com:1234 is example.com:1234) while hostname never contains a port. They can however be similar. If you navigate to http://example.com then both host and hostname will be example.com. * Fixed docs * added getHostName function
* | | Merge pull request #22071 from owncloud/cache-split-insertThomas Müller2016-02-034-44/+90
|\ \ \ | | | | | | | | split cache->insert from cache->put
| * | | split cache->insert from cache->putRobin Appelman2016-02-034-44/+90
| | | |
* | | | Merge pull request #22098 from owncloud/cleanup-core-appsThomas Müller2016-02-036-12/+4
|\ \ \ \ | | | | | | | | | | Cleanup core apps
| * | | | Make sure tests don't leave a stray directory behindJoas Schilling2016-02-031-3/+3
| | | | |
| * | | | Make sure encryption has a valid licence tagJoas Schilling2016-02-031-1/+1
| | | | |
| * | | | Remove deprecated and unused standalone tagJoas Schilling2016-02-032-2/+0
| | | | |
| * | | | Remove invalid app user doc linksJoas Schilling2016-02-032-6/+0
| | |_|/ | |/| |
* | | | Merge pull request #21996 from owncloud/flysystem-1.0.16Thomas Müller2016-02-031-0/+0
|\ \ \ \ | | | | | | | | | | [3rdparty] Bump flysystem to 1.0.16
| * | | | [3rdparty] Bump flysystem to 1.0.16Roeland Jago Douma2016-02-011-0/+0
| | | | |
* | | | | Merge pull request #22070 from owncloud/share2_exceptionsThomas Müller2016-02-0310-53/+70
|\ \ \ \ \ | | | | | | | | | | | | Add sharing exceptions to OCP
| * | | | | [Share 2.0] Use GenericShareExceptionRoeland Jago Douma2016-02-024-41/+22
| | | | | |
| * | | | | [Share 2.0] Add exceptions to OCPRoeland Jago Douma2016-02-0210-15/+51
| | | | | |
* | | | | | Merge pull request #22099 from ↵Thomas Müller2016-02-033-21/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | owncloud/revert-22090-skip-migration-tests-setting Revert "setting to skip migration tests by default"
| * | | | | Revert "setting to skip migration tests by default"Morris Jobke2016-02-033-21/+0
|/ / / / /
* | | | | Merge pull request #21997 from owncloud/checksumsThomas Müller2016-02-039-10/+82
|\ \ \ \ \ | | | | | | | | | | | | Checksums
| * | | | | Add store/retrieve checksumsRoeland Jago Douma2016-02-039-10/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add extra db column to filecache * Bump version * Update filecache code to actually handle checksum * Webdav code to store/retrieve checksums
* | | | | | Merge pull request #22081 from owncloud/mount-cache-invalid-storageThomas Müller2016-02-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | filter invalid storages from the mount cache early
| * | | | | | filter invalid storages from the mount cache earlyRobin Appelman2016-02-021-1/+1
| | | | | | |
* | | | | | | Merge pull request #22084 from owncloud/configphp-fixesThomas Müller2016-02-031-15/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | small corrections; Web is capitalized, webroot is one lowercase word
| * | | | | | | small corrections; Web is capitalized, webroot is one lowercase wordCarla Schroder2016-02-031-15/+15
| | | | | | | |
* | | | | | | | Merge pull request #22090 from owncloud/skip-migration-tests-settingThomas Müller2016-02-033-0/+21
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | setting to skip migration tests by default
| * | | | | | | setting to skip migration tests by defaultMorris Jobke2016-02-033-0/+21
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * if you install owncloud via package it is not possible to skip migration tests * this also allows to disable migration tests for an instance by default
* | | | | | | Merge pull request #21772 from owncloud/occ-external-applicableThomas Müller2016-02-034-0/+432
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add occ command to manage applicables
| * | | | | | | Add occ command to manage applicablesRobin Appelman2016-02-024-0/+432
| | | | | | | |
* | | | | | | | Merge pull request #21961 from owncloud/comments-guiThomas Müller2016-02-0318-24/+940
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Comments GUI in files sidebar
| * | | | | | | Add comments app to expected apps in testVincent Petry2016-02-021-1/+2
| | | | | | | |
| * | | | | | | Fixed report nameVincent Petry2016-02-021-2/+2
| | | | | | | |
| * | | | | | | Added JS unit tests for commentsVincent Petry2016-02-025-6/+320
| | | | | | | |
| * | | | | | | Add spinner when submitting commentsVincent Petry2016-02-022-7/+32
| | | | | | | |
| * | | | | | | Fix parsing empty Webdav property nodesVincent Petry2016-02-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return empty string instead of undefined
| * | | | | | | Fix formatting messages with newlinesVincent Petry2016-02-021-2/+11
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-23 00:44:46 +0000