summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Collapse)AuthorAgeFilesLines
* [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
| |
| * reduce width of direct link input fieldJan-Christoph Borchardt2013-10-211-1/+1
| |
| * Added direct link in public share pageVincent Petry2013-10-183-0/+11
| | | | | | | | Fixes #1167
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-191-0/+8
|/
* Merge pull request #3219 from owncloud/disabled-links-uiFrank Karlitschek2013-10-182-0/+46
|\ | | | | Disabled links UI fixes
| * Remove "link" shares right after disabling the "allow_link_share" settingMorris Jobke2013-10-182-0/+46
| |
* | filter duplicates directly in the sql queryBjoern Schiessle2013-10-181-13/+4
|/
* Merge pull request #5382 from owncloud/sharing_api_include_resharesBjörn Schießle2013-10-172-27/+145
|\ | | | | add reshare option for the OCS Share API
| * split up reset()['path'] to make it compatible with older PHP versionsBjoern Schiessle2013-10-171-1/+2
| |
| * add test for the reshare optionBjoern Schiessle2013-10-171-2/+59
| |
| * adjust testsBjoern Schiessle2013-10-172-4/+3
| |
| * new option to add reshares to the resultBjoern Schiessle2013-10-171-24/+85
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-172-0/+2
| |
* | Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszeroMorris Jobke2013-10-171-1/+2
|\ \ | | | | | | Fixed zip download button for unlimited filesize in public mode
| * | Fixed zip download button for unlimited filesize in public modeVincent Petry2013-10-171-1/+2
| |/ | | | | | | | | | | Added missing condition to check whenever allowed zip size is unlimited. Fixes #3717
* / Fixed sharing status update for new/uploaded filesVincent Petry2013-10-171-3/+11
|/ | | | | | | | | | | | | | | Creating new files, folders or uploading files now have their sharing icon updated accordingly. For this, the global share status list that is cached in OC.Share.statuses is reused for new files. Performance should improve as the sharing list is now only loaded once per navigation session. In OC.Share, split loadIcons into loadIcons + updateIcons. Fixes #4977
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-166-0/+13
|
* Merge pull request #5269 from owncloud/ocs_share_api_add_received_fromBjörn Schießle2013-10-152-8/+20
|\ | | | | ocs share api: add "received_from" and "received_from_displayname" field
| * fix api testsBjoern Schiessle2013-10-111-1/+2
| |
| * add "received_from" and "received_from_displayname" field in case of a ↵Bjoern Schiessle2013-10-101-7/+18
| | | | | | | | reshared file to the output
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-138-0/+8
| |
* | Merge pull request #5233 from owncloud/enc_filter_usersBjörn Schießle2013-10-111-3/+4
|\ \ | | | | | | only encrypt file to users with encryption keys
| * | make sure that we are logged in ad user1 while performing the testsBjoern Schiessle2013-10-101-3/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-1064-64/+0
| |/ |/|
* | Merge pull request #5182 from owncloud/fix-sharring-with-password-screenMorris Jobke2013-10-103-2/+33
|\ \ | | | | | | Fix password screen for public shares
| * | Fix password screen for public sharesMorris Jobke2013-10-073-2/+33
| | | | | | | | | | | | | | | * Works in IE8, 9, 10, Firefox 24 and Chromium 30 * Credits to Julian Müller @Julian1998
* | | Merge pull request #5221 from owncloud/fixing-5217-masterVicDeo2013-10-101-2/+4
|\ \ \ | |_|/ |/| | fixing php 5.3 compatibility
| * | php 5.3 compatibility for Test_Files_Sharing_ApiThomas Müller2013-10-081-2/+4
| | |
* | | Added filesApp flag as input field for files app detectionVincent Petry2013-10-081-0/+1
|/ / | | | | | | | | | | | | Since the files app can be reached under multiple URLs, either root, files.php or public.php, a flag has been added to the DOM to help apps (like file viewers) to detect whether they are currently in the files app.
* | fix escapingMorris Jobke2013-10-081-1/+1
| |
* | make sure that we only remove file/folder sharesBjoern Schiessle2013-10-082-3/+3
| |
* | Added isPublic flag in files_sharing templateVincent Petry2013-10-071-0/+1
|/ | | | | | | To make it possible for apps to find out whether they are running in public mode, the flag "isPublic" will now be present in the DOM. This is required to disable the editor app in public mode to fix #5059
* Merge pull request #5129 from owncloud/remove_deleted_shares_from_dbBjörn Schießle2013-10-073-7/+36
|\ | | | | remove deleted files from oc_share