aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-071-5/+5
|
* get owner from share item, if we expire a share while the user updates his ↵Bjoern Schiessle2013-12-051-2/+6
| | | | /Shared folder than the owner is different from the currently logged in user
* fix trashbin and pbulic page controlsMorris Jobke2013-12-031-0/+4
|
* fix and cleanup CSS for public pageMorris Jobke2013-12-031-3/+2
|
* change different shades of grey for public share page to whiteJan-Christoph Borchardt2013-12-031-10/+14
|
* remove app specific codeJan-Christoph Borchardt2013-12-031-4/+0
|
* fix details for buttons in header and controls barJan-Christoph Borchardt2013-12-031-1/+5
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-11-291-1/+10
|
* make sure that we don't try to access an already deleted files, fixes some ↵Bjoern Schiessle2013-11-281-7/+16
| | | | file source not found warnings
* Merge pull request #6088 from owncloud/fix_public_previewsBjörn Schießle2013-11-271-3/+7
|\ | | | | fix public preview creation if a user is logged in
| * fix public preview creation if a user ios logged inBjoern Schiessle2013-11-271-3/+7
| |
* | Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trashBjörn Schießle2013-11-272-1/+7
|\ \ | |/ |/| move files to owners trash
| * Fixed sharing hook to not remove the share before the trashbinVincent Petry2013-11-272-1/+7
| | | | | | | | Fixed the hook order between sharing app and trashbin
* | Merge branch 'master' into encryption_enable_public_uploadBjoern Schiessle2013-11-273-2/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/helper.php apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/keymanager.php
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-11-261-1/+2
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-11-241-1/+3
| |
| * disable trahs in files_sharing/public.phpBjoern Schiessle2013-11-211-0/+1
| |
| * fix undefined index errors if public share viewBjoern Schiessle2013-11-211-0/+6
| |
* | public upload now also works with encryption enabledBjoern Schiessle2013-11-211-3/+0
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-11-152-2/+13
|
* readd sharing token to public templateJörn Friedrich Dreyer2013-11-152-0/+2
| | | | necessary for https://github.com/owncloud/apps/pull/1476
* Use View::copy and View::rename when copying or renaming files in the shared ↵Robin Appelman2013-11-111-59/+47
| | | | storage
* Merge pull request #5701 from owncloud/sharing-updateownerfoldersizesMorris Jobke2013-11-115-111/+335
|\ | | | | Fixed watcher to also update the owner's folder sizes
| * Fixed unit tests for files sharing watcherVincent Petry2013-11-062-3/+3
| |
| * Added unit tests for shared files watcherVincent Petry2013-11-054-108/+317
| | | | | | | | | | | | - Added base class for sharing unit tests - Added unit tests for shared files watched to check for folder size propagation
| * Removed unused methodVincent Petry2013-11-051-18/+0
| |
| * Fixed watcher to also update the owner's folder sizesVincent Petry2013-11-052-4/+37
| | | | | | | | Note that the root folder size is mandatory for quota calculation.
* | Merge pull request #5582 from owncloud/files-previewcachingThomas Müller2013-11-051-1/+1
|\ \ | |/ |/| Append file etag to preview URLs
| * Append file etag to preview URLsVincent Petry2013-10-281-1/+1
| | | | | | | | Fixes #5534
* | Merge pull request #5540 from owncloud/scanner-enhancments-masterThomas Müller2013-11-041-0/+4
|\ \ | | | | | | Scanner enhancments master
| * | use ===Thomas Müller2013-11-041-1/+1
| | |
| * | adding storage_mtime handling to SharedCacheThomas Müller2013-10-251-0/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-032-2/+10
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-032-2/+4
| | |
* | | Merge pull request #5626 from owncloud/fix_search_in_shared_filesJörn Friedrich Dreyer2013-10-301-38/+42
|\ \ \ | | | | | | | | count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected
| * | | count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expectedJörn Friedrich Dreyer2013-10-301-38/+42
| | |/ | |/|
* | | Merge branch 'master' into fix_file_cache_updater_masterBjoern Schiessle2013-10-292-17/+15
|\ \ \
| * | | fix style of public share pageMorris Jobke2013-10-291-15/+13
| | | |
| * | | Merge pull request #5396 from owncloud/fix-sharing-codeMorris Jobke2013-10-291-2/+2
| |\ \ \ | | | | | | | | | | Fix sharing error message - id -> file name
| | * | | pass the name of the item source from the browser to the server - no need to ↵Thomas Müller2013-10-231-2/+2
| | | |/ | | |/| | | | | | | | | get the data via complicated db queries
* | / | backport of https://github.com/owncloud/core/pull/5513Bjoern Schiessle2013-10-291-7/+0
|/ / /
* | / [tx-robot] updated from transifexJenkins for ownCloud2013-10-292-2/+6
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-2718-23/+45
|/
* run first getUsersItemShared() with the ownerBjoern Schiessle2013-10-231-1/+1
|
* update etags for user we haven't checked yetBjoern Schiessle2013-10-231-1/+1
|
* keep a list of users we already checked to avoid loopsBjoern Schiessle2013-10-231-3/+3
|
* fix infinite loop while updating etags, fix for #4365Bjoern Schiessle2013-10-231-2/+4
|
* display the original file name - this will change in case of renamesThomas Müller2013-10-221-3/+3
|
* Merge pull request #5424 from owncloud/sharing-directlinkVincent Petry2013-10-213-0/+14
|\ | | | | Added direct link in public share page
| * unbold the 'Direct link' labelJan-Christoph Borchardt2013-10-211-1/+4
| |