Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #3620 from nextcloud/feature/1463/editable_color_name_for_... | Morris Jobke | 2017-04-03 | 5 | -15/+207 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | OCA\DAV\Files\CustomPropertiesBackend -> OCA\DAV\DAV\CustomPropertiesBackend | Georg Ehrke | 2017-03-27 | 3 | -4/+4 | |
| * | | | | | | | | | allow sharees to edit certain calendar properties for themselves | Georg Ehrke | 2017-03-27 | 4 | -13/+205 | |
* | | | | | | | | | | Merge pull request #4191 from nextcloud/bump-autosize | Roeland Jago Douma | 2017-04-03 | 6 | -533/+20 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Move to autosize.min.js | Roeland Jago Douma | 2017-04-03 | 5 | -555/+15 | |
| * | | | | | | | | | Bump autosize.js | Roeland Jago Douma | 2017-04-03 | 2 | -35/+62 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #4166 from nextcloud/issue-4165-invalid-int-for-transparen... | Roeland Jago Douma | 2017-04-03 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Make sure transparency is an integer when saving a calendar | Joas Schilling | 2017-03-30 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4189 from nextcloud/add-issue-template-app | Jos Poortvliet | 2017-04-03 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update issue_template.md | Jos Poortvliet | 2017-04-03 | 1 | -1/+1 | |
| * | | | | | | | | | Add reference to issue template app | Lukas Reschke | 2017-04-02 | 1 | -3/+4 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | 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 #4175 from nextcloud/fix-socialmenudisplay | Roeland Jago Douma | 2017-04-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Do not show social menu when there is no link share | Roeland Jago Douma | 2017-03-31 | 1 | -1/+1 | |
* | | | | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-03 | 32 | -24/+204 | |
| |_|/ / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4183 from nextcloud/css-shortcuts-view | Lukas Reschke | 2017-04-02 | 1 | -1/+30 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add CSS for styling of keyboard shortcuts view | Jan-Christoph Borchardt | 2017-03-30 | 1 | -1/+30 | |
* | | | | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-02 | 18 | -2/+64 | |
* | | | | | | | | | | Merge pull request #4139 from nextcloud/phpseclib | Roeland Jago Douma | 2017-04-01 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [3rdparty] Bump phpseclib to 2.0.4 | Roeland Jago Douma | 2017-03-30 | 1 | -0/+0 | |
* | | | | | | | | | | | Merge pull request #4174 from nextcloud/mergejs-newline | Christoph Wurst | 2017-04-01 | 2 | -7/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | mergejs should print a newline between imports | Roeland Jago Douma | 2017-03-31 | 2 | -7/+24 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* / | | | | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-01 | 26 | -200/+1036 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #3438 from nextcloud/external-storage-user-folder | Roeland Jago Douma | 2017-03-31 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Allow using '/' as external storage root | Robin Appelman | 2017-03-23 | 2 | -2/+2 | |
* | | | | | | | | | | | Merge pull request #4140 from nextcloud/no_encryption_no_wrapper | Björn Schießle | 2017-03-31 | 2 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fix setup of external storage integration tests | Robin Appelman | 2017-03-30 | 1 | -1/+1 | |
| * | | | | | | | | | | | Don't add the Encryption Storage Wrapper if there are no encryption modules | Roeland Jago Douma | 2017-03-29 | 1 | -2/+5 | |
* | | | | | | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-31 | 54 | -224/+568 | |
* | | | | | | | | | | | | Merge pull request #3832 from nextcloud/fix_1303 | Roeland Jago Douma | 2017-03-30 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Do not clear CSRF token on logout (fix for #1303) | Roeland Jago Douma | 2017-03-13 | 1 | -0/+4 | |
* | | | | | | | | | | | | Merge pull request #4150 from nextcloud/capped-memcache-push | Joas Schilling | 2017-03-30 | 2 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | user ids are strings | Robin Appelman | 2017-03-30 | 1 | -1/+2 | |
| * | | | | | | | | | | | | support pushing to CappedMemoryCache | Robin Appelman | 2017-03-30 | 1 | -1/+5 | |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #4128 from nextcloud/updateclipboard | Joas Schilling | 2017-03-30 | 6 | -1485/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Use minified clipboard.js | Roeland Jago Douma | 2017-03-29 | 5 | -1517/+11 | |
| * | | | | | | | | | | | | Update clipboard.js | Roeland Jago Douma | 2017-03-29 | 2 | -210/+246 | |
* | | | | | | | | | | | | | Merge pull request #4143 from nextcloud/ldap-downstream-64 | Roeland Jago Douma | 2017-03-30 | 2 | -32/+366 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Include tests for "default" and "none" quotas | Juan Pablo Villafáñez | 2017-03-29 | 1 | -0/+80 | |
| * | | | | | | | | | | | | | Add comments in the updateQuota method to explain the behavior | Juan Pablo Villafáñez | 2017-03-29 | 1 | -0/+14 | |
| * | | | | | | | | | | | | | Add new testes to cover more cases | Juan Pablo Villafáñez | 2017-03-29 | 1 | -0/+210 | |
| * | | | | | | | | | | | | | Adjust current tests to match the expectations | Juan Pablo Villafáñez | 2017-03-29 | 1 | -28/+26 | |
| * | | | | | | | | | | | | | Check if the user exists before trying to set the quota | Juan Pablo Villafáñez | 2017-03-29 | 1 | -4/+9 | |
| * | | | | | | | | | | | | | Correctly apply quota | Juan Pablo Villafáñez | 2017-03-29 | 1 | -6/+33 | |
* | | | | | | | | | | | | | | Merge pull request #3089 from nextcloud/cache-move-single-query | Roeland Jago Douma | 2017-03-30 | 18 | -28/+542 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | rename fun to func | Robin Appelman | 2017-03-30 | 4 | -7/+7 | |
| * | | | | | | | | | | | | | Add tests for query builder (i)like | Robin Appelman | 2017-03-30 | 2 | -1/+107 | |
| * | | | | | | | | | | | | | dont double escape | Robin Appelman | 2017-03-30 | 2 | -2/+0 | |
| * | | | | | | | | | | | | | update autoloader | Robin Appelman | 2017-03-30 | 2 | -0/+12 |