summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-021-1/+1
|
* Merge pull request #10104 from owncloud/s3-overwriteLukas Reschke2014-10-012-43/+52
|\ | | | | Fix S3 copy and rename overwriting target directory
| * Skip test for unsuported feature for amazon s3Robin Appelman2014-09-171-0/+4
| |
| * Fix copy overwrite for amazon s3Robin Appelman2014-09-171-12/+4
| |
| * Fix amazon s3 rename overwriteRobin Appelman2014-09-171-2/+10
| |
| * Fix AmazonS3 rmdir on the rootRobin Appelman2014-09-172-38/+43
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-012-0/+3
| |
* | Use SVG previews for public sharingLukas Reschke2014-09-302-23/+31
| | | | | | | | Fixes https://github.com/owncloud/core/pull/11367#issuecomment-57306037 and https://github.com/owncloud/core/issues/9218
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-303-0/+14
| |
* | Merge pull request #11337 from danbartram/better_encryption_recovery_labelsLukas Reschke2014-09-292-4/+8
|\ \ | | | | | | Add clickable labels to encryption recovery radios
| * | Add clickable labels to encryption recovery radiosDan Bartram2014-09-272-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clickable radio button labels to the encryption recovery settings pages: * settings-admin * settings-personal Pressing on the radio button text now toggles the state of the radio button.
* | | Merge pull request #11347 from mark0n/create_empty_configLukas Reschke2014-09-292-0/+52
|\ \ \ | | | | | | | | Add a CLI command that creates an empty LDAP config
| * | | Add a CLI command that creates an empty LDAP configMartin Konrad2014-09-292-0/+52
| | | | | | | | | | | | | | | | | | | | This is needed to configure the user_ldap app without using the wizard (e.g. using tools like Puppet).
* | | | Merge pull request #10107 from owncloud/sharing_group_sharesLukas Reschke2014-09-298-48/+243
|\ \ \ \ | | | | | | | | | | [sharing] group shares
| * | | | some small fixed, suggested by scrutinizerBjoern Schiessle2014-09-292-4/+4
| | | | |
| * | | | throw a exception if we can't handle the provided pathBjoern Schiessle2014-09-294-3/+75
| | | | |
| * | | | call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all ↵Bjoern Schiessle2014-09-252-6/+61
| | | | | | | | | | | | | | | | | | | | checks are executed, e.g. to check if the share is really visible
| * | | | some small fixesBjoern Schiessle2014-09-252-4/+4
| | | | |
| * | | | clear share table after each test runBjoern Schiessle2014-09-241-0/+3
| | | | |
| * | | | unit tests for grouping of shares pointing to the same sourceBjoern Schiessle2014-09-222-35/+74
| | | | |
| * | | | group shares and combine permissionsBjoern Schiessle2014-09-223-3/+29
| | | | |
* | | | | Merge pull request #11321 from owncloud/ldap-fix-memberof-detectionLukas Reschke2014-09-291-2/+4
|\ \ \ \ \ | | | | | | | | | | | | dn needs to be fetched to be able to detect memberOf support
| * | | | | dn needs to be fetched to be able to detect memberOf supportArthur Schiwon2014-09-261-2/+4
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-293-0/+6
| |_|/ / / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-286-5/+36
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-273-0/+3
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-263-0/+3
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2516-4/+43
| | |
* | | Show a proper error message when trying to scan the filesystem for a non ↵Robin Appelman2014-09-241-1/+5
| | | | | | | | | | | | existing user
* | | Check for blacklisted charactersLukas Reschke2014-09-231-0/+6
| | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/11264 (This should in future get moved to the mountpoint class - but that is something for @icewind1991 ;-))
* | | Merge pull request #11109 from owncloud/nstamm-patch-1Jan-Christoph Borchardt2014-09-231-1/+8
|\ \ \ | | | | | | | | DragnDrop Upload text style
| * | | adjust text size and opacity of drag'n'drop upload text styleJan-Christoph Borchardt2014-09-231-0/+4
| | | |
| * | | DragnDrop Upload text styleNicolas Stamm2014-09-161-1/+4
| | | | | | | | | | | | | | | | The 8px margin was uggly.
* | | | Merge pull request #11234 from owncloud/fix-icon-classesJan-Christoph Borchardt2014-09-236-11/+20
|\ \ \ \ | | | | | | | | | | Fix icon classes, disappeared delete icon
| * | | | force show the loading icon in list for deletion, not only on hoverJan-Christoph Borchardt2014-09-221-0/+9
| | | | |
| * | | | correct progress-icon to icon-loading-smallJan-Christoph Borchardt2014-09-224-10/+10
| | | | |
| * | | | correct delete-icon to icon-delete, fix #11128Jan-Christoph Borchardt2014-09-225-11/+11
| | | | |
* | | | | Merge pull request #11137 from owncloud/enc-pregfixVincent Petry2014-09-2310-113/+384
|\ \ \ \ \ | | | | | | | | | | | | Fix share key pattern matching
| * | | | | Fix share key finding algorithm in various casesVincent Petry2014-09-2310-113/+384
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of inaccurate pattern matching, use the list of users who we know have access to the file to build the list of share keys. This covers the following cases: - Move/copy files into a subfolder within a share - Unsharing from a user - Deleting files directlry / moving share keys to trashbin
* | | | | Merge pull request #11032 from owncloud/harden-redirectLukas Reschke2014-09-231-2/+7
|\ \ \ \ \ | | | | | | | | | | | | Do only follow HTTP and HTTPS redirects
| * | | | | Do only follow HTTP and HTTPS redirectsLukas Reschke2014-09-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server) Get final redirect manually using get_headers() Migrate to HTTPHelper class and add unit tests
* | | | | | Merge pull request #11224 from owncloud/fix_recovery_admin_userLukas Reschke2014-09-231-5/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | first check if a private key exists, if not it is always a recovery szenario
| * | | | | | first check if a private key exists, if not it is always a recovery szenarioBjoern Schiessle2014-09-221-5/+4
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-233-0/+3
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #11186 from owncloud/trash-fixdoubledeleteraceconditionVincent Petry2014-09-221-0/+26
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Added extra check to avoid deleting key folders
| * | | | | Added extra check to avoid deleting key foldersVincent Petry2014-09-191-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a delete operation is called twice in a row, it could happen that the first call already deleted the file. The second call would return an empty $ownerPath because the file does not exist. That empty $ownerPath would run the key deletion operation on the wrong path. This fix adds checks in many places to make sure we don't use $ownerPath when it's empty or null.
* | | | | | Merge pull request #11167 from owncloud/env-movetomountreenableproxyMorris Jobke2014-09-221-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Reenable file proxy when renaming between mount points
| * | | | | Reenable file proxy when renaming between mount pointsVincent Petry2014-09-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When moving a folder into another mount point, $renamedFiles is empty because that goes over a different mechanism. In such case, this fix makes sure that the file proxy is reenable to avoid breaking the subsequent files that are being moved.
* | | | | | fix button text l10nVolkan Gezer2014-09-221-1/+1
| | | | | |
* | | | | | files_sharing: add route for ajax/publicpreviewGeorg Ehrke2014-09-211-0/+2
| | | | | |