summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3781 from nextcloud/fac-56-log-spam-with-external-storagesRoeland Jago Douma2017-04-051-5/+13
|\ | | | | Also add the root of external storages to the file id list
| * Also add the root of external storages to the file id listJoas Schilling2017-03-301-5/+13
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-04-0532-56/+402
| |
* | fix fseek against string not resource by removing append supportArthur Schiwon2017-04-041-7/+4
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12Roeland Jago Douma2017-04-042-18/+34
|\ \ | | | | | | Make public links work with master key
| * | Use master key for public links as wellVincent Petry2017-03-242-23/+35
| | |
| * | Add tests for null userVincent Petry2017-03-241-1/+5
| | |
| * | Fix public link for master keyVincent Petry2017-03-241-1/+1
| | | | | | | | | | | | | | | In public link mode there is no session, so the code should use the public key instead.
* | | Some more hardeningJoas Schilling2017-04-041-6/+7
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | file-upload.js modified : Remaining upload time correctedSarthikaDhawan2017-04-041-1/+10
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-0422-38/+404
| | |
* | | Merge pull request #3620 from ↵Morris Jobke2017-04-035-15/+207
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/1463/editable_color_name_for_shared_calendars allow sharees to edit certain calendar properties for themselves
| * | | OCA\DAV\Files\CustomPropertiesBackend -> OCA\DAV\DAV\CustomPropertiesBackendGeorg Ehrke2017-03-273-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | allow sharees to edit certain calendar properties for themselvesGeorg Ehrke2017-03-274-13/+205
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #4166 from ↵Roeland Jago Douma2017-04-031-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/issue-4165-invalid-int-for-transparency-on-calendars Make sure transparency is an integer when saving a calendar
| * | | | Make sure transparency is an integer when saving a calendarJoas Schilling2017-03-301-2/+2
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-0320-8/+170
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-0212-2/+56
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-0122-168/+362
| | | |
* | | | Merge pull request #3438 from nextcloud/external-storage-user-folderRoeland Jago Douma2017-03-312-2/+2
|\ \ \ \ | | | | | | | | | | Allow using '/' as external storage mountpoint
| * | | | Allow using '/' as external storage rootRobin Appelman2017-03-232-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | [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