summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7076 from nextcloud/s3-valid-bucket-nameMorris Jobke2017-11-061-2/+2
|\ | | | | Better error message for invalid bucket names
| * Better error message for invalid bucket namesMorris Jobke2017-11-061-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structureMorris Jobke2017-11-0640-176/+2875
|\ \ | | | | | | Implement plugins infrastructure in User_LDAP
| * | User_LDAP plugins: smaller fixesVinicius Cubas Brand2017-11-0314-63/+134
| | | | | | | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
| * | Plugins infrastructure in User_LDAPVinicius Cubas Brand2017-11-0336-175/+2803
| |/ | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
* | Merge pull request #7078 from nextcloud/jenkins-cleanupRoeland Jago Douma2017-11-061-4/+3
|\ \ | | | | | | Remove Jenkins variables from autotest.sh
| * | Remove Jenkins varibales from autotest.shMorris Jobke2017-11-061-4/+3
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #6402 from nextcloud/dav-email-customizationMorris Jobke2017-11-066-48/+382
|\ \ | | | | | | Enhance calendar invitation emails
| * | Make L10N->l provide weekdayNameGeorg Ehrke2017-11-032-0/+7
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | fancify invitation emailsGeorg Ehrke2017-11-032-45/+253
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | Correctly use the email templatingJoas Schilling2017-11-031-80/+47
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Language depending datesJoas Schilling2017-11-031-5/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix phpStorm complaintsJoas Schilling2017-11-033-52/+55
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | DAV: Initial email customization supportLeon Klingele2017-11-033-16/+168
| | | | | | | | | | | | | | | Signed-Off-By: Leon Klingele <leon@struktur.de> Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #7054 from nextcloud/timepicker-designJan-Christoph Borchardt2017-11-062-2/+72
|\ \ \ | | | | | | | | Improve timepicker design, align to datepicker
| * | | Fix opacity of minutes in timepickerJan-Christoph Borchardt2017-11-061-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Bg variable for menu arrowJohn Molakvoæ (skjnldsv)2017-11-061-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Add vertical separator between hours and minutesJan-Christoph Borchardt2017-11-031-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Improve timepicker design, align to datepickerJan-Christoph Borchardt2017-11-032-1/+68
| | |/ | |/| | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #7077 from nextcloud/jshint-improvementsMorris Jobke2017-11-069-15/+15
|\ \ \ | | | | | | | | Reduce JSHint errors/warnings
| * | | Reduce JSHint errors/warningsMorris Jobke2017-11-069-15/+15
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7074 from nextcloud/use-proper-whitespaceChristoph Wurst2017-11-061-1/+1
|\ \ \ | | | | | | | | Use proper whitespace
| * | | Use proper whitespaceMorris Jobke2017-11-061-1/+1
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-11-0616-110/+148
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-11-054-0/+8
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-11-0414-0/+30
| | |
* | | Merge pull request #6688 from nextcloud/more-variablesJan-Christoph Borchardt2017-11-0310-21/+22
|\ \ \ | |/ / |/| | Add variable for border-radius and box-shadow
| * | Add variable for border-radiusJan-Christoph Borchardt2017-11-0310-21/+22
|/ / | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #7049 from nextcloud/fix-actions-menuJan-Christoph Borchardt2017-11-032-6/+1
|\ \ | | | | | | Fix opening the file actions menu in mobile
| * | Fix opening the file actions menu in mobileMorris Jobke2017-11-032-6/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7048 from nextcloud/flexbox-cssJan-Christoph Borchardt2017-11-033-25/+0
|\ \ \ | | | | | | | | Vendor prefix for flexbox not needed anymore
| * | | Vendor prefix for flexbox not needed anymoreMorris Jobke2017-11-033-25/+0
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-11-03230-214/+7350
| | |
* | | Merge pull request #6652 from nextcloud/sharing-link-menuJohn Molakvoæ2017-11-026-53/+89
|\ \ \ | | | | | | | | Move sharing page options to menu in top right
| * | | Fix Scrutinizer issueJan-Christoph Borchardt2017-11-021-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Clicking publicly shared image opens direct preview urlJan-Christoph Borchardt2017-11-012-4/+6
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Directly show linkJan-Christoph Borchardt2017-11-012-9/+8
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Use standard way of showing and hiding popover menuJan-Christoph Borchardt2017-11-012-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Fix scrollbar showing up on public pageJan-Christoph Borchardt2017-11-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Show and hide menu via Javascript, thanks @skjnldsvJan-Christoph Borchardt2017-11-013-2/+24
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Adjust prominence of shared-by info to not overpower file nameJan-Christoph Borchardt2017-11-011-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Add label to download actionJan-Christoph Borchardt2017-11-012-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Fix display of Download entry textJan-Christoph Borchardt2017-11-013-7/+5
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Fix header text hiding completely or wrapping wronglyJan-Christoph Borchardt2017-11-012-5/+2
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Move shared page controls to menu in top rightJan-Christoph Borchardt2017-11-012-30/+43
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorageRoeland Jago Douma2017-11-021-2/+22
|\ \ \ \ | | | | | | | | | | Fix seeking on object storage
| * | | | Fix seeking on object storageMorris Jobke2017-10-271-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #6094 from nextcloud/sharedby-avatarJan-Christoph Borchardt2017-11-024-58/+68
|\ \ \ \ \ | | | | | | | | | | | | Show avatar instead of username for shared files
| * | | | | adjust more js unit testsArthur Schiwon2017-11-021-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | use single quotesArthur Schiwon2017-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>