aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12972 from owncloud/use-https-where-possibleTom Needham2014-12-191-2/+2
|\ | | | | Link to HTTPS page
| * Link to HTTPS pageLukas Reschke2014-12-191-2/+2
| | | | | | | | Those domains are now accessible via HTTPS
* | Fix Undefined variable: result at tags.php#231derkostka2014-12-191-4/+4
| | | | | | | | | | | | | | | | | | | | Fix app":"PHP","message":"Undefined variable: result at \/var\/www\/owncloud\/lib\/private\/tags.php#231" by moving the function call into the respective loop Adjust indentation Do it right - indentation sorry, this is my first one
* | Merge pull request #12749 from owncloud/server2server-sharing-ngBjörn Schießle2014-12-1930-247/+948
|\ \ | | | | | | server to server sharing next generation
| * | Next step in server-to-server sharing next generation, see #12285Bjoern Schiessle2014-12-1930-247/+948
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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_mappingblizzz2014-12-1915-282/+573
|\ \ | |/ |/| Ldap split mapping from Access superclass
| * Split mapping from Access and Helper classes into it's own. Fully test them, ↵Arthur Schiwon2014-12-1915-282/+573
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #12923 from owncloud/ultra-slim-version-of-incognito-modeLukas Reschke2014-12-192-0/+12
|\ \ | | | | | | Add ultra-slim hack for incognito mode
| * | Add ultra-slim hack for incognito modeLukas Reschke2014-12-172-0/+12
| | | | | | | | | | | | As discussed at https://github.com/owncloud/core/pull/12912#issuecomment-67391155
* | | Merge pull request #12956 from owncloud/jenkins-user-backend-namesThomas Müller2014-12-1911-11/+105
|\ \ \ | | | | | | | | [jenkins only] introduce names for user backends - IUserBackend
| * | | introduce names for user backends - IUserBackendMorris Jobke2014-12-1911-11/+105
| | | | | | | | | | | | | | | | * LDAP with multiple servers also proved backendName
* | | | Merge pull request #12935 from owncloud/public-tagsmanagerissueMorris Jobke2014-12-192-1/+1
|\ \ \ \ | |_|_|/ |/| | | Only populate tags in main file list
| * | | Only populate tags in main file listVincent Petry2014-12-182-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.
* | | | Also add secretLukas Reschke2014-12-191-1/+1
| | | |
* | | | Merge pull request #12954 from owncloud/hhvm-apc-clearLukas Reschke2014-12-191-1/+1
|\ \ \ \ | | | | | | | | | | HHVM: In APC cache clear, only request the cache key in APCIterator.
| * | | | HHVM: In APC cache clear, only request the cache key in APCIterator.Andreas Fischer2014-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default value of the $format parameter of the APCIterator constructur is APC_ITER_ALL which instructs the iterator to provide all available information on cache values being iterated over. Only the key value is necessary for matching and deletion via apc_delete(), though. This prevents a "Format values FILENAME, DEVICE, INODE, MD5, NUM_HITS, MTIME, CTIME, DTIME, ATIME, REFCOUNT not supported yet." notice on HHVM.
* | | | | Merge pull request #12918 from owncloud/use-uid-instead-of-login-nameMorris Jobke2014-12-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Return UID instead of login name
| * | | | | Return UID instead of login nameLukas Reschke2014-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Without this OCS on LDAP is broken for API requests coming via Basic Authentication...
* | | | | | Merge pull request #12926 from owncloud/master-pear5Thomas Müller2014-12-191-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update 3rdparty submodule to restore PEAR5.php
| * | | | | | Update 3rdparty submodule to restore PEAR5.phpAndreas Fischer2014-12-181-0/+0
| | | | | | |
* | | | | | | Merge pull request #12906 from owncloud/keyboardnav-feedbackThomas Müller2014-12-195-11/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Accessibility: Keyboard navigation feedback
| * | | | | | | proper feedback for breadcrumbs when tabbing with keyboardJan-Christoph Borchardt2014-12-191-0/+1
| | | | | | | |
| * | | | | | | improve keyboard navigation feedback for certain buttonsJan-Christoph Borchardt2014-12-191-0/+1
| | | | | | | |
| * | | | | | | introduce first 'Skip to content' buttonJan-Christoph Borchardt2014-12-192-4/+27
| | | | | | | |
| * | | | | | | first part of fixing feedback for file list when using keyboardJan-Christoph Borchardt2014-12-191-4/+9
| | | | | | | |
| * | | | | | | fix feedback for apps menu when using keyboardJan-Christoph Borchardt2014-12-191-3/+3
| | | | | | | |
| * | | | | | | fix feedback for app navigation when using keyboardJan-Christoph Borchardt2014-12-191-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #12921 from owncloud/user-mail-user-managementThomas Müller2014-12-199-79/+253
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Mail address of users is now changable in the user management
| * | | | | | | Mail address of users is now changable in the user managementMorris Jobke2014-12-189-79/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * introduced new route settings/users/{id}/mailAddress * kept old responses * better error messages * dropped lostpassword.php from settings/ajax * cleaned up the UserList.add() and hand in user object instead of each attribute as another parameter * check for change permission of mail address * proper response messages
* | | | | | | | Merge pull request #12948 from owncloud/wordingJörn Friedrich Dreyer2014-12-191-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Wording fixes for sharing dialog
| * | | | | | | | change 'Allow Public Upload' to more understandable 'Allow editing', fix #10438Jan-Christoph Borchardt2014-12-181-1/+1
| | | | | | | | |
| * | | | | | | | change 'update' to more understandable 'change', fix #10408Jan-Christoph Borchardt2014-12-181-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #12865 from owncloud/files-tags-webdavMorris Jobke2014-12-198-7/+800
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Returns tags through WebDAV
| * | | | | | | | Fix code style issues for tags pluginVincent Petry2014-12-183-6/+4
| | | | | | | | |
| * | | | | | | | Remove obsolete methodVincent Petry2014-12-181-8/+0
| | | | | | | | |
| * | | | | | | | Returns and update tags through WebDAV PROPFIND and PROPPATCHVincent Petry2014-12-178-7/+810
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 transifexJenkins for ownCloud2014-12-19364-222/+1158
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #12941 from owncloud/wave-accessibility-complianceMorris Jobke2014-12-1914-33/+67
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Wave accessibility compliance
| * | | | | | | | properly escape variableJan-Christoph Borchardt2014-12-181-1/+1
| | | | | | | | |
| * | | | | | | | get rid of unnecessary alt and title attributesJan-Christoph Borchardt2014-12-182-3/+3
| | | | | | | | |
| * | | | | | | | fix accessibility for deleted filesJan-Christoph Borchardt2014-12-183-5/+10
| | | | | | | | |
| * | | | | | | | more alt text and label fixes in Personal settingsJan-Christoph Borchardt2014-12-181-6/+15
| | | | | | | | |
| * | | | | | | | add empty alt text to decorative preview of public share imageJan-Christoph Borchardt2014-12-181-1/+1
| | | | | | | | |
| * | | | | | | | better color contrast for focused buttonsJan-Christoph Borchardt2014-12-181-2/+2
| | | | | | | | |
| * | | | | | | | fix accessibility for 'New' file inputsJan-Christoph Borchardt2014-12-181-1/+6
| | | | | | | | |
| * | | | | | | | add missing input labels for Share dialogJan-Christoph Borchardt2014-12-181-0/+4
| | | | | | | | |
| * | | | | | | | fix accessibility of file uploadJan-Christoph Borchardt2014-12-183-8/+12
| | | | | | | | |
| * | | | | | | | fix searchbox labelJan-Christoph Borchardt2014-12-181-1/+1
| | | | | | | | |
| * | | | | | | | fix accessibility of logosJan-Christoph Borchardt2014-12-184-6/+13
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #12748 from owncloud/redis_cacheMorris Jobke2014-12-194-2/+139
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add Redis cache implementation, prefer over memcached, tests & config sample doc