summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-03-3154-224/+568
* Merge pull request #3832 from nextcloud/fix_1303Roeland Jago Douma2017-03-301-0/+4
|\
| * Do not clear CSRF token on logout (fix for #1303)Roeland Jago Douma2017-03-131-0/+4
* | Merge pull request #4150 from nextcloud/capped-memcache-pushJoas Schilling2017-03-302-2/+7
|\ \
| * | user ids are stringsRobin Appelman2017-03-301-1/+2
| * | support pushing to CappedMemoryCacheRobin Appelman2017-03-301-1/+5
* | | Merge pull request #4128 from nextcloud/updateclipboardJoas Schilling2017-03-306-1485/+15
|\ \ \
| * | | Use minified clipboard.jsRoeland Jago Douma2017-03-295-1517/+11
| * | | Update clipboard.jsRoeland Jago Douma2017-03-292-210/+246
* | | | Merge pull request #4143 from nextcloud/ldap-downstream-64Roeland Jago Douma2017-03-302-32/+366
|\ \ \ \
| * | | | Include tests for "default" and "none" quotasJuan Pablo Villafáñez2017-03-291-0/+80
| * | | | Add comments in the updateQuota method to explain the behaviorJuan Pablo Villafáñez2017-03-291-0/+14
| * | | | Add new testes to cover more casesJuan Pablo Villafáñez2017-03-291-0/+210
| * | | | Adjust current tests to match the expectationsJuan Pablo Villafáñez2017-03-291-28/+26
| * | | | Check if the user exists before trying to set the quotaJuan Pablo Villafáñez2017-03-291-4/+9
| * | | | Correctly apply quotaJuan Pablo Villafáñez2017-03-291-6/+33
* | | | | Merge pull request #3089 from nextcloud/cache-move-single-queryRoeland Jago Douma2017-03-3018-28/+542
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | rename fun to funcRobin Appelman2017-03-304-7/+7
| * | | | Add tests for query builder (i)likeRobin Appelman2017-03-302-1/+107
| * | | | dont double escapeRobin Appelman2017-03-302-2/+0
| * | | | update autoloaderRobin Appelman2017-03-302-0/+12
| * | | | fix licence headersRobin Appelman2017-03-306-48/+54
| * | | | Move all children of a folder in a single queryRobin Appelman2017-03-301-18/+27
| * | | | Add function builder to the query builderRobin Appelman2017-03-308-0/+326
| * | | | add support for escaping like parameters when using the query builderRobin Appelman2017-03-304-8/+62
| * | | | Add MD5() to sqliteRobin Appelman2017-03-301-0/+3
|/ / / /
* | | | Merge pull request #4132 from nextcloud/fix-safari-gzipLukas Reschke2017-03-308-18/+18
|\ \ \ \
| * | | | Fix gzip files for SafariMorris Jobke2017-03-298-18/+18
* | | | | Merge pull request #4100 from nextcloud/header-indicatorMorris Jobke2017-03-292-2/+26
|\ \ \ \ \
| * | | | | adjust opacity of search and gear icons in headerJan-Christoph Borchardt2017-03-272-2/+7
| * | | | | add pointer finger to full clickable app icon areaJan-Christoph Borchardt2017-03-271-0/+1
| * | | | | show triangle below user menu too when an entry inside there is activeJan-Christoph Borchardt2017-03-271-0/+18
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-3098-308/+402
* | | | | | Merge pull request #4142 from nextcloud/numeric_avatarMorris Jobke2017-03-291-0/+7
|\ \ \ \ \ \
| * | | | | | Fix testsRoeland Jago Douma2017-03-291-2/+6
| * | | | | | Allow avatars for full numeric usersRoeland Jago Douma2017-03-291-0/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #4141 from nextcloud/ldap-downstream-9Morris Jobke2017-03-291-0/+5
|\ \ \ \ \ \
| * | | | | | Convert the group limit to match the same behaviour as the user searchJuan Pablo Villafáñez2017-03-291-0/+5
| |/ / / / /
* | | | | | Merge pull request #4145 from nextcloud/ldap-downstream-54Roeland Jago Douma2017-03-291-3/+3
|\ \ \ \ \ \
| * | | | | | Add tooltips to LDAP wizard special attributtesDavid Toledo2017-03-291-3/+3
| |/ / / / /
* | | | | | Merge pull request #4108 from nextcloud/color-variable-renameRoeland Jago Douma2017-03-2920-40/+43
|\ \ \ \ \ \
| * | | | | | also rename defaultMailHeaderColor to defaultColorPrimaryJan-Christoph Borchardt2017-03-291-4/+4
| * | | | | | Add fallback to getMailHeaderColor so we don't break existing themesJulius Härtl2017-03-291-2/+5
| * | | | | | rename confusing getMailHeaderColor to getColorPrimary, ref #3491Jan-Christoph Borchardt2017-03-2920-37/+37
| |/ / / / /
* | | | | | Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuidRoeland Jago Douma2017-03-291-1/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/nextcloud/server into ldap_no-mem...Andreas Pflug2017-01-3144-192/+1037
| |\ \ \ \ \ \
| * | | | | | | Don't try to use memberof on posixgroups, since it doesn't supportAndreas Pflug2017-01-311-1/+3
* | | | | | | | Merge pull request #4062 from nextcloud/downstream-26872Morris Jobke2017-03-298-3/+427
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Don't output jpeg if we request pngRoeland Jago Douma2017-03-291-1/+2
| * | | | | | | Fix PHPDocLukas Reschke2017-03-291-1/+1