summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* improved app description and adjust it to the way the new encryption module ↵Bjoern Schiessle2015-07-221-13/+8
| | | | works
* Merge pull request #17752 from ↵Joas Schilling2015-07-212-4/+81
|\ | | | | | | | | owncloud/enc_migration_fix_mountpoint_detection_8.1 [8.1 backport] fix system wide mount point detection on migration
| * fix mount point detectionBjoern Schiessle2015-07-202-4/+81
| |
* | Merge pull request #17762 from owncloud/backport-17723-stable8.1Morris Jobke2015-07-212-125/+133
|\ \ | | | | | | Backport of #17723 to stable8.1
| * | Backport of #17723 to stable8.1Arthur Schiwon2015-07-202-125/+133
| |/ | | | | | | | | | | fix runtime caching in ldap's user manager, fixes #17631 fix indentation. no code changes, whitespace only.
* | Merge pull request #17704 from owncloud/backport-stable8.1-17255-17526Morris Jobke2015-07-2110-1/+483
|\ \ | |/ |/| Backport stable8.1 #17255 #17526
| * LDAP: when checking group for matching filter, also take base DN into ↵Arthur Schiwon2015-07-174-2/+96
| | | | | | | | consideration. Fixes #17516
| * Backport of 17255 to stable8.1Arthur Schiwon2015-07-179-1/+389
| | | | | | | | | | | | | | | | | | | | ensure groups match filter when using memberOf to read users group, refs #17119 integration test adjust unit test tests solidity
* | unit testsBjoern Schiessle2015-07-171-2/+36
| |
* | don't move keys if the key where already moved in a previous migration runBjoern Schiessle2015-07-174-21/+79
|/
* Merge pull request #17678 from ↵Thomas Müller2015-07-174-8/+71
|\ | | | | | | | | owncloud/backport-encryption_migration_improvements-stable8.1 Backport encryption migration improvements stable8.1
| * only create new key pair if both keys are missingBjoern Schiessle2015-07-162-7/+68
| |
| * only cleanUp the remaining keys if the migration really finished succesfullyBjoern Schiessle2015-07-162-1/+3
| |
* | Merge pull request #17679 from owncloud/backport-fix_trashbin-stable8.1Thomas Müller2015-07-172-2/+62
|\ \ | | | | | | only move real files to the trash bin
| * | only move real files to the trash binBjoern Schiessle2015-07-162-2/+62
| |/
* | Merge pull request #17676 from owncloud/backport-files-scan-user-path-stable8.1Morris Jobke2015-07-161-4/+5
|\ \ | |/ |/| Lock scanner to the given user
| * Lock scanner to the given userRobin Appelman2015-07-161-4/+5
| |
* | Merge pull request #17653 from ↵Morris Jobke2015-07-161-0/+130
|\ \ | |/ |/| | | | | owncloud/backport-17330-share-group-path-exception [stable8.1] Fix the path for users which have an exception for a group share
| * Add test case when owner renames shared folderVincent Petry2015-07-151-5/+8
| |
| * Add unit test for getUsersSharingFileVincent Petry2015-07-151-0/+127
| | | | | | | | | | This is to test if the user list and paths are correct, even when a recipient renamed the received shared folder
* | Merge pull request #17658 from owncloud/share-lock-owner-parent-stable81Vincent Petry2015-07-163-10/+134
|\ \ | | | | | | [8.1] lock parent folders for the owner when locking a shared file as recipient
| * | only lock the parent foldersRobin Appelman2015-07-152-2/+13
| | |
| * | lock parent folders for the owner when locking a shared file as recipientRobin Appelman2015-07-153-10/+123
| |/
* | Merge pull request #17556 from owncloud/enc_fix_migration_stable8.1Vincent Petry2015-07-162-14/+82
|\ \ | | | | | | [stable8.1 backport] more secure way to update the database
| * | more secure way to update the databaseBjoern Schiessle2015-07-102-14/+82
| |/
* | Merge pull request #17294 from owncloud/stable8.1-s2s-catchmoreexceptiontypesMorris Jobke2015-07-161-13/+7
|\ \ | | | | | | [stable8.1] Catch more error codes thrown by federated shares
| * | Throw storage not available on guzzle errorVincent Petry2015-07-131-1/+1
| | | | | | | | | | | | | | | | | | If the remote server is in maintenance mode, we must throw storage not available exception instead of not found which might auto-remove the share.
| * | Catch more error codes thrown by federated sharesVincent Petry2015-07-011-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | Most of the time it doesn't make sense to forward Guzzle's RequestException, so we convert it to StorageNotAvailable instead. This prevents unpredictable error codes to block access to unrelated folders needlessly.
* | | Merge pull request #17337 from owncloud/stable8.1-backport-17077Morris Jobke2015-07-151-3/+5
|\ \ \ | |_|/ |/| | [stable8.1] fix getting mount points when passing a path to the files:scan command
| * | handle error during setupRobin Appelman2015-07-021-3/+5
| |/
* | Merge pull request #17332 from ↵Morris Jobke2015-07-082-2/+8
|\ \ | | | | | | | | | | | | owncloud/fix-temporary-mountpoint-name-in-activities Fix the mount point name before creating the activities
| * | Use the item name when refering to the unaccepted remote shareJoas Schilling2015-07-022-2/+8
| |/
* | Merge pull request #17370 from ↵Morris Jobke2015-07-082-1/+18
|\ \ | | | | | | | | | | | | owncloud/stable8.1-share-onlyshowstaticownerifavailable [stable8.1] Do not show static share owner if not available
| * | Do not show static share owner if not availableVincent Petry2015-07-032-1/+18
| | | | | | | | | | | | | | | | | | | | | In some corner cases, an outgoing share exists but sharing is not allowed for the current user. This would cause the file list to break because the static text could not be rendered as the owner was undefined.
* | | remove duplicate ID in HTML template for public sharesMorris Jobke2015-07-062-2/+2
|/ /
* | Merge pull request #17317 from owncloud/stable81-clean-ocsidLukas Reschke2015-07-025-5/+5
|\ \ | | | | | | [stable8.1] Delete OCS ID from DB if none is specified
| * | Bump versionsLukas Reschke2015-07-025-5/+5
| |/
* / [stable81] Remove OCS IDsLukas Reschke2015-07-025-5/+0
|/ | | | | | While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307 Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
* Fixing ctor calls and ctor itself to not break usage in calendar and ↵Thomas Müller2015-06-292-2/+2
| | | | contacts .....
* Merge pull request #17083 from owncloud/share-etag-update-targetVincent Petry2015-06-292-10/+38
|\ | | | | take share target into account when updating recipient etags
| * Unit test for etag update on custom share folderVincent Petry2015-06-261-8/+36
| |
| * take share target into account when updating recipient etagsRobin Appelman2015-06-221-2/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2936-4/+44
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2822-10/+68
| |
* | Add missing annotations for parametersLukas Reschke2015-06-272-9/+16
| |
* | Merge pull request #17163 from owncloud/update-licensesLukas Reschke2015-06-27118-114/+327
|\ \ | | | | | | Update license headers
| * | update license headers and authorsMorris Jobke2015-06-25118-114/+327
| | |
* | | Merge pull request #17199 from ↵Lukas Reschke2015-06-272-0/+19
|\ \ \ | | | | | | | | | | | | | | | | owncloud/feature/show-error-when-shareservice-dies add check if server returns a 500 and display error
| * | | add check if server returns a 500 and display errorClark Tomlinson2015-06-262-0/+19
| | | | | | | | | | | | | | | | resolves https://github.com/owncloud/core/issues/17170
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2718-4/+46
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-23 01:43:33 +0000