Commit Graph

22011 Commits

Author SHA1 Message Date
derkostka 1c22b1f626 Fix Undefined variable: result at tags.php#231
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
2014-12-19 19:44:43 +01:00
Björn Schießle 8164415b45 Merge pull request #12749 from owncloud/server2server-sharing-ng
server to server sharing next generation
2014-12-19 19:04:44 +01:00
blizzz ad6814f920 Merge pull request #12101 from owncloud/ldap_split_mapping
Ldap split mapping from Access superclass
2014-12-19 18:52:30 +01:00
Arthur Schiwon ec0f80fee9 Split mapping from Access and Helper classes into it's own. Fully test them, 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
2014-12-19 18:26:12 +01:00
Bjoern Schiessle 24993280ed Next step in server-to-server sharing next generation, see #12285
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.
2014-12-19 15:20:24 +01:00
Lukas Reschke f671b232cc Merge pull request #12923 from owncloud/ultra-slim-version-of-incognito-mode
Add ultra-slim hack for incognito mode
2014-12-19 14:54:11 +01:00
Thomas Müller 2d64797320 Merge pull request #12956 from owncloud/jenkins-user-backend-names
[jenkins only] introduce names for user backends - IUserBackend
2014-12-19 13:15:50 +01:00
Morris Jobke 678642a6a2 Merge pull request #12935 from owncloud/public-tagsmanagerissue
Only populate tags in main file list
2014-12-19 12:48:20 +01:00
Lukas Reschke 87e3e29250 Also add secret 2014-12-19 10:57:46 +01:00
Lukas Reschke 157ff1219a Merge pull request #12954 from owncloud/hhvm-apc-clear
HHVM: In APC cache clear, only request the cache key in APCIterator.
2014-12-19 10:46:20 +01:00
Morris Jobke 6b3600d2bf Merge pull request #12918 from owncloud/use-uid-instead-of-login-name
Return UID instead of login name
2014-12-19 10:24:52 +01:00
Morris Jobke 6da33e1ea7 introduce names for user backends - IUserBackend
* LDAP with multiple servers also proved backendName
2014-12-19 10:17:17 +01:00
Thomas Müller d44bf79b6d Merge pull request #12926 from owncloud/master-pear5
Update 3rdparty submodule to restore PEAR5.php
2014-12-19 09:58:29 +01:00
Thomas Müller b32dc3f2a4 Merge pull request #12906 from owncloud/keyboardnav-feedback
Accessibility: Keyboard navigation feedback
2014-12-19 09:54:28 +01:00
Thomas Müller 995f01fa2a Merge pull request #12921 from owncloud/user-mail-user-management
Mail address of users is now changable in the user management
2014-12-19 09:51:18 +01:00
Jörn Friedrich Dreyer 587bdd9a74 Merge pull request #12948 from owncloud/wording
Wording fixes for sharing dialog
2014-12-19 09:48:19 +01:00
Morris Jobke 39d6ddd38a Merge pull request #12865 from owncloud/files-tags-webdav
Returns tags through WebDAV
2014-12-19 09:33:28 +01:00
Jenkins for ownCloud 028b0efd5c [tx-robot] updated from transifex 2014-12-19 01:56:51 -05:00
Andreas Fischer 0ba5c182f0 HHVM: In APC cache clear, only request the cache key in APCIterator.
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.
2014-12-19 03:24:00 +01:00
Jan-Christoph Borchardt 5a678a6350 proper feedback for breadcrumbs when tabbing with keyboard 2014-12-19 00:35:25 +01:00
Jan-Christoph Borchardt 30db964b25 improve keyboard navigation feedback for certain buttons 2014-12-19 00:35:25 +01:00
Jan-Christoph Borchardt a2c2775df2 introduce first 'Skip to content' button 2014-12-19 00:35:24 +01:00
Jan-Christoph Borchardt 7b2ae46762 first part of fixing feedback for file list when using keyboard 2014-12-19 00:34:06 +01:00
Jan-Christoph Borchardt e7686a25e4 fix feedback for apps menu when using keyboard 2014-12-19 00:34:05 +01:00
Jan-Christoph Borchardt 14acf7f254 fix feedback for app navigation when using keyboard 2014-12-19 00:34:05 +01:00
Morris Jobke 3036a8714d Merge pull request #12941 from owncloud/wave-accessibility-compliance
Wave accessibility compliance
2014-12-19 00:30:56 +01:00
Morris Jobke 114a6464e8 Merge pull request #12748 from owncloud/redis_cache
Add Redis cache implementation, prefer over memcached, tests & config sample doc
2014-12-19 00:26:25 +01:00
Thomas Müller 5dcf4138d7 Merge pull request #12887 from owncloud/logged-in
Add a isLoggedIn method to the usersession and deprecate the isLoggedIn ...
2014-12-19 00:14:05 +01:00
Morris Jobke 75e8b39826 Merge pull request #12879 from owncloud/mountconfig
Add mount specific options
2014-12-18 23:38:14 +01:00
Jörn Friedrich Dreyer 891474b0d6 Merge pull request #12759 from owncloud/core-reduce-js-and-css
make sure styles and scripts are only loaded once
2014-12-18 23:18:37 +01:00
Jörn Friedrich Dreyer 49318b4d93 Merge pull request #12896 from owncloud/drop-deprecated
first step to drop \OCP\Config:: in favour of IConfig
2014-12-18 23:01:49 +01:00
Morris Jobke 5913af8a72 Mail address of users is now changable in the user management
* 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
2014-12-18 22:43:09 +01:00
Jan-Christoph Borchardt 4f616a481c change 'Allow Public Upload' to more understandable 'Allow editing', fix #10438 2014-12-18 22:39:32 +01:00
Jan-Christoph Borchardt 5aae796d3d change 'update' to more understandable 'change', fix #10408 2014-12-18 22:35:34 +01:00
Thomas Müller 5327b80430 Merge pull request #12870 from owncloud/send-mail-new-user
Send mail for new users
2014-12-18 22:32:37 +01:00
Jan-Christoph Borchardt 8b467ffa6e Merge pull request #12947 from owncloud/fix-spinner-file-upload-ie89
show spinner on file upload in IE8, 9
2014-12-18 22:27:36 +01:00
Morris Jobke 7798ea0cd7 show spinner on file upload in IE8, 9 2014-12-18 22:24:07 +01:00
Morris Jobke 609e10238f Merge pull request #12945 from owncloud/hhvm-image
HHVM: Do not call filesize(null), this function expects a string.
2014-12-18 22:20:56 +01:00
Andreas Fischer 3ebb69944b Do not call filesize(null), this function expects a string.
filesize(null) yields an int on HHVM and thus exif_imagetype(null) is called.
2014-12-18 20:57:19 +01:00
Morris Jobke 85301c8b85 Merge pull request #12940 from drarko/master
Fix extra quotes in custom tags in header
2014-12-18 18:44:44 +01:00
Jan-Christoph Borchardt cd81687a38 properly escape variable 2014-12-18 17:19:23 +01:00
Jan-Christoph Borchardt 96ae18db59 get rid of unnecessary alt and title attributes 2014-12-18 17:05:27 +01:00
Jan-Christoph Borchardt 7faf3d17e5 fix accessibility for deleted files 2014-12-18 16:54:39 +01:00
Vincent Petry 6224e29f25 Fix code style issues for tags plugin 2014-12-18 16:43:00 +01:00
drarko faaa1a89cb Fix extra quotes in custom tags in header
Fix #12939
2014-12-18 12:40:08 -03:00
Robin Appelman 1ef01de402 Merge pull request #12907 from owncloud/delete-invalid-external-share
Fix deleting invalid s2s shares
2014-12-18 16:38:13 +01:00
Jan-Christoph Borchardt 43b2af7333 more alt text and label fixes in Personal settings 2014-12-18 16:11:25 +01:00
Vincent Petry 3c67900421 Remove obsolete method 2014-12-18 16:04:36 +01:00
Jan-Christoph Borchardt 9009f5f727 add empty alt text to decorative preview of public share image 2014-12-18 16:00:55 +01:00
Jan-Christoph Borchardt bfee3eefbd better color contrast for focused buttons 2014-12-18 16:00:26 +01:00