Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add provisioning_api app | Tom Needham | 2014-12-24 | 9 | -0/+1674 |
| | | | | | | enable unit tests for provisioning api fix admin docu key | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-24 | 24 | -4/+76 |
| | |||||
* | Merge pull request #10292 from owncloud/external-share-delete | Morris Jobke | 2014-12-23 | 2 | -2/+5 |
|\ | | | | | Fix trashbin when deleting a file over an external share | ||||
| * | Fix trashbin when deleting a file over an external share | Robin Appelman | 2014-08-08 | 2 | -2/+5 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-23 | 26 | -6/+98 |
| | | |||||
* | | Merge pull request #12997 from owncloud/sharing_activities | Björn Schießle | 2014-12-22 | 3 | -7/+44 |
|\ \ | | | | | | | add activity if public shared file/folder was downloaded | ||||
| * | | Make sure the path passed to the activity manager is normalized | Robin Appelman | 2014-12-22 | 1 | -1/+1 |
| | | | |||||
| * | | add activity if public shared file/folder was downloaded | Bjoern Schiessle | 2014-12-22 | 3 | -6/+43 |
| | | | |||||
* | | | Merge pull request #12860 from owncloud/remove-apparently-unused-file | Thomas Müller | 2014-12-22 | 1 | -34/+0 |
|\ \ \ | |/ / |/| | | Remove unused file | ||||
| * | | Remove unused file | Lukas Reschke | 2014-12-15 | 1 | -34/+0 |
| | | | | | | | | | | | | | | | | | | That file is apparently unused - introduced with https://github.com/owncloud/core/commit/30b58f56771aa54304069d40a62070c06f5308fc I guess we can remove it... | ||||
* | | | Merge pull request #12961 from owncloud/try_to_cache_keys | Morris Jobke | 2014-12-22 | 4 | -19/+91 |
|\ \ \ | | | | | | | | | cache keys to read them only once from the hard disc | ||||
| * | | | cache keys to read them only once from the hard disc | Bjoern Schiessle | 2014-12-19 | 4 | -19/+91 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-22 | 24 | -10/+270 |
| | | | | |||||
* | | | | Merge pull request #12942 from owncloud/favs-missingsharedsubdirs | Morris Jobke | 2014-12-21 | 2 | -13/+78 |
|\ \ \ \ | | | | | | | | | | | Fix issues with searchByTag in shared storage | ||||
| * | | | | Fix issues with searchByTag in shared storage | Vincent Petry | 2014-12-18 | 2 | -13/+78 |
| |/ / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-21 | 30 | -12/+102 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-20 | 194 | -42/+278 |
| | | | | |||||
* | | | | Merge pull request #12749 from owncloud/server2server-sharing-ng | Björn Schießle | 2014-12-19 | 16 | -123/+513 |
|\ \ \ \ | | | | | | | | | | | server to server sharing next generation | ||||
| * | | | | Next step in server-to-server sharing next generation, see #12285 | Bjoern Schiessle | 2014-12-19 | 16 | -123/+513 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | Merge pull request #12101 from owncloud/ldap_split_mapping | blizzz | 2014-12-19 | 13 | -282/+571 |
|\ \ \ \ \ | |/ / / / |/| | | | | Ldap split mapping from Access superclass | ||||
| * | | | | Split mapping from Access and Helper classes into it's own. Fully test them, ↵ | Arthur Schiwon | 2014-12-19 | 13 | -282/+571 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | too. remove unused methods split mapping methods off from Access class fix DB query handling move 'clear mapping' methods from static helper to new mapping class add tests test directly with DB finishing tests and fix return value from setDNbyUUID add corresponding class for groups and make abstract test class neutral. helper tests is now obsolete as the tested functions were moved to the new mapper class. add missing info to PHPDoc add unmap method fix namespaces fix test inheritance PHPDoc and a small code restructure for scrutinizer, no effective changes PostgreSQL does not accept LIMIT in DELETE queries phpdoc fixes, no code changes | ||||
* | | | | | Merge pull request #12956 from owncloud/jenkins-user-backend-names | Thomas Müller | 2014-12-19 | 3 | -3/+28 |
|\ \ \ \ \ | | | | | | | | | | | | | [jenkins only] introduce names for user backends - IUserBackend | ||||
| * | | | | | introduce names for user backends - IUserBackend | Morris Jobke | 2014-12-19 | 3 | -3/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | * LDAP with multiple servers also proved backendName | ||||
* | | | | | | Merge pull request #12935 from owncloud/public-tagsmanagerissue | Morris Jobke | 2014-12-19 | 2 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Only populate tags in main file list | ||||
| * | | | | | Only populate tags in main file list | Vincent Petry | 2014-12-18 | 2 | -1/+1 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Moved populateTags to be done on the main file list. This prevents the public file list to go through the same code and cause an error when there is no user. | ||||
* | | | | | Merge pull request #12906 from owncloud/keyboardnav-feedback | Thomas Müller | 2014-12-19 | 1 | -4/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Accessibility: Keyboard navigation feedback | ||||
| * | | | | | first part of fixing feedback for file list when using keyboard | Jan-Christoph Borchardt | 2014-12-19 | 1 | -4/+9 |
| | | | | | | |||||
* | | | | | | Merge pull request #12865 from owncloud/files-tags-webdav | Morris Jobke | 2014-12-19 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Returns tags through WebDAV | ||||
| * | | | | | | Returns and update tags through WebDAV PROPFIND and PROPPATCH | Vincent Petry | 2014-12-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added oc:tags and oc:favorites in PROPFIND response. It is possible to update them with PROPPATCH. These properties are optional which means they need to be requested explicitly | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-19 | 206 | -54/+852 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #12941 from owncloud/wave-accessibility-compliance | Morris Jobke | 2014-12-19 | 8 | -18/+36 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Wave accessibility compliance | ||||
| * | | | | | | properly escape variable | Jan-Christoph Borchardt | 2014-12-18 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | get rid of unnecessary alt and title attributes | Jan-Christoph Borchardt | 2014-12-18 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | fix accessibility for deleted files | Jan-Christoph Borchardt | 2014-12-18 | 3 | -5/+10 |
| | | | | | | | |||||
| * | | | | | | add empty alt text to decorative preview of public share image | Jan-Christoph Borchardt | 2014-12-18 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fix accessibility for 'New' file inputs | Jan-Christoph Borchardt | 2014-12-18 | 1 | -1/+6 |
| | | | | | | | |||||
| * | | | | | | fix accessibility of file upload | Jan-Christoph Borchardt | 2014-12-18 | 3 | -8/+12 |
| | | | | | | | |||||
| * | | | | | | fix accessibility of logos | Jan-Christoph Borchardt | 2014-12-18 | 1 | -1/+5 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #12879 from owncloud/mountconfig | Morris Jobke | 2014-12-18 | 4 | -6/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add mount specific options | ||||
| * | | | | | | Add getMountPoint to FileInfo | Robin Appelman | 2014-12-17 | 3 | -4/+7 |
| | | | | | | | |||||
| * | | | | | | Load mount specific options from the mount config | Robin Appelman | 2014-12-17 | 1 | -2/+3 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #12759 from owncloud/core-reduce-js-and-css | Jörn Friedrich Dreyer | 2014-12-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | make sure styles and scripts are only loaded once | ||||
| * | | | | | | | make sure styles and scripts are only loaded once | Thomas Müller | 2014-12-16 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #12896 from owncloud/drop-deprecated | Jörn Friedrich Dreyer | 2014-12-18 | 13 | -44/+44 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | first step to drop \OCP\Config:: in favour of IConfig | ||||
| * | | | | | | | | first step to drop \OCP\Config:: in favour of IConfig | Morris Jobke | 2014-12-17 | 13 | -44/+44 |
| |/ / / / / / / | |||||
* | | | | | | | | show spinner on file upload in IE8, 9 | Morris Jobke | 2014-12-18 | 1 | -0/+15 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #12907 from owncloud/delete-invalid-external-share | Robin Appelman | 2014-12-18 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | Fix deleting invalid s2s shares | ||||
| * | | | | | | | Root always exists | Robin Appelman | 2014-12-17 | 1 | -0/+8 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #12925 from owncloud/fix-js-unit-tests | Vincent Petry | 2014-12-18 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | be more explicit in JS unit tests - caused by accessibility issues | ||||
| * | | | | | | be more explicit in JS unit tests - caused by accessibility issues | Morris Jobke | 2014-12-18 | 2 | -2/+2 |
| | | | | | | |