summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-0714-0/+68
|
* Merge pull request #22102 from owncloud/ldap_2nddispname-masterThomas Müller2016-02-0611-15/+209
|\ | | | | [LDAP] add second field for additional/optional display name attribute
| * Port of test_ldap_2nddispname to masterArthur Schiwon2016-02-0311-15/+209
| |
* | Merge pull request #22139 from owncloud/comments-files-cleanupThomas Müller2016-02-065-24/+151
|\ \ | | | | | | cleanup jobs for comments and comment read marks
| * | Move casting to IExpressionBuilderJoas Schilling2016-02-051-2/+3
| | |
| * | fix pgsqlArthur Schiwon2016-02-051-2/+4
| | |
| * | cleanup jobs for comments and comment read marksArthur Schiwon2016-02-055-24/+148
| | |
* | | Merge pull request #22163 from owncloud/comments-sizelimitThomas Müller2016-02-063-2/+116
|\ \ \ | | | | | | | | Limit comment size to 1000 in UI
| * | | Limit comment size to 1000 in UIVincent Petry2016-02-053-2/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever the limit is almost reached (90% of the length), a tooltip will appear. Once the limit is exceeded, the "Post" button will be disabled and the field will become red.
* | | | Merge pull request #20618 from owncloud/action-icon-sizeThomas Müller2016-02-061-2/+2
|\ \ \ \ | | | | | | | | | | Fix image sizing for action icons in Edge
| * | | | Fix image sizing for action icons in EdgeRobin Appelman2015-11-191-2/+2
| | | | |
* | | | | Merge pull request #22165 from owncloud/comments-markowncommentasreadThomas Müller2016-02-062-0/+9
|\ \ \ \ \ | | | | | | | | | | | | Mark own comments as read after posting
| * | | | | Mark own comments as read after postingVincent Petry2016-02-052-0/+9
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-06164-220/+574
| | | | |
* | | | | Merge pull request #22159 from owncloud/fix_21678Thomas Müller2016-02-051-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | Gracefull handle link shares rename hook
| * | | | Gracefull handle link shares rename hookRoeland Jago Douma2016-02-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #21678 The hook is called on all renames. However when we use a link share the getUserFolder fails. We now just opt out.
* | | | | Merge pull request #22157 from owncloud/use-https-instead-of-httpThomas Müller2016-02-051-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Use HTTPS instead of HTTP
| * | | | Use HTTPS instead of HTTPLukas Reschke2016-02-051-1/+1
| |/ / / | | | | | | | | This is now supported by github.io
* | | | Merge pull request #22152 from owncloud/activities-for-commentsThomas Müller2016-02-054-1/+450
|\ \ \ \ | |/ / / |/| | | Activities for comments
| * | | Add a filter for comment activitiesJoas Schilling2016-02-051-3/+22
| | | |
| * | | Add activities for commentsJoas Schilling2016-02-054-1/+431
| | | |
* | | | Merge pull request #20920 from owncloud/issue_20888Thomas Müller2016-02-057-86/+219
|\ \ \ \ | | | | | | | | | | Add dialog to enter credentials on errored mount point
| * | | | Improve credentials dialog usability a bitVincent Petry2016-02-041-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Automatically focus on the first field. Pressing enter submits the form.
| * | | | fix error code for unconfigured user provided authRobin Appelman2016-02-041-0/+11
| | | | |
| * | | | set read permissions on failed mount rootRobin Appelman2016-02-041-1/+2
| | | | |
| * | | | handle exception in availibilty checkRobin Appelman2016-02-041-3/+8
| | | | |
| * | | | fix input typeRobin Appelman2016-02-041-1/+1
| | | | |
| * | | | show failed external storages properlyRobin Appelman2016-02-041-0/+5
| | | | |
| * | | | Use handlebars templateRobin Appelman2016-02-041-22/+25
| | | | |
| * | | | Fix PR from commentsJesús Macias2016-02-041-5/+3
| | | | |
| * | | | Add credentials dialog for user provided authJesús Macias2016-02-044-85/+184
| | | | |
* | | | | Merge pull request #22135 from owncloud/global-auth-warningThomas Müller2016-02-051-1/+4
|\ \ \ \ \ | |_|/ / / |/| | | | fix warning caused by global auth
| * | | | fix warning caused by global authRobin Appelman2016-02-041-1/+4
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2016-02-0512-0/+38
|/ / /
* | | Merge pull request #22107 from owncloud/external-auth-globalThomas Müller2016-02-049-3/+156
|\ \ \ | | | | | | | | Add global auth backend for files external
| * | | Add global auth backend for files externalRobin Appelman2016-02-049-3/+156
| | | |
* | | | Merge pull request #22124 from owncloud/comments-author-checkThomas Müller2016-02-042-1/+184
|\ \ \ \ | |/ / / |/| | | Check for authorship on edit attempt
| * | | Check for authorship on edit and delete attemptsArthur Schiwon2016-02-042-1/+184
| | | |
* | | | Merge pull request #22121 from owncloud/comments-deleteduserThomas Müller2016-02-042-5/+24
|\ \ \ \ | |/ / / |/| | | Special label for deleted users in comments list
| * | | Special label for deleted users in comments listVincent Petry2016-02-042-5/+24
| | | |
* | | | Merge pull request #22025 from owncloud/21838-jenkinsThomas Müller2016-02-045-5/+109
|\ \ \ \ | |/ / / |/| | | [jenkins] + rebased, of #21838
| * | | fix unit testsArthur Schiwon2016-02-031-4/+9
| | | |
| * | | change error loggingalexweirig2016-02-031-1/+1
| | | | | | | | | | | | replaced variable with print_r call
| * | | Fixed undefined variable $dnGroup and variable namealexweirig2016-02-031-7/+7
| | | | | | | | | | | | | | | | | | | | I renamed $memberURL into $dynamicGroup and print that variable in the writeLog. I think this makes more sense.
| * | | Refactored code to avoid performance problemalexweirig2016-02-031-41/+37
| | | | | | | | | | | | | | | | | | | | Moved the dynamic group processing to the top and removed condition in memberOf processing. Also, changed variable name $value to $memberUrl
| * | | code changes for user_ldap Dynamic Group MembershipAlex Weirig2016-02-034-5/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new setting of “Dynamic Group Member URL” (ldapDynamicGroupMemberURL) - see LDAP settings advanced tab. Added public function getDynamicGroupMembers. Updated function _groupMembers. Updated function getUserGroups.
* | | | Merge pull request #21964 from owncloud/calendar-sharing-3Thomas Müller2016-02-0428-129/+1149
|\ \ \ \ | | | | | | | | | | Add calendar sharing
| * | | | Remove entries in dav_shares on deletion of a calendarThomas Müller2016-02-033-4/+14
| | | | |
| * | | | Adding propfind property to retrieve sharee information from a dav resourceThomas Müller2016-02-035-4/+201
| | | | |
| * | | | Deleting a shared address book results in unshareThomas Müller2016-02-035-11/+200
| | | | |