Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add explicit check for groups excluded from sharing | Vincent Petry | 2015-12-08 | 1 | -1/+1 |
| | | | | | Since isSharable() doesn't do the check for groups excluded from sharing, adding an explicit check in the sharing code. | ||||
* | Add reshare permission checks | Vincent Petry | 2015-12-08 | 1 | -1/+1 |
| | | | | | | | Added in isSharable() in incoming remote share. Added in isSharable() in regular incoming share. Added in FileInfo to make sure the proper attributes are returned to the clients. | ||||
* | Compute share permissions in the view | Vincent Petry | 2015-12-08 | 2 | -5/+7 |
| | | | | | The share permissions are now computed in the View/FileInfo instead of storing them directly/permanently on the storage | ||||
* | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 3 | -4/+0 |
| | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | Merge pull request #20993 from owncloud/issue-20666-language-always-overwritten | Thomas Müller | 2015-12-07 | 1 | -3/+7 |
|\ | | | | | Do not overwrite the language when it's just missing for one app | ||||
| * | Do not overwrite the language when it's just missing for one app | Joas Schilling | 2015-12-07 | 1 | -3/+7 |
| | | |||||
* | | Merge pull request #20981 from ↵ | Thomas Müller | 2015-12-07 | 1 | -1/+3 |
|\ \ | |/ |/| | | | | | owncloud/issue-19848-multiple-emails-for-sharelink Allow sending a share email to multiple users | ||||
| * | Allow sending a share email to multiple users | Joas Schilling | 2015-12-07 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #20960 from owncloud/drop-OC_Util-getUrlContent | Thomas Müller | 2015-12-07 | 2 | -19/+12 |
|\ \ | | | | | | | Remove OC_Util::getUrlContent and replace by proper usage of public i… | ||||
| * | | Remove OC_Util::getUrlContent and replace by proper usage of public interfaces | Morris Jobke | 2015-12-04 | 2 | -19/+12 |
| |/ | |||||
* | | Merge pull request #11131 from owncloud/use-phpini-wrapper | Thomas Müller | 2015-12-07 | 7 | -14/+16 |
|\ \ | | | | | | | Replacing ini_get instances with inigetwrapper usages | ||||
| * | | Replace new occurences of ini_get with IniWrapper methods | Morris Jobke | 2015-11-23 | 4 | -7/+9 |
| | | | |||||
| * | | Replacing ini_get instances with inigetwrapper usages | Clark Tomlinson | 2015-11-23 | 5 | -7/+7 |
| | | | |||||
* | | | Merge pull request #20904 from owncloud/view-mime-filter | Thomas Müller | 2015-12-07 | 1 | -6/+2 |
|\ \ \ | | | | | | | | | Fix mimetype filter in getDirectoryContent | ||||
| * | | | Fix mimetype filter in getDirectoryContent | Robin Appelman | 2015-12-03 | 1 | -6/+2 |
| | | | | |||||
* | | | | Merge pull request #20949 from owncloud/fix_20892 | Thomas Müller | 2015-12-07 | 1 | -4/+2 |
|\ \ \ \ | | | | | | | | | | | [Sharing] Properly check if a group already has access | ||||
| * | | | | [Sharing] Properly check if a group already has access | Roeland Jago Douma | 2015-12-04 | 1 | -4/+2 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | The old code check was to liberal resulting in wrong matches if a user with the same name as the group already had access. Fixes 20892 | ||||
* | | | | Merge pull request #20957 from owncloud/use-correct-method-signature | Thomas Müller | 2015-12-07 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Use correct method signature | ||||
| * | | | | Use correct method signature | Lukas Reschke | 2015-12-04 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | This function takes only one parameter | ||||
* | | | | remove OC_App::getActiveNavigationEntry - not unsed anymore | Morris Jobke | 2015-12-04 | 1 | -14/+0 |
| | | | | |||||
* | | | | Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App | Morris Jobke | 2015-12-04 | 1 | -17/+0 |
|/ / / | |||||
* | | | Merge pull request #20933 from owncloud/more-OC_Config-cleanups | Thomas Müller | 2015-12-04 | 8 | -10/+11 |
|\ \ \ | | | | | | | | | More cleanups of OC_Config usage | ||||
| * | | | More cleanups of OC_Config usage | Morris Jobke | 2015-12-03 | 8 | -10/+11 |
| | | | | |||||
* | | | | Merge pull request #20807 from ↵ | Thomas Müller | 2015-12-03 | 7 | -37/+178 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | owncloud/dont-append-redirect-url-if-user-is-already-logged-in Don't append redirect URL if user is logged-in | ||||
| * | | | Show error template | Lukas Reschke | 2015-11-30 | 7 | -37/+178 |
| | | | | | | | | | | | | | | | | Otherwise this leads to an endless redirection in case of a CSRF exception. Also sets user expectation right. | ||||
* | | | | Replace OC_Config in setup | Morris Jobke | 2015-12-03 | 2 | -4/+5 |
| | | | | |||||
* | | | | Merge pull request #19461 from owncloud/reuse_code | Thomas Müller | 2015-12-03 | 1 | -43/+38 |
|\ \ \ \ | | | | | | | | | | | reuse code | ||||
| * | | | | reuse code | Individual IT Services | 2015-11-23 | 1 | -43/+38 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #20872 from owncloud/systemtags-better-not-found-exception | Thomas Müller | 2015-12-03 | 2 | -6/+18 |
|\ \ \ \ | | | | | | | | | | | Systemtags better not found exception | ||||
| * | | | | Add a method to get the list of tags from the TagNotFound Exception | Joas Schilling | 2015-12-01 | 2 | -6/+18 |
| | | | | | |||||
* | | | | | Merge pull request #20894 from owncloud/post-delete-meta-view | Thomas Müller | 2015-12-03 | 1 | -3/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | Also add metadata for postDelete hooks triggered from the view | ||||
| * | | | | | Also add metadata for postDelete hooks triggered from the view | Robin Appelman | 2015-12-02 | 1 | -3/+16 |
| | | | | | | |||||
* | | | | | | Merge pull request #20860 from ↵ | Thomas Müller | 2015-12-03 | 3 | -26/+32 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/use-user-getEMailAddress-all-over-the-place User IUser::getEMailAddress() all over the place | ||||
| * | | | | | | Adding unit test for MailNotifications::sendInternalShareMail() | Thomas Müller | 2015-12-02 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | User IUser::getEMailAddress() all over the place | Thomas Müller | 2015-12-02 | 3 | -21/+27 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuff | Thomas Müller | 2015-12-02 | 2 | -7/+12 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Replace old config code with usage of proper APIs | ||||
| * | | | | | Replace old config code with usage of proper APIs | Morris Jobke | 2015-12-02 | 2 | -7/+12 |
| | | | | | | |||||
* | | | | | | Merge pull request #20719 from owncloud/adding-system-addressbook-of-users | Thomas Müller | 2015-12-02 | 3 | -32/+106 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Adding system addressbook for users of this instance - a occ command … | ||||
| * | | | | | Fix endless recursion | Thomas Müller | 2015-12-02 | 1 | -7/+9 |
| | | | | | | |||||
| * | | | | | Fix comments | Thomas Müller | 2015-12-02 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix getCloudId | Thomas Müller | 2015-12-02 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Proposal: add enumeration function to IUserManager which simply calls a ↵ | Thomas Müller | 2015-12-02 | 1 | -4/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | callbask for each user in all backends | ||||
| * | | | | | Add the user's cloud id to the vCard | Thomas Müller | 2015-12-02 | 1 | -25/+42 |
| | | | | | | |||||
| * | | | | | Add IUser::getAvatarImage() for easy access | Thomas Müller | 2015-12-02 | 2 | -2/+30 |
| | | | | | | |||||
* | | | | | | Reduce OC_Config usage in lib/ | Morris Jobke | 2015-12-02 | 3 | -6/+7 |
| |/ / / / |/| | | | | | | | | | | | | | | * replaced by proper public interfaces | ||||
* | | | | | Merge pull request #20875 from owncloud/remove-changepropagator | Thomas Müller | 2015-12-02 | 2 | -143/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | remove old propagation logic | ||||
| * | | | | | remove old propagation logic | Robin Appelman | 2015-12-01 | 2 | -143/+0 |
| | | | | | | |||||
* | | | | | | Add a trailing slash to generated URLs | Lukas Reschke | 2015-12-02 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #20879 from ↵ | Thomas Müller | 2015-12-02 | 1 | -1/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/check-if-rewrite-base-is-set-if-rewrite-is-active Check if rewrite base is set if rewrite is active | ||||
| * | | | | | | Set RewriteBase to / if OC::WEBROOT is not set | Lukas Reschke | 2015-12-01 | 1 | -1/+2 |
| | | | | | | |