summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Fix inspection resultsRoeland Jago Douma2017-03-293-22/+23
| * | | Adding AvatarNodeTestThomas Müller2017-03-292-1/+48
| * | | Adding AvatarHomeTestThomas Müller2017-03-294-9/+147
| * | | Return last modification time to allow proper listing in cadaverThomas Müller2017-03-291-4/+9
| * | | Adding dav resource for avatarsThomas Müller2017-03-295-1/+233
* | | | Merge pull request #4116 from nextcloud/swift-cache-tokenRoeland Jago Douma2017-03-292-10/+62
|\ \ \ \
| * | | | serialize the token to json instead of using php's serializeRobin Appelman2017-03-281-10/+36
| * | | | cache swift tokens in memcacheRobin Appelman2017-03-281-10/+36
| * | | | update rackspace/opencloud to 1.16.0Robin Appelman2017-03-281-0/+0
* | | | | Merge pull request #4066 from nextcloud/always-fix-the-values-liveRoeland Jago Douma2017-03-297-452/+371
|\ \ \ \ \
| * | | | | Directly fix the valuesJoas Schilling2017-03-267-452/+371
* | | | | | Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-pJoas Schilling2017-03-292-2/+2
|\ \ \ \ \ \
| * | | | | | Replace unecessary unescaped prints with printLukas Reschke2017-03-292-2/+2
* | | | | | | Merge pull request #4129 from nextcloud/remove-verbose-error-messageJoas Schilling2017-03-291-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Remove verbose error messageLukas Reschke2017-03-291-2/+3
| |/ / / / / /
* | | | | | | Merge pull request #4060 from nextcloud/shared_by_for_own_calendarsMorris Jobke2017-03-292-0/+8
|\ \ \ \ \ \ \
| * | | | | | | fix bug with shared_by for own calendars if sharedGeorg Ehrke2017-03-252-0/+8
* | | | | | | | Merge pull request #4091 from nextcloud/Rudloff-manifestMorris Jobke2017-03-2810-113/+129
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix unit testsMorris Jobke2017-03-287-113/+113
| * | | | | | | | Web app manifestPierre Rudloff2017-03-283-0/+16
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-2952-76/+418
* | | | | | | | | Merge pull request #4120 from nextcloud/newest-item-first-in-activityMorris Jobke2017-03-281-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change the order on merging activities so the newest item is firstJoas Schilling2017-03-281-4/+4
* | | | | | | | | | Merge pull request #4126 from nextcloud/better-empty-content-in-the-sidebarMorris Jobke2017-03-283-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Better styling of the empty content messages in the sidebarJoas Schilling2017-03-283-6/+6
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4127 from nextcloud/update-legacy-csp-policyMorris Jobke2017-03-281-1/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update legacy CSP policyLukas Reschke2017-03-281-1/+3
* | | | | | | | | | Merge pull request #4121 from nextcloud/split-sharing-integration-testsMorris Jobke2017-03-283-710/+728
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Split long running features/sharing-v1.feature into two smaller partsMorris Jobke2017-03-283-710/+728
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4070 from nextcloud/gzip_scss_jsMorris Jobke2017-03-288-35/+327
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix controller testsRoeland Jago Douma2017-03-282-2/+134
| * | | | | | | | | Fix testsRoeland Jago Douma2017-03-283-29/+117
| * | | | | | | | | Allow to gzip CSS/JS filesRoeland Jago Douma2017-03-284-5/+77
| | |/ / / / / / / | |/| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 18:07:08 +0000