Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7076 from nextcloud/s3-valid-bucket-name | Morris Jobke | 2017-11-06 | 1 | -2/+2 |
|\ | | | | | Better error message for invalid bucket names | ||||
| * | Better error message for invalid bucket names | Morris Jobke | 2017-11-06 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structure | Morris Jobke | 2017-11-06 | 40 | -176/+2875 |
|\ \ | | | | | | | Implement plugins infrastructure in User_LDAP | ||||
| * | | User_LDAP plugins: smaller fixes | Vinicius Cubas Brand | 2017-11-03 | 14 | -63/+134 |
| | | | | | | | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com> | ||||
| * | | Plugins infrastructure in User_LDAP | Vinicius Cubas Brand | 2017-11-03 | 36 | -175/+2803 |
| |/ | | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com> | ||||
* | | Merge pull request #7078 from nextcloud/jenkins-cleanup | Roeland Jago Douma | 2017-11-06 | 1 | -4/+3 |
|\ \ | | | | | | | Remove Jenkins variables from autotest.sh | ||||
| * | | Remove Jenkins varibales from autotest.sh | Morris Jobke | 2017-11-06 | 1 | -4/+3 |
| |/ | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #6402 from nextcloud/dav-email-customization | Morris Jobke | 2017-11-06 | 6 | -48/+382 |
|\ \ | | | | | | | Enhance calendar invitation emails | ||||
| * | | Make L10N->l provide weekdayName | Georg Ehrke | 2017-11-03 | 2 | -0/+7 |
| | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
| * | | fancify invitation emails | Georg Ehrke | 2017-11-03 | 2 | -45/+253 |
| | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com> | ||||
| * | | Correctly use the email templating | Joas Schilling | 2017-11-03 | 1 | -80/+47 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Language depending dates | Joas Schilling | 2017-11-03 | 1 | -5/+2 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Fix phpStorm complaints | Joas Schilling | 2017-11-03 | 3 | -52/+55 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | DAV: Initial email customization support | Leon Klingele | 2017-11-03 | 3 | -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-design | Jan-Christoph Borchardt | 2017-11-06 | 2 | -2/+72 |
|\ \ \ | | | | | | | | | Improve timepicker design, align to datepicker | ||||
| * | | | Fix opacity of minutes in timepicker | Jan-Christoph Borchardt | 2017-11-06 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Bg variable for menu arrow | John Molakvoæ (skjnldsv) | 2017-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | | Add vertical separator between hours and minutes | Jan-Christoph Borchardt | 2017-11-03 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Improve timepicker design, align to datepicker | Jan-Christoph Borchardt | 2017-11-03 | 2 | -1/+68 |
| | |/ | |/| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | Merge pull request #7077 from nextcloud/jshint-improvements | Morris Jobke | 2017-11-06 | 9 | -15/+15 |
|\ \ \ | | | | | | | | | Reduce JSHint errors/warnings | ||||
| * | | | Reduce JSHint errors/warnings | Morris Jobke | 2017-11-06 | 9 | -15/+15 |
| |/ / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #7074 from nextcloud/use-proper-whitespace | Christoph Wurst | 2017-11-06 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use proper whitespace | ||||
| * | | | Use proper whitespace | Morris Jobke | 2017-11-06 | 1 | -1/+1 |
| |/ / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-06 | 16 | -110/+148 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-05 | 4 | -0/+8 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-04 | 14 | -0/+30 |
| | | | |||||
* | | | Merge pull request #6688 from nextcloud/more-variables | Jan-Christoph Borchardt | 2017-11-03 | 10 | -21/+22 |
|\ \ \ | |/ / |/| | | Add variable for border-radius and box-shadow | ||||
| * | | Add variable for border-radius | Jan-Christoph Borchardt | 2017-11-03 | 10 | -21/+22 |
|/ / | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | Merge pull request #7049 from nextcloud/fix-actions-menu | Jan-Christoph Borchardt | 2017-11-03 | 2 | -6/+1 |
|\ \ | | | | | | | Fix opening the file actions menu in mobile | ||||
| * | | Fix opening the file actions menu in mobile | Morris Jobke | 2017-11-03 | 2 | -6/+1 |
| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #7048 from nextcloud/flexbox-css | Jan-Christoph Borchardt | 2017-11-03 | 3 | -25/+0 |
|\ \ \ | | | | | | | | | Vendor prefix for flexbox not needed anymore | ||||
| * | | | Vendor prefix for flexbox not needed anymore | Morris Jobke | 2017-11-03 | 3 | -25/+0 |
| |/ / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-03 | 230 | -214/+7350 |
| | | | |||||
* | | | Merge pull request #6652 from nextcloud/sharing-link-menu | John Molakvoæ | 2017-11-02 | 6 | -53/+89 |
|\ \ \ | | | | | | | | | Move sharing page options to menu in top right | ||||
| * | | | Fix Scrutinizer issue | Jan-Christoph Borchardt | 2017-11-02 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Clicking publicly shared image opens direct preview url | Jan-Christoph Borchardt | 2017-11-01 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Directly show link | Jan-Christoph Borchardt | 2017-11-01 | 2 | -9/+8 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Use standard way of showing and hiding popover menu | Jan-Christoph Borchardt | 2017-11-01 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Fix scrollbar showing up on public page | Jan-Christoph Borchardt | 2017-11-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Show and hide menu via Javascript, thanks @skjnldsv | Jan-Christoph Borchardt | 2017-11-01 | 3 | -2/+24 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Adjust prominence of shared-by info to not overpower file name | Jan-Christoph Borchardt | 2017-11-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Add label to download action | Jan-Christoph Borchardt | 2017-11-01 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Fix display of Download entry text | Jan-Christoph Borchardt | 2017-11-01 | 3 | -7/+5 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Fix header text hiding completely or wrapping wrongly | Jan-Christoph Borchardt | 2017-11-01 | 2 | -5/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | Move shared page controls to menu in top right | Jan-Christoph Borchardt | 2017-11-01 | 2 | -30/+43 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | | Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorage | Roeland Jago Douma | 2017-11-02 | 1 | -2/+22 |
|\ \ \ \ | | | | | | | | | | | Fix seeking on object storage | ||||
| * | | | | Fix seeking on object storage | Morris Jobke | 2017-10-27 | 1 | -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-avatar | Jan-Christoph Borchardt | 2017-11-02 | 4 | -58/+68 |
|\ \ \ \ \ | | | | | | | | | | | | | Show avatar instead of username for shared files | ||||
| * | | | | | adjust more js unit tests | Arthur Schiwon | 2017-11-02 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | | use single quotes | Arthur Schiwon | 2017-11-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> |