Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix | Vincent Petry | 2015-01-27 | 2 | -0/+4 |
|\ | | | | | Call final unlink in trash wrapper's storage | ||||
| * | Unregister trashbin storage wrapper at the end of tests | Vincent Petry | 2015-01-23 | 2 | -0/+4 |
| | | | | | | | | Some more tests that uses the storage wrapper now remove it afterwards | ||||
* | | Merge pull request #13679 from owncloud/public-disablesharejsplugin | Thomas Müller | 2015-01-27 | 1 | -1/+25 |
|\ \ | | | | | | | Disable JS plugin for sharing in public mode | ||||
| * | | Disable JS plugin for sharing in public mode | Vincent Petry | 2015-01-26 | 1 | -1/+25 |
| | | | | | | | | | | | | | | | This removes the logic that registers the share action and modifies the rows. Share actions aren't needed in the public file list. | ||||
* | | | Only reload file list after remote share accept request returns | Vincent Petry | 2015-01-26 | 1 | -2/+120 |
|/ / | | | | | | | | | When accepting a remote share, an ajax request is sent to the server. Only once this request returns should the file list be reloaded. | ||||
* | | certificate manager only needs the user-id, no need to pass on the complete ↵ | Bjoern Schiessle | 2015-01-26 | 1 | -2/+3 |
| | | | | | | | | user object | ||||
* | | by default send mail for new server-to-server share | Bjoern Schiessle | 2015-01-23 | 1 | -0/+65 |
| | | |||||
* | | delete all server-to-server shares if a user gets deleted | Bjoern Schiessle | 2015-01-21 | 1 | -0/+76 |
| | | |||||
* | | Merge pull request #13432 from owncloud/animate_gifs_public_sharing | Thomas Müller | 2015-01-21 | 1 | -1/+3 |
|\ \ | | | | | | | show animated gifs on public sharing page | ||||
| * | | show animated gifs on public sharing page | Georg Ehrke | 2015-01-19 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialog | Thomas Müller | 2015-01-21 | 1 | -0/+123 |
|\ \ \ | | | | | | | | | External share dialog must properly read entered password | ||||
| * | | | Add unit test for external share JS dialog | Vincent Petry | 2015-01-21 | 1 | -0/+123 |
| | |/ | |/| | | | | | | | | | | | | | Moved external share JS code into a small plugin to make it testable. Added unit test for the external share dialog logic + ajax calls. | ||||
* | | | Fixed external cache test namespace | Vincent Petry | 2015-01-21 | 1 | -1/+3 |
| | | | |||||
* | | | Fix webdav mkdir for remote shares | Vincent Petry | 2015-01-21 | 1 | -0/+112 |
|/ / | |||||
* / | replace hook with storage wrapper | Bjoern Schiessle | 2015-01-19 | 4 | -7/+9 |
|/ | |||||
* | remove deprecated code - fixes #13119 | Thomas Müller | 2015-01-14 | 1 | -18/+18 |
| | |||||
* | set accept to 1 (=true) for all server-to-server shares on update, at this ↵ | Bjoern Schiessle | 2015-01-13 | 1 | -0/+76 |
| | | | | point in time all shares are created by the first version of server-to-server sharing and are accepted if they were added to the table | ||||
* | don't delete share table entries for the unique name if re-share permission ↵ | Bjoern Schiessle | 2015-01-07 | 1 | -0/+32 |
| | | | | was removed | ||||
* | Merge pull request #12942 from owncloud/favs-missingsharedsubdirs | Morris Jobke | 2014-12-21 | 1 | -1/+56 |
|\ | | | | | Fix issues with searchByTag in shared storage | ||||
| * | Fix issues with searchByTag in shared storage | Vincent Petry | 2014-12-18 | 1 | -1/+56 |
| | | |||||
* | | Next step in server-to-server sharing next generation, see #12285 | Bjoern Schiessle | 2014-12-19 | 1 | -4/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Beside some small improvements and bug fixes this will probably the final state for OC8. To test this you need to set up two ownCloud instances. Let's say: URL: myPC/firstOwnCloud user: user1 URL: myPC/secondOwnCloud user: user2 Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud". The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined. If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him. | ||||
* | | first step to drop \OCP\Config:: in favour of IConfig | Morris Jobke | 2014-12-17 | 3 | -6/+7 |
|/ | |||||
* | Merge pull request #12795 from owncloud/files-layoutchanges | Morris Jobke | 2014-12-13 | 1 | -6/+6 |
|\ | | | | | Move file thumbnail element into the label tag | ||||
| * | Move file thumbnail into the label element | Vincent Petry | 2014-12-11 | 1 | -6/+6 |
| | | |||||
* | | Merge pull request #12778 from owncloud/searchbytags2 | Vincent Petry | 2014-12-12 | 1 | -0/+34 |
|\ \ | | | | | | | Added searchByTags to view, storage and cache | ||||
| * | | Make $userId mandatory for searchByTags | Vincent Petry | 2014-12-12 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | $userId is now a mandatory parameter for searchByTags. Also fixed some places in the code where the argument was missing (Node API and View) | ||||
| * | | Added searchByTags to view, storage and cache | Vincent Petry | 2014-12-11 | 1 | -0/+33 |
| |/ | |||||
* | | Merge pull request #12527 from owncloud/js-pluginsystem | Robin Appelman | 2014-12-12 | 2 | -21/+7 |
|\ \ | |/ |/| | Simple Plugin system for Javascript | ||||
| * | Remove obsoleted filelist prototype backup in tests | Vincent Petry | 2014-12-04 | 2 | -19/+2 |
| | | |||||
| * | Simple Plugin system for Javascript | Vincent Petry | 2014-12-01 | 2 | -2/+5 |
| | | |||||
* | | OCS API for server-to-server sharing | Bjoern Schiessle | 2014-12-04 | 2 | -30/+132 |
|/ | |||||
* | Replace deprecated constant with new class constant | Joas Schilling | 2014-11-25 | 3 | -19/+19 |
| | |||||
* | Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate | Morris Jobke | 2014-11-25 | 1 | -1/+1 |
|\ | | | | | Don't disclose relative directory path for single shared files of user | ||||
| * | Don't disclose relative directory path for single shared files of user | Lukas Reschke | 2014-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | The "dir" key is used within the public sharing template to indicate in which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts. However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path. (For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template) This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key. | ||||
* | | Merge pull request #12297 from owncloud/issue/10991-all-testcase | Morris Jobke | 2014-11-20 | 12 | -25/+30 |
|\ \ | | | | | | | Issue/10991 all testcase | ||||
| * | | Make apps/ extend the \Test\TestCase and fix overwritten methods | Joas Schilling | 2014-11-19 | 12 | -25/+30 |
| |/ | |||||
* | | JSHint fixes in sharedfilelistSpec unit test file | Vincent Petry | 2014-11-19 | 1 | -1/+3 |
| | | |||||
* | | Remove delete button in shared with others list | Vincent Petry | 2014-11-19 | 1 | -9/+17 |
|/ | | | | | | | | | Whenever a file is shared with others or with link, a delete button used to be visible that triggered a direct deletion. This button has been removed to avoid accidental deletion from people who might believe it was an unshare button. Unsharing is still possible inside the share dropdown. | ||||
* | Merge pull request #12220 from owncloud/remove-unused-code | Morris Jobke | 2014-11-18 | 2 | -253/+0 |
|\ | | | | | Remove unused code | ||||
| * | Remove unused code | Lukas Reschke | 2014-11-17 | 2 | -253/+0 |
| | | | | | | | | We don't support direct updates from older ownCloud versions except the previous one therefore this code is unused and can be removed. | ||||
* | | Merge pull request #12218 from owncloud/issue/10991-fixes | Morris Jobke | 2014-11-17 | 1 | -3/+15 |
|\ \ | |/ |/| | Issue/10991 Make unit tests pass on windows | ||||
| * | Skip some more tests on Windows which just can not work at all | Joas Schilling | 2014-11-17 | 1 | -3/+15 |
| | | |||||
* | | Added download size on public sharing | Vincent Cloutier | 2014-11-14 | 1 | -1/+2 |
| | | |||||
* | | Refactor file sharing public link handling | Lukas Reschke | 2014-11-14 | 3 | -0/+251 |
| | | | | | | | | | | | | | | fixes download issue introduced by #10755 Conflicts: apps/files_sharing/public.php | ||||
* | | Merge pull request #10966 from owncloud/storage-root-share-permissions | Morris Jobke | 2014-11-10 | 1 | -0/+85 |
|\ \ | | | | | | | Dont' use mountpoint permissions as share permissions for external storages | ||||
| * | | Add unit tests | Robin Appelman | 2014-10-31 | 1 | -0/+85 |
| |/ | |||||
* | | Fix sharing tests | Robin Appelman | 2014-11-06 | 3 | -2/+15 |
| | | |||||
* | | Setup shared mounts for the correct user when setting up the filesystem for ↵ | Robin Appelman | 2014-11-06 | 1 | -0/+26 |
| | | | | | | | | the non-logged in user | ||||
* | | Dont make real users in tests | Robin Appelman | 2014-11-06 | 1 | -3/+5 |
|/ | |||||
* | remove unnecessary require calls - the ownCloud class loader is supposed to ↵ | Thomas Müller | 2014-10-30 | 14 | -34/+41 |
| | | | | take care of this |