Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7943 from hjort/master | Vincent Petry | 2014-04-01 | 1 | -3/+3 |
|\ | | | | | Correction: failure on sharing when user ID was prefixed by zero | ||||
| * | Correction: failure on sharing when user ID was prefixed by zero | Rodrigo Hjort | 2014-03-28 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #7724 from owncloud/mobile | Thomas Müller | 2014-03-28 | 1 | -4/+4 |
|\ \ | |/ |/| | [WIP] Mobile optimization for base layout and Files app | ||||
| * | add spans around replaced 'Shared' indicators to make text hide on mobile | Jan-Christoph Borchardt | 2014-03-14 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #7557 from owncloud/issue/7297 | Vincent Petry | 2014-03-19 | 1 | -1/+13 |
|\ \ | |/ |/| | Do not allow setting an expiration date in the past | ||||
| * | Use tipsy to display error when selecting a date in the past | Joas Schilling | 2014-03-19 | 1 | -2/+10 |
| | | |||||
| * | Do not allow setting an expiration date in the past | Joas Schilling | 2014-03-05 | 1 | -1/+5 |
| | | | | | | | | Fix #7297 | ||||
* | | fix some spaces to tabs issues reported by Scrutinizer | Jan-Christoph Borchardt | 2014-03-05 | 1 | -2/+2 |
|/ | |||||
* | add expire date to link share if possible | Bjoern Schiessle | 2014-01-24 | 1 | -1/+5 |
| | |||||
* | Fixed various file name escaping issues in core apps | Vincent Petry | 2014-01-10 | 1 | -3/+7 |
| | | | | | | | - Refactored file tr lookup into FileList.findFileEl that uses filterAttr to avoid escaping issues in jQuery selectors - Fixed versions and sharing app to properly escape file names in attributes | ||||
* | Show stars as placeholder | ganomi | 2013-11-26 | 1 | -1/+1 |
| | |||||
* | Check which permissions are possible to re-share a file | Bjoern Schiessle | 2013-11-18 | 1 | -1/+16 |
| | |||||
* | allow to share a file/folder as public link also if one of it parents was ↵ | Bjoern Schiessle | 2013-10-30 | 1 | -2/+4 |
| | | | | already shared as link | ||||
* | Merge pull request #5396 from owncloud/fix-sharing-code | Morris Jobke | 2013-10-29 | 1 | -9/+23 |
|\ | | | | | Fix sharing error message - id -> file name | ||||
| * | also add new parameter to function calls | Morris Jobke | 2013-10-29 | 1 | -4/+4 |
| | | |||||
| * | pass the name of the item source from the browser to the server - no need to ↵ | Thomas Müller | 2013-10-23 | 1 | -5/+19 |
| | | | | | | | | get the data via complicated db queries | ||||
* | | Merge pull request #5497 from owncloud/ie8-placeholdershim | Thomas Müller | 2013-10-23 | 1 | -0/+3 |
|\ \ | | | | | | | Ie8 placeholdershim | ||||
| * | | Fixed sharing dropdown placeholders in IE8/9 | Vincent Petry | 2013-10-23 | 1 | -0/+3 |
| |/ | | | | | | | Added jquery.placeholder shim to handle input field placeholders in IE8/9 | ||||
* | | Merge pull request #5435 from owncloud/share-improvements | Thomas Müller | 2013-10-23 | 1 | -36/+18 |
|\ \ | |/ |/| | Share improvements | ||||
| * | Fixed share dropdown checkbox wrapping | Vincent Petry | 2013-10-23 | 1 | -10/+15 |
| | | | | | | | | | | | | | | The "show cruds" button is now embedded into the last label/checkbox group and wraps with it. Added ellipsis to prevent long names to exceed the dropdown's width. | ||||
| * | better wording for share input field and share link | Jan-Christoph Borchardt | 2013-10-23 | 1 | -2/+2 |
| | | |||||
| * | shorten string to 'notify by email', cut 'user' | Jan-Christoph Borchardt | 2013-10-20 | 1 | -1/+1 |
| | | |||||
| * | remove hover hide/show stuff for share dropdown to make things more obvious | Jan-Christoph Borchardt | 2013-10-20 | 1 | -26/+3 |
| | | |||||
* | | Merge pull request #5446 from frisco82/fixNotifyUser | Frank Karlitschek | 2013-10-21 | 1 | -11/+10 |
|\ \ | | | | | | | Fix notify user checkbox | ||||
| * | | fix notify user, and made js more resiliant to changes | Ramiro Aparicio | 2013-10-21 | 1 | -11/+10 |
| |/ | |||||
* | | Merge pull request #5120 from frisco82/sendEmailJS | Vincent Petry | 2013-10-21 | 1 | -4/+4 |
|\ \ | | | | | | | Fix disabled status after sending a share link email | ||||
| * | | Fix disabled status after sending the email | Ramiro Aparicio | 2013-10-04 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #5444 from frisco82/fixDisplayGroup | Vincent Petry | 2013-10-21 | 1 | -5/+7 |
|\ \ \ | | | | | | | | | Fix display name for user after sharing | ||||
| * | | | fix user displayName not being shown after add, added class for improved ↵ | Ramiro Aparicio | 2013-10-21 | 1 | -5/+7 |
| | |/ | |/| | | | | | | | styling, fix strong for groups when english is not being used | ||||
* / | | Fixed share with link checkbox missing as regular user | Vincent Petry | 2013-10-21 | 1 | -12/+1 |
|/ / | | | | | | | | | | | | | | | | | Instead of loading the app config setting "shareapi_allow_links" using a synchronous ajax call that fails when the user is not an admin, this fix puts the flag directly in the template so it doesn't need to be loaded afterwards. Fixes #5440 | ||||
* | | Merge pull request #5338 from frisco82/fixGroupDisplay | Morris Jobke | 2013-10-18 | 1 | -1/+4 |
|\ \ | | | | | | | Show (group) after groups in share dropdown | ||||
| * | | Show (group) after groups in share dropdown | Ramiro Aparicio | 2013-10-14 | 1 | -1/+4 |
| | | | |||||
* | | | readability: single line -> multiple lines | Morris Jobke | 2013-10-18 | 1 | -4/+10 |
| | | | |||||
* | | | Fix accidental deletion of if | Michael Gapczynski | 2013-10-18 | 1 | -0/+1 |
| | | | |||||
* | | | Don't show links option in dropdown if disabled | Michael Gapczynski | 2013-10-18 | 1 | -1/+6 |
| | | | |||||
* | | | Added missing var in share.js | Vincent Petry | 2013-10-17 | 1 | -0/+1 |
| | | | |||||
* | | | Fixed sharing status update for new/uploaded files | Vincent Petry | 2013-10-17 | 1 | -39/+57 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Prevent share dropdown to close too early with autocomplete | Vincent Petry | 2013-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | When clicking on an autocomplete result in the sharing dropdown, it will mistakenly be detected as being clicked outside and would trigger the sharing dropdown closing. This fix adds a check to detect clicks inside the autocomplete and prevent closing the dropdown in that case. This fixes #4142 | ||||
* | | Fixed label for sharing notification to be clickable | Vincent Petry | 2013-10-07 | 1 | -1/+1 |
| | | | | | | | | | | Fixed the sharing notification checkbox label in the file sharing dropdown, which makes it possible to click on the label directly. | ||||
* | | Prevent scroll up when click on links in sharing dropdown | Vincent Petry | 2013-10-07 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | When clicking on a link that points to "#" in the sharing dropdown, and the current view is scrolled down, the browser will scroll the page up to the top (anchor behavior). This fix cancels the click event when clicking on "unshare" link or "show crud" link. | ||||
* | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-02 | 1 | -2/+2 |
|\| | | | | | | | | | Conflicts: lib/private/util.php | ||||
| * | Merge pull request #4887 from owncloud/sharing_disable_public_upload | Björn Schießle | 2013-09-26 | 1 | -2/+2 |
| |\ | | | | | | | check only permission from link-share to decide if public upload is enabled or disabled | ||||
| | * | we can leave the loop if the permission of the link share was checked | Bjoern Schiessle | 2013-09-17 | 1 | -3/+1 |
| | | | |||||
| | * | check only permission from link-share to decide if public upload is enabled ↵ | Bjoern Schiessle | 2013-09-17 | 1 | -1/+3 |
| | | | | | | | | | | | | or disabled | ||||
* | | | some small js fixes | Bjoern Schiessle | 2013-09-24 | 1 | -4/+5 |
| | | | |||||
* | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-23 | 1 | -2/+13 |
|\| | | | | | | | | | | | | | | Conflicts: lib/public/share.php | ||||
| * | | Merge pull request #4896 from owncloud/sharing_allow_disable_password | Björn Schießle | 2013-09-23 | 1 | -1/+12 |
| |\ \ | | | | | | | | | sharing, allow user to disable password protection | ||||
| | * | | initialize variable | Bjoern Schiessle | 2013-09-20 | 1 | -0/+1 |
| | | | | |||||
| | * | | calculate correct permissions while toggle the password protection | Bjoern Schiessle | 2013-09-20 | 1 | -1/+11 |
| | |/ | |||||
| * / | css selectors never have a : before [] | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 |
| |/ |