Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-07 | 1 | -5/+5 |
| | |||||
* | get owner from share item, if we expire a share while the user updates his ↵ | Bjoern Schiessle | 2013-12-05 | 1 | -2/+6 |
| | | | | /Shared folder than the owner is different from the currently logged in user | ||||
* | fix trashbin and pbulic page controls | Morris Jobke | 2013-12-03 | 1 | -0/+4 |
| | |||||
* | fix and cleanup CSS for public page | Morris Jobke | 2013-12-03 | 1 | -3/+2 |
| | |||||
* | change different shades of grey for public share page to white | Jan-Christoph Borchardt | 2013-12-03 | 1 | -10/+14 |
| | |||||
* | remove app specific code | Jan-Christoph Borchardt | 2013-12-03 | 1 | -4/+0 |
| | |||||
* | fix details for buttons in header and controls bar | Jan-Christoph Borchardt | 2013-12-03 | 1 | -1/+5 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-29 | 1 | -1/+10 |
| | |||||
* | make sure that we don't try to access an already deleted files, fixes some ↵ | Bjoern Schiessle | 2013-11-28 | 1 | -7/+16 |
| | | | | file source not found warnings | ||||
* | Merge pull request #6088 from owncloud/fix_public_previews | Björn Schießle | 2013-11-27 | 1 | -3/+7 |
|\ | | | | | fix public preview creation if a user is logged in | ||||
| * | fix public preview creation if a user ios logged in | Bjoern Schiessle | 2013-11-27 | 1 | -3/+7 |
| | | |||||
* | | Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash | Björn Schießle | 2013-11-27 | 2 | -1/+7 |
|\ \ | |/ |/| | move files to owners trash | ||||
| * | Fixed sharing hook to not remove the share before the trashbin | Vincent Petry | 2013-11-27 | 2 | -1/+7 |
| | | | | | | | | Fixed the hook order between sharing app and trashbin | ||||
* | | Merge branch 'master' into encryption_enable_public_upload | Bjoern Schiessle | 2013-11-27 | 3 | -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 transifex | Jenkins for ownCloud | 2013-11-26 | 1 | -1/+2 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-24 | 1 | -1/+3 |
| | | |||||
| * | disable trahs in files_sharing/public.php | Bjoern Schiessle | 2013-11-21 | 1 | -0/+1 |
| | | |||||
| * | fix undefined index errors if public share view | Bjoern Schiessle | 2013-11-21 | 1 | -0/+6 |
| | | |||||
* | | public upload now also works with encryption enabled | Bjoern Schiessle | 2013-11-21 | 1 | -3/+0 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-15 | 2 | -2/+13 |
| | |||||
* | readd sharing token to public template | Jörn Friedrich Dreyer | 2013-11-15 | 2 | -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 Appelman | 2013-11-11 | 1 | -59/+47 |
| | | | | storage | ||||
* | Merge pull request #5701 from owncloud/sharing-updateownerfoldersizes | Morris Jobke | 2013-11-11 | 5 | -111/+335 |
|\ | | | | | Fixed watcher to also update the owner's folder sizes | ||||
| * | Fixed unit tests for files sharing watcher | Vincent Petry | 2013-11-06 | 2 | -3/+3 |
| | | |||||
| * | Added unit tests for shared files watcher | Vincent Petry | 2013-11-05 | 4 | -108/+317 |
| | | | | | | | | | | | | - Added base class for sharing unit tests - Added unit tests for shared files watched to check for folder size propagation | ||||
| * | Removed unused method | Vincent Petry | 2013-11-05 | 1 | -18/+0 |
| | | |||||
| * | Fixed watcher to also update the owner's folder sizes | Vincent Petry | 2013-11-05 | 2 | -4/+37 |
| | | | | | | | | Note that the root folder size is mandatory for quota calculation. | ||||
* | | Merge pull request #5582 from owncloud/files-previewcaching | Thomas Müller | 2013-11-05 | 1 | -1/+1 |
|\ \ | |/ |/| | Append file etag to preview URLs | ||||
| * | Append file etag to preview URLs | Vincent Petry | 2013-10-28 | 1 | -1/+1 |
| | | | | | | | | Fixes #5534 | ||||
* | | Merge pull request #5540 from owncloud/scanner-enhancments-master | Thomas Müller | 2013-11-04 | 1 | -0/+4 |
|\ \ | | | | | | | Scanner enhancments master | ||||
| * | | use === | Thomas Müller | 2013-11-04 | 1 | -1/+1 |
| | | | |||||
| * | | adding storage_mtime handling to SharedCache | Thomas Müller | 2013-10-25 | 1 | -0/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-03 | 2 | -2/+10 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-03 | 2 | -2/+4 |
| | | | |||||
* | | | Merge pull request #5626 from owncloud/fix_search_in_shared_files | Jörn Friedrich Dreyer | 2013-10-30 | 1 | -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 expected | Jörn Friedrich Dreyer | 2013-10-30 | 1 | -38/+42 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into fix_file_cache_updater_master | Bjoern Schiessle | 2013-10-29 | 2 | -17/+15 |
|\ \ \ | |||||
| * | | | fix style of public share page | Morris Jobke | 2013-10-29 | 1 | -15/+13 |
| | | | | |||||
| * | | | Merge pull request #5396 from owncloud/fix-sharing-code | Morris Jobke | 2013-10-29 | 1 | -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üller | 2013-10-23 | 1 | -2/+2 |
| | | |/ | | |/| | | | | | | | | | get the data via complicated db queries | ||||
* | / | | backport of https://github.com/owncloud/core/pull/5513 | Bjoern Schiessle | 2013-10-29 | 1 | -7/+0 |
|/ / / | |||||
* | / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-29 | 2 | -2/+6 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-27 | 18 | -23/+45 |
|/ | |||||
* | run first getUsersItemShared() with the owner | Bjoern Schiessle | 2013-10-23 | 1 | -1/+1 |
| | |||||
* | update etags for user we haven't checked yet | Bjoern Schiessle | 2013-10-23 | 1 | -1/+1 |
| | |||||
* | keep a list of users we already checked to avoid loops | Bjoern Schiessle | 2013-10-23 | 1 | -3/+3 |
| | |||||
* | fix infinite loop while updating etags, fix for #4365 | Bjoern Schiessle | 2013-10-23 | 1 | -2/+4 |
| | |||||
* | display the original file name - this will change in case of renames | Thomas Müller | 2013-10-22 | 1 | -3/+3 |
| | |||||
* | Merge pull request #5424 from owncloud/sharing-directlink | Vincent Petry | 2013-10-21 | 3 | -0/+14 |
|\ | | | | | Added direct link in public share page | ||||
| * | unbold the 'Direct link' label | Jan-Christoph Borchardt | 2013-10-21 | 1 | -1/+4 |
| | |