Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 |
| * | | | | fix licence headers | Robin Appelman | 2017-03-30 | 6 | -48/+54 |
| * | | | | Move all children of a folder in a single query | Robin Appelman | 2017-03-30 | 1 | -18/+27 |
| * | | | | Add function builder to the query builder | Robin Appelman | 2017-03-30 | 8 | -0/+326 |
| * | | | | add support for escaping like parameters when using the query builder | Robin Appelman | 2017-03-30 | 4 | -8/+62 |
| * | | | | Add MD5() to sqlite | Robin Appelman | 2017-03-30 | 1 | -0/+3 |
|/ / / / | |||||
* | | | | Merge pull request #4132 from nextcloud/fix-safari-gzip | Lukas Reschke | 2017-03-30 | 8 | -18/+18 |
|\ \ \ \ | |||||
| * | | | | Fix gzip files for Safari | Morris Jobke | 2017-03-29 | 8 | -18/+18 |
* | | | | | Merge pull request #4100 from nextcloud/header-indicator | Morris Jobke | 2017-03-29 | 2 | -2/+26 |
|\ \ \ \ \ | |||||
| * | | | | | adjust opacity of search and gear icons in header | Jan-Christoph Borchardt | 2017-03-27 | 2 | -2/+7 |
| * | | | | | add pointer finger to full clickable app icon area | Jan-Christoph Borchardt | 2017-03-27 | 1 | -0/+1 |
| * | | | | | show triangle below user menu too when an entry inside there is active | Jan-Christoph Borchardt | 2017-03-27 | 1 | -0/+18 |
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-30 | 98 | -308/+402 |
* | | | | | | Merge pull request #4142 from nextcloud/numeric_avatar | Morris Jobke | 2017-03-29 | 1 | -0/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix tests | Roeland Jago Douma | 2017-03-29 | 1 | -2/+6 |
| * | | | | | | Allow avatars for full numeric users | Roeland Jago Douma | 2017-03-29 | 1 | -0/+3 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #4141 from nextcloud/ldap-downstream-9 | Morris Jobke | 2017-03-29 | 1 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Convert the group limit to match the same behaviour as the user search | Juan Pablo Villafáñez | 2017-03-29 | 1 | -0/+5 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4145 from nextcloud/ldap-downstream-54 | Roeland Jago Douma | 2017-03-29 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add tooltips to LDAP wizard special attributtes | David Toledo | 2017-03-29 | 1 | -3/+3 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4108 from nextcloud/color-variable-rename | Roeland Jago Douma | 2017-03-29 | 20 | -40/+43 |
|\ \ \ \ \ \ | |||||
| * | | | | | | also rename defaultMailHeaderColor to defaultColorPrimary | Jan-Christoph Borchardt | 2017-03-29 | 1 | -4/+4 |
| * | | | | | | Add fallback to getMailHeaderColor so we don't break existing themes | Julius Härtl | 2017-03-29 | 1 | -2/+5 |
| * | | | | | | rename confusing getMailHeaderColor to getColorPrimary, ref #3491 | Jan-Christoph Borchardt | 2017-03-29 | 20 | -37/+37 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid | Roeland Jago Douma | 2017-03-29 | 1 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/nextcloud/server into ldap_no-mem... | Andreas Pflug | 2017-01-31 | 44 | -192/+1037 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Don't try to use memberof on posixgroups, since it doesn't support | Andreas Pflug | 2017-01-31 | 1 | -1/+3 |
* | | | | | | | | Merge pull request #4062 from nextcloud/downstream-26872 | Morris Jobke | 2017-03-29 | 8 | -3/+427 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Don't output jpeg if we request png | Roeland Jago Douma | 2017-03-29 | 1 | -1/+2 |
| * | | | | | | | Fix PHPDoc | Lukas Reschke | 2017-03-29 | 1 | -1/+1 |