summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-0613-34/+257
|\ \ | | | | | | cleanup jobs for comments and comment read marks
| * | Move casting to IExpressionBuilderJoas Schilling2016-02-058-12/+108
| | |
| * | Remove old background jobJoas Schilling2016-02-051-0/+1
| | |
| * | 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
| | |/ / / | |/| | |
* | | | | Merge pull request #22166 from owncloud/remove-local-folderThomas Müller2016-02-068-73/+0
|\ \ \ \ \ | | | | | | | | | | | | remove unused Storage->getLocalFolder
| * | | | | remove unused Storage->getLocalFolderRobin Appelman2016-02-058-73/+0
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-06174-220/+584
| | | | | |
* | | | | | Merge pull request #22169 from owncloud/cache-interface-fixesThomas Müller2016-02-052-10/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cache interface cleanup/phpdoc
| * | | | | | remove unused Storage->searchRobin Appelman2016-02-051-9/+0
| | | | | | |
| * | | | | | additional phpdoc for searchRobin Appelman2016-02-051-1/+1
| | | | | | |
| * | | | | | add deprecation notice to search methodsRobin Appelman2016-02-051-0/+7
| |/ / / / /
* | | | | | Merge pull request #22155 from owncloud/use-svg-for-desktopappThomas Müller2016-02-056-4/+167
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use SVG for desktop app button
| * | | | | | use path instead of text inside desktop app badgeHendrik Leppelsack2016-02-051-2/+32
| | | | | | |
| * | | | | | update google play and apple badgeHendrik Leppelsack2016-02-055-1/+134
| | | | | | |
| * | | | | | fix font in desktopapp.svgHendrik Leppelsack2016-02-051-2/+2
| | | | | | |
| * | | | | | Use SVG for desktop app buttonLukas Reschke2016-02-051-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | For the other ones we unfortunately don't have that. Partially addresses https://github.com/owncloud/core/issues/22154
* | | | | | 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-059-8/+572
|\ \ \ \ | | | | | | | | | | Activities for comments
| * | | | Only dispatch the delete event, when the deletion was successfulJoas Schilling2016-02-051-6/+8
| | | | |
| * | | | Add a filter for comment activitiesJoas Schilling2016-02-051-3/+22
| | | | |
| * | | | Add activities for commentsJoas Schilling2016-02-055-1/+435
| | | | |
| * | | | Dispatch events when adding, updating and deleting commentsJoas Schilling2016-02-054-7/+116
| | | | |
* | | | | Merge pull request #22153 from owncloud/event-for-console-commandsThomas Müller2016-02-053-5/+87
|\ \ \ \ \ | | | | | | | | | | | | Dispatch an event when a console command is run
| * | | | | Dispatch an event when a console command is runJoas Schilling2016-02-053-5/+87
| |/ / / /
* | | | | Merge pull request #18194 from RealRancor/proxy_fcgiThomas Müller2016-02-051-2/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Add mod_proxy_fcgi to .htaccess
| * | | | Add mod_proxy_fcgi and mod_fastcgi to .htaccessRealRancor2015-11-171-2/+5
| | | | |
* | | | | Merge pull request #22146 from owncloud/delete-email-addressThomas Müller2016-02-051-18/+14
|\ \ \ \ \ | | | | | | | | | | | | Allow to delete the email address in user management
| * | | | | Allow to delete the email address in user managementMorris Jobke2016-02-051-18/+14
| | | | | |
* | | | | | Merge pull request #22143 from owncloud/fix_12385Thomas Müller2016-02-052-11/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | When a user is removed we should remove the right shares
| * | | | | | Add intergration testRoeland Jago Douma2016-02-051-10/+15
| | | | | | |
| * | | | | | When a user is removed we should remove the right sharesRoeland Jago Douma2016-02-051-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This means all the shares directly shared with them * Or all group shares having a special share with them This patch fixes the operator precedece (AND before OR). So before this patch: (share_with = <deleted user> AND share_type = 0) OR share_type=2 So it deleted all user specific shares Now: share_with = <deleted user> AND (share_type = 0 OR (share_type=2)
* | | | | | Merge pull request #22149 from owncloud/scrutinizer-patch-1Thomas Müller2016-02-057-11/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Scrutinizer Auto-Fixes
| * | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2016-02-057-11/+13
|/ / / / / | | | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | | | 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
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 05:17:02 +0000