Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22102 from owncloud/ldap_2nddispname-master | Thomas Müller | 2016-02-06 | 11 | -15/+209 |
|\ | |||||
| * | Port of test_ldap_2nddispname to master | Arthur Schiwon | 2016-02-03 | 11 | -15/+209 |
* | | Merge pull request #22139 from owncloud/comments-files-cleanup | Thomas Müller | 2016-02-06 | 13 | -34/+257 |
|\ \ | |||||
| * | | Move casting to IExpressionBuilder | Joas Schilling | 2016-02-05 | 8 | -12/+108 |
| * | | Remove old background job | Joas Schilling | 2016-02-05 | 1 | -0/+1 |
| * | | fix pgsql | Arthur Schiwon | 2016-02-05 | 1 | -2/+4 |
| * | | cleanup jobs for comments and comment read marks | Arthur Schiwon | 2016-02-05 | 5 | -24/+148 |
* | | | Merge pull request #22163 from owncloud/comments-sizelimit | Thomas Müller | 2016-02-06 | 3 | -2/+116 |
|\ \ \ | |||||
| * | | | Limit comment size to 1000 in UI | Vincent Petry | 2016-02-05 | 3 | -2/+116 |
* | | | | Merge pull request #20618 from owncloud/action-icon-size | Thomas Müller | 2016-02-06 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix image sizing for action icons in Edge | Robin Appelman | 2015-11-19 | 1 | -2/+2 |
* | | | | | Merge pull request #22165 from owncloud/comments-markowncommentasread | Thomas Müller | 2016-02-06 | 2 | -0/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Mark own comments as read after posting | Vincent Petry | 2016-02-05 | 2 | -0/+9 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #22166 from owncloud/remove-local-folder | Thomas Müller | 2016-02-06 | 8 | -73/+0 |
|\ \ \ \ \ | |||||
| * | | | | | remove unused Storage->getLocalFolder | Robin Appelman | 2016-02-05 | 8 | -73/+0 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-06 | 174 | -220/+584 |
* | | | | | | Merge pull request #22169 from owncloud/cache-interface-fixes | Thomas Müller | 2016-02-05 | 2 | -10/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove unused Storage->search | Robin Appelman | 2016-02-05 | 1 | -9/+0 |
| * | | | | | | additional phpdoc for search | Robin Appelman | 2016-02-05 | 1 | -1/+1 |
| * | | | | | | add deprecation notice to search methods | Robin Appelman | 2016-02-05 | 1 | -0/+7 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #22155 from owncloud/use-svg-for-desktopapp | Thomas Müller | 2016-02-05 | 6 | -4/+167 |
|\ \ \ \ \ \ | |||||
| * | | | | | | use path instead of text inside desktop app badge | Hendrik Leppelsack | 2016-02-05 | 1 | -2/+32 |
| * | | | | | | update google play and apple badge | Hendrik Leppelsack | 2016-02-05 | 5 | -1/+134 |
| * | | | | | | fix font in desktopapp.svg | Hendrik Leppelsack | 2016-02-05 | 1 | -2/+2 |
| * | | | | | | Use SVG for desktop app button | Lukas Reschke | 2016-02-05 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #22159 from owncloud/fix_21678 | Thomas Müller | 2016-02-05 | 1 | -0/+6 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Gracefull handle link shares rename hook | Roeland Jago Douma | 2016-02-05 | 1 | -0/+6 |
| |/ / / / | |||||
* | | | | | Merge pull request #22157 from owncloud/use-https-instead-of-http | Thomas Müller | 2016-02-05 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Use HTTPS instead of HTTP | Lukas Reschke | 2016-02-05 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #22152 from owncloud/activities-for-comments | Thomas Müller | 2016-02-05 | 9 | -8/+572 |
|\ \ \ \ | |||||
| * | | | | Only dispatch the delete event, when the deletion was successful | Joas Schilling | 2016-02-05 | 1 | -6/+8 |
| * | | | | Add a filter for comment activities | Joas Schilling | 2016-02-05 | 1 | -3/+22 |
| * | | | | Add activities for comments | Joas Schilling | 2016-02-05 | 5 | -1/+435 |
| * | | | | Dispatch events when adding, updating and deleting comments | Joas Schilling | 2016-02-05 | 4 | -7/+116 |
* | | | | | Merge pull request #22153 from owncloud/event-for-console-commands | Thomas Müller | 2016-02-05 | 3 | -5/+87 |
|\ \ \ \ \ | |||||
| * | | | | | Dispatch an event when a console command is run | Joas Schilling | 2016-02-05 | 3 | -5/+87 |
| |/ / / / | |||||
* | | | | | Merge pull request #18194 from RealRancor/proxy_fcgi | Thomas Müller | 2016-02-05 | 1 | -2/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Add mod_proxy_fcgi and mod_fastcgi to .htaccess | RealRancor | 2015-11-17 | 1 | -2/+5 |
* | | | | | Merge pull request #22146 from owncloud/delete-email-address | Thomas Müller | 2016-02-05 | 1 | -18/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Allow to delete the email address in user management | Morris Jobke | 2016-02-05 | 1 | -18/+14 |
* | | | | | | Merge pull request #22143 from owncloud/fix_12385 | Thomas Müller | 2016-02-05 | 2 | -11/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add intergration test | Roeland Jago Douma | 2016-02-05 | 1 | -10/+15 |
| * | | | | | | When a user is removed we should remove the right shares | Roeland Jago Douma | 2016-02-05 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #22149 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2016-02-05 | 7 | -11/+13 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2016-02-05 | 7 | -11/+13 |
|/ / / / / | |||||
* | | | | | Merge pull request #20920 from owncloud/issue_20888 | Thomas Müller | 2016-02-05 | 7 | -86/+219 |
|\ \ \ \ \ | |||||
| * | | | | | Improve credentials dialog usability a bit | Vincent Petry | 2016-02-04 | 1 | -2/+13 |
| * | | | | | fix error code for unconfigured user provided auth | Robin Appelman | 2016-02-04 | 1 | -0/+11 |
| * | | | | | set read permissions on failed mount root | Robin Appelman | 2016-02-04 | 1 | -1/+2 |
| * | | | | | handle exception in availibilty check | Robin Appelman | 2016-02-04 | 1 | -3/+8 |