summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21666 from owncloud/smb-statcache-cap-82Vincent Petry2016-01-131-1/+8
|\
| * cap the number of entries we cache in smb's statcacheRobin Appelman2016-01-121-1/+8
* | always use an LDAP URL when connecting to LDAPArthur Schiwon2016-01-114-18/+178
* | only use master key ID if a user is logged in. Otherwise keep the public link...Björn Schießle2016-01-112-16/+69
* | Check libsmbclient-php as well as smbclient binaryRobin McCorkell2016-01-091-2/+4
* | Merge pull request #21313 from owncloud/scanner-skip-not-available-82Vincent Petry2015-12-242-2/+6
|\ \
| * | Skip unavailable storages in scannerRobin Appelman2015-12-212-2/+6
| |/
* / [Sharing] Respect disabled incoming federated sharesRoeland Jago Douma2015-12-181-1/+3
|/
* Merge pull request #21197 from owncloud/backport-21133-stable8.2Vincent Petry2015-12-154-9/+203
|\
| * throw NoUserException in getHome when the requested user does not exist anymoreArthur Schiwon2015-12-144-9/+203
* | Merge pull request #21211 from owncloud/stable8.2-handle-enforce-home-folder-...Vincent Petry2015-12-152-2/+7
|\ \
| * | properly preserve home folder naming enforcement settingMorris Jobke2015-12-152-2/+7
* | | Fixed JS unit tests for fed owner display nameVincent Petry2015-12-141-0/+4
* | | show display name but internally use the user nameBjörn Schießle2015-12-146-6/+11
* | | don't allow to create a federated share if source and target server are the sameBjörn Schießle2015-12-141-0/+8
|/ /
* | Handle non existing files in version previewsRobin Appelman2015-12-141-7/+11
* | Bring back delete permission in share overviewVincent Petry2015-12-142-27/+11
|/
* Merge pull request #21157 from owncloud/trashbin-loggedout-82Thomas Müller2015-12-142-2/+16
|\
| * skip test if we cant use the filesystem when not logged inRobin Appelman2015-12-111-2/+5
| * Fix thrashbin wrapper when no user is loggedinRobin Appelman2015-12-112-2/+13
* | Bring back file delete action text to be based on contextVincent Petry2015-12-113-5/+49
|/
* Merge pull request #21115 from owncloud/stable8.2-backport-21109Roeland Douma2015-12-102-37/+10
|\
| * Deduplicate version expire jobsMorris Jobke2015-12-102-37/+10
* | Merge pull request #21090 from owncloud/backport-20995-stable8.2Vincent Petry2015-12-101-1/+5
|\ \
| * | ensure multiselect always receives an array when setting its value, fixes #18734Arthur Schiwon2015-12-091-1/+5
* | | Merge pull request #21101 from owncloud/stable8.2_20989Morris Jobke2015-12-101-0/+41
|\ \ \ | |_|/ |/| |
| * | Update parent when moving share into recieved shareRoeland Jago Douma2015-12-101-0/+41
| |/
* | Merge pull request #21044 from owncloud/group-propagation-82Vincent Petry2015-12-108-116/+311
|\ \
| * | fix etag propagation with group resharesRobin Appelman2015-12-094-13/+65
| * | Add test case for group share propagationRobin Appelman2015-12-094-103/+246
* | | Merge pull request #21080 from owncloud/stable8.2-share-computesharepermissio...Roeland Douma2015-12-103-4/+14
|\ \ \ | |_|/ |/| |
| * | Add reshare permission checksVincent Petry2015-12-092-1/+8
| * | Compute share permissions in the viewVincent Petry2015-12-091-3/+6
* | | Add testsRobin Appelman2015-12-091-0/+50
* | | Dont set the string storage id to the numeric storage id for personal mountsRobin Appelman2015-12-091-4/+4
|/ /
* / passing an empty base in this diagnosis call will not result in LDAP errorsArthur Schiwon2015-12-081-1/+1
|/
* Only return the exact match, when it's allowedJoas Schilling2015-12-032-12/+41
* update germand translation to fit into the UIMorris Jobke2015-12-014-4/+4
* Merge pull request #20488 from owncloud/backport-20487-8.2Thomas Müller2015-12-012-7/+23
|\
| * Add a unit test that executes the queryJoas Schilling2015-11-181-0/+13
| * Oracle can not return statements but only valuesJoas Schilling2015-11-182-7/+10
* | Fix the width of the share with inputMorris Jobke2015-11-301-1/+1
* | Deduplicate queued trashbin expire jobsMorris Jobke2015-11-273-26/+12
* | Dont output paths in scan.phpRobin Appelman2015-11-261-8/+0
* | Merge pull request #20535 from owncloud/stable8.2-fakelocking-for-macVincent Petry2015-11-252-2/+4
|\ \
| * | [stable8.2] Add fake locker pluginLukas Reschke2015-11-162-2/+4
| |/
* / Use proper variableLukas Reschke2015-11-181-1/+1
|/
* Backport of #20093 and #20124Arthur Schiwon2015-11-105-9/+59
* make all the buttons beautifulArthur Schiwon2015-11-097-12/+26
* Merge pull request #20361 from owncloud/stable8.2-extstorage-gdrive-forceappr...Vincent Petry2015-11-091-0/+1
|\