Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removes unused code for link share emails | Morris Jobke | 2017-04-11 | 1 | -68/+0 |
* | Add IEMailTemplate to public OCP API | Lukas Reschke | 2017-04-11 | 4 | -115/+26 |
* | Merge pull request #4256 from nextcloud/theming | Lukas Reschke | 2017-04-11 | 12 | -26/+61 |
|\ | |||||
| * | Move OC_Defaults to OCP\Defaults | Morris Jobke | 2017-04-09 | 12 | -26/+61 |
* | | Merge pull request #4283 from nextcloud/shares-by-folder-quote | Morris Jobke | 2017-04-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | properly quota table names in getSharesInFolder | Robin Appelman | 2017-04-10 | 1 | -1/+1 |
* | | | Merge pull request #4146 from nextcloud/unread-comments-folder | Morris Jobke | 2017-04-10 | 3 | -90/+126 |
|\ \ \ | |/ / |/| | | |||||
| * | | fix whitespace in cleantags | Robin Appelman | 2017-03-30 | 1 | -1/+1 |
| * | | use castColumn | Robin Appelman | 2017-03-30 | 1 | -4/+1 |
| * | | Add test for getting unread comment count by folder | Robin Appelman | 2017-03-30 | 1 | -5/+6 |
| * | | Allow getting the unread comment count for an entire folder at once | Robin Appelman | 2017-03-30 | 2 | -89/+127 |
* | | | Merge pull request #4277 from nextcloud/permissions-mask-scanner | Björn Schießle | 2017-04-10 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | Dont use the permissions mask while scanning | Robin Appelman | 2017-04-10 | 1 | -0/+4 |
* | | | | Merge pull request #4222 from nextcloud/dav-search-fileid | Roeland Jago Douma | 2017-04-10 | 1 | -1/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Allow searching file by fileid | Robin Appelman | 2017-04-05 | 1 | -1/+3 |
* | | | | Merge pull request #4210 from nextcloud/downstream-26643 | Roeland Jago Douma | 2017-04-10 | 1 | -15/+15 |
|\ \ \ \ | |||||
| * | | | | Lowercase "data" correctly | Joas Schilling | 2017-04-10 | 1 | -6/+6 |
| * | | | | removed path to datadir | Kawohl | 2017-04-04 | 1 | -13/+13 |
* | | | | | Also send the new account data with the event | Joas Schilling | 2017-04-10 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #4136 from nextcloud/expire-date-for-all-shares | Morris Jobke | 2017-04-07 | 3 | -59/+92 |
|\ \ \ \ | |||||
| * | | | | update unit tests | Bjoern Schiessle | 2017-04-07 | 2 | -44/+29 |
| * | | | | setting to disable sending password by mail | Bjoern Schiessle | 2017-04-03 | 1 | -3/+5 |
| * | | | | set expire date for all share types | Bjoern Schiessle | 2017-04-03 | 2 | -25/+48 |
| * | | | | add secure drop functionallity to mail shares | Bjoern Schiessle | 2017-04-03 | 1 | -1/+3 |
| * | | | | allow password protected mail shares | Bjoern Schiessle | 2017-04-03 | 1 | -2/+23 |
| * | | | | add new password column to the share table in order to set passwords for shar... | Bjoern Schiessle | 2017-04-03 | 1 | -3/+3 |
* | | | | | Merge pull request #4253 from nextcloud/downstream-27599 | Roeland Jago Douma | 2017-04-07 | 1 | -5/+10 |
|\ \ \ \ \ | |||||
| * | | | | | make JobList::next() lock free | Jörn Friedrich Dreyer | 2017-04-07 | 1 | -5/+10 |
* | | | | | | Add support for theming | Lukas Reschke | 2017-04-07 | 3 | -33/+52 |
* | | | | | | New layout for welcome email | Morris Jobke | 2017-04-07 | 2 | -0/+499 |
|/ / / / / | |||||
* | | | | | Don't force the use of Accept-Language anymore | Joas Schilling | 2017-04-07 | 1 | -18/+0 |
* | | | | | Save the scope of an auth token in the session | Robin Appelman | 2017-04-05 | 3 | -24/+68 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #4138 from nextcloud/resources_match_fullid | Morris Jobke | 2017-04-04 | 1 | -1/+7 |
|\ \ \ \ | |||||
| * | | | | Match slashes in ../{id} resource routes | Roeland Jago Douma | 2017-04-04 | 1 | -1/+7 |
* | | | | | Merge pull request #4192 from nextcloud/fix/custom-default-app-redirect-2fa-s... | Morris Jobke | 2017-04-04 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Redirect to 2FA selection screen | Christoph Wurst | 2017-04-03 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #3310 from duritong/patch-1 | Morris Jobke | 2017-04-04 | 1 | -1/+3 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | only chmod logfile if necessary | duritong | 2017-01-29 | 1 | -1/+3 |
* | | | | | Merge pull request #2095 from nextcloud/bruteforcesetttings | Lukas Reschke | 2017-04-04 | 2 | -0/+66 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed layout of bruteforcesettings | Morris Jobke | 2017-04-02 | 1 | -1/+1 |
| * | | | | | Respect bruteforce settings in the Throttler | Roeland Jago Douma | 2017-04-02 | 1 | -0/+65 |
| * | | | | | Adds security section to the admin page | Roeland Jago Douma | 2017-04-02 | 1 | -0/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #4093 from nextcloud/endorse-password-protection | Roeland Jago Douma | 2017-04-04 | 2 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | feature endorse password for share links | Bjoern Schiessle | 2017-04-03 | 2 | -0/+5 |
| |/ / / / | |||||
* | | / / | Don't try to parse empty body if there is no body | Roeland Jago Douma | 2017-04-04 | 1 | -0/+2 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #4131 from nextcloud/fix-jscombiner | Christoph Wurst | 2017-04-03 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix check for cache value in JSCombiner | Morris Jobke | 2017-03-28 | 1 | -1/+1 |
* | | | | Merge pull request #4140 from nextcloud/no_encryption_no_wrapper | Björn Schießle | 2017-03-31 | 1 | -2/+5 |
|\ \ \ \ | |||||
| * | | | | Don't add the Encryption Storage Wrapper if there are no encryption modules | Roeland Jago Douma | 2017-03-29 | 1 | -2/+5 |
* | | | | | Merge pull request #3832 from nextcloud/fix_1303 | Roeland Jago Douma | 2017-03-30 | 1 | -0/+4 |
|\ \ \ \ \ |