summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structureMorris Jobke2017-11-0640-176/+2875
|\
| * User_LDAP plugins: smaller fixesVinicius Cubas Brand2017-11-0314-63/+134
| * Plugins infrastructure in User_LDAPVinicius Cubas Brand2017-11-0336-175/+2803
* | Merge pull request #7078 from nextcloud/jenkins-cleanupRoeland Jago Douma2017-11-061-4/+3
|\ \
| * | Remove Jenkins varibales from autotest.shMorris Jobke2017-11-061-4/+3
| |/
* | Merge pull request #6402 from nextcloud/dav-email-customizationMorris Jobke2017-11-066-48/+382
|\ \
| * | Make L10N->l provide weekdayNameGeorg Ehrke2017-11-032-0/+7
| * | fancify invitation emailsGeorg Ehrke2017-11-032-45/+253
| * | Correctly use the email templatingJoas Schilling2017-11-031-80/+47
| * | Language depending datesJoas Schilling2017-11-031-5/+2
| * | Fix phpStorm complaintsJoas Schilling2017-11-033-52/+55
| * | DAV: Initial email customization supportLeon Klingele2017-11-033-16/+168
* | | Merge pull request #7054 from nextcloud/timepicker-designJan-Christoph Borchardt2017-11-062-2/+72
|\ \ \
| * | | Fix opacity of minutes in timepickerJan-Christoph Borchardt2017-11-061-1/+0
| * | | Bg variable for menu arrowJohn Molakvoæ (skjnldsv)2017-11-061-1/+1
| * | | Add vertical separator between hours and minutesJan-Christoph Borchardt2017-11-031-0/+4
| * | | Improve timepicker design, align to datepickerJan-Christoph Borchardt2017-11-032-1/+68
| | |/ | |/|
* | | Merge pull request #7077 from nextcloud/jshint-improvementsMorris Jobke2017-11-069-15/+15
|\ \ \
| * | | Reduce JSHint errors/warningsMorris Jobke2017-11-069-15/+15
| |/ /
* | | Merge pull request #7074 from nextcloud/use-proper-whitespaceChristoph Wurst2017-11-061-1/+1
|\ \ \
| * | | Use proper whitespaceMorris Jobke2017-11-061-1/+1
| |/ /
* | | [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-radiusJan-Christoph Borchardt2017-11-0310-21/+22
|/ /
* | Merge pull request #7049 from nextcloud/fix-actions-menuJan-Christoph Borchardt2017-11-032-6/+1
|\ \
| * | Fix opening the file actions menu in mobileMorris Jobke2017-11-032-6/+1
* | | Merge pull request #7048 from nextcloud/flexbox-cssJan-Christoph Borchardt2017-11-033-25/+0
|\ \ \
| * | | Vendor prefix for flexbox not needed anymoreMorris Jobke2017-11-033-25/+0
| |/ /
* | | [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
|\ \ \
| * | | Fix Scrutinizer issueJan-Christoph Borchardt2017-11-021-1/+2
| * | | Clicking publicly shared image opens direct preview urlJan-Christoph Borchardt2017-11-012-4/+6
| * | | Directly show linkJan-Christoph Borchardt2017-11-012-9/+8
| * | | Use standard way of showing and hiding popover menuJan-Christoph Borchardt2017-11-012-3/+3
| * | | Fix scrollbar showing up on public pageJan-Christoph Borchardt2017-11-011-1/+1
| * | | Show and hide menu via Javascript, thanks @skjnldsvJan-Christoph Borchardt2017-11-013-2/+24
| * | | Adjust prominence of shared-by info to not overpower file nameJan-Christoph Borchardt2017-11-011-1/+2
| * | | Add label to download actionJan-Christoph Borchardt2017-11-012-1/+4
| * | | Fix display of Download entry textJan-Christoph Borchardt2017-11-013-7/+5
| * | | Fix header text hiding completely or wrapping wronglyJan-Christoph Borchardt2017-11-012-5/+2
| * | | Move shared page controls to menu in top rightJan-Christoph Borchardt2017-11-012-30/+43
* | | | Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorageRoeland Jago Douma2017-11-021-2/+22
|\ \ \ \
| * | | | Fix seeking on object storageMorris Jobke2017-10-271-2/+22
* | | | | Merge pull request #6094 from nextcloud/sharedby-avatarJan-Christoph Borchardt2017-11-024-58/+68
|\ \ \ \ \
| * | | | | adjust more js unit testsArthur Schiwon2017-11-021-6/+6
| * | | | | use single quotesArthur Schiwon2017-11-021-2/+2
| * | | | | Adjust js testsArthur Schiwon2017-11-012-36/+35
| * | | | | Fix test for tooltip and local share ownerJan-Christoph Borchardt2017-11-013-6/+8