summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-03-3144-148/+382
|
* Merge pull request #4143 from nextcloud/ldap-downstream-64Roeland Jago Douma2017-03-302-32/+366
|\ | | | | Correctly apply quota
| * Include tests for "default" and "none" quotasJuan Pablo Villafáñez2017-03-291-0/+80
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Add comments in the updateQuota method to explain the behaviorJuan Pablo Villafáñez2017-03-291-0/+14
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Add new testes to cover more casesJuan Pablo Villafáñez2017-03-291-0/+210
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Adjust current tests to match the expectationsJuan Pablo Villafáñez2017-03-291-28/+26
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Check if the user exists before trying to set the quotaJuan Pablo Villafáñez2017-03-291-4/+9
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Correctly apply quotaJuan Pablo Villafáñez2017-03-291-6/+33
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2017-03-3088-172/+230
| |
* | 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-2913-25/+25
|\ \ | | | | | | rename confusing getMailHeaderColor to getColorPrimary, ref #3491
| * | rename confusing getMailHeaderColor to getColorPrimary, ref #3491Jan-Christoph Borchardt2017-03-2913-25/+25
| |/ | | | | | | 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-3121-78/+598
| |\ \ | | | | | | | | | | | | 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 #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-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Replace unecessary unescaped prints with print
| * | | | | Replace unecessary unescaped prints with printLukas Reschke2017-03-291-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | There's no need to have those unescaped from what I can see. 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>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-2912-76/+362
| | | | | |
* | | | | | Merge pull request #4126 from nextcloud/better-empty-content-in-the-sidebarMorris Jobke2017-03-282-6/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Better styling of the empty content messages in the sidebar
| * | | | | Better styling of the empty content messages in the sidebarJoas Schilling2017-03-282-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #4004 from nextcloud/backport-27172Roeland Jago Douma2017-03-283-0/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove SharedCache::getNumericStorageId to let CacheWrapper do it
| * | | | | fix shared storage numeric idRobin Appelman2017-03-273-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | do not remove the method and only keep the testsMorris Jobke2017-03-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Remove SharedCache::getNumericStorageId to let CacheWrapper do itVincent Petry2017-03-232-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CacheWrapper will properly forward the call to the wrapped cache. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4082 from nextcloud/fix-menuJohn Molakvoæ2017-03-281-3/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix pop over menu opacity
| * | | | | | Fix pop over menu opacityMorris Jobke2017-03-261-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-2822-2/+184
| | | | | | |
* | | | | | | Fix LDAP descriptionMarius Blüm2017-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-27448-5360/+602
| | | | | | |
* | | | | | | Fix the testsJoas Schilling2017-03-261-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Allow multiple navigation links from info.xmlJoas Schilling2017-03-262-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Manage the right side menu via the navigation manager as wellJoas Schilling2017-03-261-1/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Fix unit testJoas Schilling2017-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Also remove failure notification if no update is availableMorris Jobke2017-03-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * error happened and vanished the notification should also vanish even if no update is available Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Create a notification when the update server couldn't be reached for some daysJoas Schilling2017-03-264-42/+144
| |_|/ / / |/| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>