summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-0322-42/+100
|
* Merge pull request #13817 from owncloud/core-apps-dependenciesMorris Jobke2015-02-022-0/+6
|\ | | | | encryption requires openssl and user_ldap requires ldap :speak_no_evil:
| * encryption requires openssl and user_ldap requires ldap :speak_no_evil:Thomas Müller2015-02-022-0/+6
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-028-12/+22
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-016-2/+6
| |
* | Merge pull request #13797 from owncloud/fix_move_del_of_remote_sharesLukas Reschke2015-01-313-3/+3
|\ \ | | | | | | make sure that we get the correct user from the path
| * | no need to initialize the same view twiceBjoern Schiessle2015-01-301-1/+0
| | |
| * | get correct user for paths to the trash bin, needed for remote shares if the ↵Bjoern Schiessle2015-01-302-2/+3
| | | | | | | | | | | | size of of trash gets calculated
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-3144-86/+120
| |/ |/|
* | Merge pull request #13508 from owncloud/failed-delete-cacheMorris Jobke2015-01-303-4/+46
|\ \ | |/ |/| Dont remove a file from cache if the delete operation failed
| * Dont do a cache rename if we cant delete the source fileRobin Appelman2015-01-291-1/+3
| |
| * Make sure we delete the file when doing a cross storage trashbin moveRobin Appelman2015-01-291-0/+2
| |
| * Detect failed deletes in the trashbinRobin Appelman2015-01-292-3/+41
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-3064-66/+42
| |
* | Merge pull request #13760 from owncloud/create_enc_key_for_remote_sharesMorris Jobke2015-01-292-57/+118
|\ \ | | | | | | make sure that we always create a public share key for remote shares
| * | Fix intendationJoas Schilling2015-01-291-3/+3
| | |
| * | Fix more assertionsJoas Schilling2015-01-291-26/+26
| | |
| * | Fix 2 assertionsJoas Schilling2015-01-291-3/+3
| | |
| * | make sure that we always create a public share key for remote sharesBjoern Schiessle2015-01-292-32/+93
| | |
* | | Merge pull request #13728 from owncloud/federated_cloudThomas Müller2015-01-292-5/+5
|\ \ \ | |_|/ |/| | rename 'server-to-server sharing' to 'federated cloud'
| * | rename 'server-to-server sharing' to 'federated cloud'Bjoern Schiessle2015-01-292-5/+5
| |/
* | Merge pull request #13746 from owncloud/no-groups-provisioning-apiThomas Müller2015-01-292-1/+5
|\ \ | | | | | | disallow provisioning api to be enabled for groups only
| * | disallow provisioning api to be enabled for groups onlyThomas Müller2015-01-292-1/+5
| | |
* | | Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-stepThomas Müller2015-01-293-21/+115
|\ \ \ | | | | | | | | adding console command to migrate encryption keys - refs #13450
| * | | user fs must be setup up, so that the real user folder is mounted on the ↵Arthur Schiwon2015-01-221-0/+1
| | | | | | | | | | | | | | | | username based path
| * | | adding console command to migrate encryption keys - refs #13450Thomas Müller2015-01-223-21/+114
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2924-0/+48
| |/ / |/| |
* | | Merge pull request #13401 from is-apps/amazon_s3_checkboxesThomas Müller2015-01-281-1/+7
|\ \ \ | | | | | | | | Tidy formatting of Amazon S3 checkboxes
| * | | Align checkbox configuration in external filesRoss Nicoll2015-01-191-1/+7
| | | | | | | | | | | | | | | | | | | | Modified CSS for files_external application to render labels around checkboxes at the same width as other input elements, aligning them with other elements on the same page.
* | | | Fix trash error when deleting files with the same name at the same time ↵Robin Appelman2015-01-281-0/+3
| |_|/ |/| | | | | | | | (happens in unit tests)
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2814-10/+46
| | |
* | | Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorageMorris Jobke2015-01-284-25/+144
|\ \ \ | | | | | | | | Catch storage exception in scanner for remote shares
| * | | Add back exit()Vincent Petry2015-01-261-1/+1
| | | |
| * | | Catch storage exception in scanner for remote sharesVincent Petry2015-01-264-25/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever an exception occurs during scan of a remote share, the share is checked for availability. If the storage is gone, it will be removed automatically. Also, getDirectoryContent() will now skip unavailable storages.
* | | | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefixVincent Petry2015-01-277-4/+226
|\ \ \ \ | | | | | | | | | | Call final unlink in trash wrapper's storage
| * | | | Fix bogus deletion on copy + unlink through renameVincent Petry2015-01-263-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Cross-storage rename would cause copy + unlink. That unlink operation must not trigger the trashbin.
| * | | | Add trashbin storage wrapper unit test for versionsVincent Petry2015-01-231-6/+76
| | | | |
| * | | | Simplify trash storage unit testsVincent Petry2015-01-231-46/+16
| | | | | | | | | | | | | | | | | | | | Needed to make it properly init the mount points
| * | | | Unregister trashbin storage wrapper at the end of testsVincent Petry2015-01-232-0/+4
| | | | | | | | | | | | | | | | | | | | Some more tests that uses the storage wrapper now remove it afterwards
| * | | | Preserve mtime when doing cross storage moveRobin Appelman2015-01-231-41/+2
| | | | |
| * | | | Remove storage wrapper for oc_trashbin in unit testVincent Petry2015-01-231-0/+2
| | | | |
| * | | | Only move files from the current user to the trashbinRobin Appelman2015-01-231-4/+5
| | | | |
| * | | | Call final unlink in trash wrapper's storageVincent Petry2015-01-234-2/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of cross-storage delete, the files are copied to the trash, then deleted. The final delete on the source storage would still reach the trash wrapper. This fix makes forwards that second call to the wrapped storage to make the final delete work. It fixes the issue with remote shares, local shares and external storage. Also, it uses a new function "renameRecursive" that renames the files and preserves the mtimes (like "copy_recursive" did in the past))
* | | | | Allow saving incomplete external storage configVincent Petry2015-01-272-2/+67
| | | | | | | | | | | | | | | | | | | | This is needed for Dropbox and others that need a token.
* | | | | Fix mount config unit test failuresVincent Petry2015-01-271-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because setStorageId now instantiates storages, they might throw exceptions if arguments are missing. This fixes the unit test to not throw exceptions and have their default config arguments set.
* | | | | Merge pull request #13679 from owncloud/public-disablesharejspluginThomas Müller2015-01-273-3/+30
|\ \ \ \ \ | | | | | | | | | | | | Disable JS plugin for sharing in public mode
| * | | | | Do not disclose share owner in public file listVincent Petry2015-01-261-1/+4
| | | | | |
| * | | | | Disable JS plugin for sharing in public modeVincent Petry2015-01-262-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the logic that registers the share action and modifies the rows. Share actions aren't needed in the public file list.
* | | | | | Merge pull request #13691 from owncloud/s2s-acceptsinglefileThomas Müller2015-01-272-4/+124
|\ \ \ \ \ \ | | | | | | | | | | | | | | Only reload file list after remote share accept request returns
| * | | | | | Only reload file list after remote share accept request returnsVincent Petry2015-01-262-4/+124
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | When accepting a remote share, an ajax request is sent to the server. Only once this request returns should the file list be reloaded.