summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix quote helper testRobin Appelman2017-03-302-2/+2
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* update FakeManagerRobin Appelman2017-03-301-0/+3
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* use castColumnRobin Appelman2017-03-301-4/+1
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Add test for getting unread comment count by folderRobin Appelman2017-03-302-81/+145
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Allow getting the unread comment count for an entire folder at onceRobin Appelman2017-03-304-90/+169
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #4132 from nextcloud/fix-safari-gzipLukas Reschke2017-03-308-18/+18
|\ | | | | Fix gzip files for Safari
| * Fix gzip files for SafariMorris Jobke2017-03-298-18/+18
| | | | | | | | | | | | | | * Safari support gzip only if the filename does not end on .gz - so this renames them to .gzip Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4100 from nextcloud/header-indicatorMorris Jobke2017-03-292-2/+26
|\ \ | | | | | | show triangle below user menu too when an entry inside there is active
| * | adjust opacity of search and gear icons in headerJan-Christoph Borchardt2017-03-272-2/+7
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | add pointer finger to full clickable app icon areaJan-Christoph Borchardt2017-03-271-0/+1
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | show triangle below user menu too when an entry inside there is activeJan-Christoph Borchardt2017-03-271-0/+18
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-3098-308/+402
| | |
* | | Merge pull request #4142 from nextcloud/numeric_avatarMorris Jobke2017-03-291-0/+7
|\ \ \ | | | | | | | | Allow avatars for full numeric users
| * | | Fix testsRoeland Jago Douma2017-03-291-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Allow avatars for full numeric usersRoeland Jago Douma2017-03-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4087 Because of fancy javascript if a full numeric uid was used javascript would convert this to an int. Now we just convert everything to a string first. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | 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 search
| * | | | Convert the group limit to match the same behaviour as the user searchJuan Pablo Villafáñez2017-03-291-0/+5
| |/ / / | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #4145 from nextcloud/ldap-downstream-54Roeland Jago Douma2017-03-291-3/+3
|\ \ \ \ | | | | | | | | | | Add tooltips to LDAP wizard special attributtes
| * | | | Add tooltips to LDAP wizard special attributtesDavid Toledo2017-03-291-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Update settings.php Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Update settings.php Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> Update settings.php Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #4108 from nextcloud/color-variable-renameRoeland Jago Douma2017-03-2920-40/+43
|\ \ \ \ | | | | | | | | | | rename confusing getMailHeaderColor to getColorPrimary, ref #3491
| * | | | also rename defaultMailHeaderColor to defaultColorPrimaryJan-Christoph Borchardt2017-03-291-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | Add fallback to getMailHeaderColor so we don't break existing themesJulius Härtl2017-03-291-2/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | rename confusing getMailHeaderColor to getColorPrimary, ref #3491Jan-Christoph Borchardt2017-03-2920-37/+37
| |/ / / | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuidRoeland Jago Douma2017-03-291-1/+3
|\ \ \ \ | | | | | | | | | | Ldap no memberof with memberuid
| * \ \ \ Merge branch 'master' of https://github.com/nextcloud/server into ↵Andreas Pflug2017-01-3144-192/+1037
| |\ \ \ \ | | | | | | | | | | | | | | | | | | ldap_no-memberof-with-memberuid
| * | | | | Don't try to use memberof on posixgroups, since it doesn't supportAndreas Pflug2017-01-311-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memberUid attributes. Signed-off-by: Andreas Pflug <dev@admin4.org>
* | | | | | Merge pull request #4062 from nextcloud/downstream-26872Morris Jobke2017-03-298-3/+427
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Adding dav resource for avatars
| * | | | | Don't output jpeg if we request pngRoeland Jago Douma2017-03-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix PHPDocLukas Reschke2017-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Fix inspection resultsRoeland Jago Douma2017-03-293-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Adding AvatarNodeTestThomas Müller2017-03-292-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Adding AvatarHomeTestThomas Müller2017-03-294-9/+147
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Return last modification time to allow proper listing in cadaverThomas Müller2017-03-291-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Adding dav resource for avatarsThomas Müller2017-03-295-1/+233
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4116 from nextcloud/swift-cache-tokenRoeland Jago Douma2017-03-292-10/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cache swift authentication token in memcache
| * | | | | | serialize the token to json instead of using php's serializeRobin Appelman2017-03-281-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | cache swift tokens in memcacheRobin Appelman2017-03-281-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | update rackspace/opencloud to 1.16.0Robin Appelman2017-03-281-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #4066 from nextcloud/always-fix-the-values-liveRoeland Jago Douma2017-03-297-452/+371
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Directly fix invalid values of DTEND and DTSTART
| * | | | | | | Directly fix the valuesJoas Schilling2017-03-267-452/+371
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-pJoas Schilling2017-03-292-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Replace unecessary unescaped prints with print
| * | | | | | | | Replace unecessary unescaped prints with printLukas Reschke2017-03-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to have those unescaped from what I can see. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | | | Merge pull request #4129 from nextcloud/remove-verbose-error-messageJoas Schilling2017-03-291-2/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove verbose error message
| * | | | | | | | | Remove verbose error messageLukas Reschke2017-03-291-2/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to have this included in the error message. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | | | 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 shared
| * | | | | | | | fix bug with shared_by for own calendars if sharedGeorg Ehrke2017-03-252-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | | | | Merge pull request #4091 from nextcloud/Rudloff-manifestMorris Jobke2017-03-2810-113/+129
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Web app manifest for adding to Android home screen
| * | | | | | | | | Fix unit testsMorris Jobke2017-03-287-113/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | | | Web app manifestPierre Rudloff2017-03-283-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-2952-76/+418
| | | | | | | | | |