Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 |
| | | |||||
| * | reduce width of direct link input field | Jan-Christoph Borchardt | 2013-10-21 | 1 | -1/+1 |
| | | |||||
| * | Added direct link in public share page | Vincent Petry | 2013-10-18 | 3 | -0/+11 |
| | | | | | | | | Fixes #1167 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-19 | 1 | -0/+8 |
|/ | |||||
* | Merge pull request #3219 from owncloud/disabled-links-ui | Frank Karlitschek | 2013-10-18 | 2 | -0/+46 |
|\ | | | | | Disabled links UI fixes | ||||
| * | Remove "link" shares right after disabling the "allow_link_share" setting | Morris Jobke | 2013-10-18 | 2 | -0/+46 |
| | | |||||
* | | filter duplicates directly in the sql query | Bjoern Schiessle | 2013-10-18 | 1 | -13/+4 |
|/ | |||||
* | Merge pull request #5382 from owncloud/sharing_api_include_reshares | Björn Schießle | 2013-10-17 | 2 | -27/+145 |
|\ | | | | | add reshare option for the OCS Share API | ||||
| * | split up reset()['path'] to make it compatible with older PHP versions | Bjoern Schiessle | 2013-10-17 | 1 | -1/+2 |
| | | |||||
| * | add test for the reshare option | Bjoern Schiessle | 2013-10-17 | 1 | -2/+59 |
| | | |||||
| * | adjust tests | Bjoern Schiessle | 2013-10-17 | 2 | -4/+3 |
| | | |||||
| * | new option to add reshares to the result | Bjoern Schiessle | 2013-10-17 | 1 | -24/+85 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-17 | 2 | -0/+2 |
| | | |||||
* | | Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszero | Morris Jobke | 2013-10-17 | 1 | -1/+2 |
|\ \ | | | | | | | Fixed zip download button for unlimited filesize in public mode | ||||
| * | | Fixed zip download button for unlimited filesize in public mode | Vincent Petry | 2013-10-17 | 1 | -1/+2 |
| |/ | | | | | | | | | | | Added missing condition to check whenever allowed zip size is unlimited. Fixes #3717 | ||||
* / | Fixed sharing status update for new/uploaded files | Vincent Petry | 2013-10-17 | 1 | -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 transifex | Jenkins for ownCloud | 2013-10-16 | 6 | -0/+13 |
| | |||||
* | Merge pull request #5269 from owncloud/ocs_share_api_add_received_from | Björn Schießle | 2013-10-15 | 2 | -8/+20 |
|\ | | | | | ocs share api: add "received_from" and "received_from_displayname" field | ||||
| * | fix api tests | Bjoern Schiessle | 2013-10-11 | 1 | -1/+2 |
| | | |||||
| * | add "received_from" and "received_from_displayname" field in case of a ↵ | Bjoern Schiessle | 2013-10-10 | 1 | -7/+18 |
| | | | | | | | | reshared file to the output | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-13 | 8 | -0/+8 |
| | | |||||
* | | Merge pull request #5233 from owncloud/enc_filter_users | Björn Schießle | 2013-10-11 | 1 | -3/+4 |
|\ \ | | | | | | | only encrypt file to users with encryption keys | ||||
| * | | make sure that we are logged in ad user1 while performing the tests | Bjoern Schiessle | 2013-10-10 | 1 | -3/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-10 | 64 | -64/+0 |
| |/ |/| | |||||
* | | Merge pull request #5182 from owncloud/fix-sharring-with-password-screen | Morris Jobke | 2013-10-10 | 3 | -2/+33 |
|\ \ | | | | | | | Fix password screen for public shares | ||||
| * | | Fix password screen for public shares | Morris Jobke | 2013-10-07 | 3 | -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-master | VicDeo | 2013-10-10 | 1 | -2/+4 |
|\ \ \ | |_|/ |/| | | fixing php 5.3 compatibility | ||||
| * | | php 5.3 compatibility for Test_Files_Sharing_Api | Thomas Müller | 2013-10-08 | 1 | -2/+4 |
| | | | |||||
* | | | Added filesApp flag as input field for files app detection | Vincent Petry | 2013-10-08 | 1 | -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 escaping | Morris Jobke | 2013-10-08 | 1 | -1/+1 |
| | | |||||
* | | make sure that we only remove file/folder shares | Bjoern Schiessle | 2013-10-08 | 2 | -3/+3 |
| | | |||||
* | | Added isPublic flag in files_sharing template | Vincent Petry | 2013-10-07 | 1 | -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_db | Björn Schießle | 2013-10-07 | 3 | -7/+36 |
|\ | | | | | remove deleted files from oc_share |