summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-05-1316-0/+64
|
* Merge pull request #4809 from nextcloud/downstream-27676Lukas Reschke2017-05-123-1/+21
|\ | | | | Disable reset password link
| * Disable the API endpoints as wellJoas Schilling2017-05-112-1/+19
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Disable reset password link. Issue: #27440Ujjwal Bhardwaj2017-05-111-0/+2
| |
* | [tx-robot] updated from transifexNextcloud bot2017-05-1262-1644/+112
| |
* | Proper logging for appstore updatesMorris Jobke2017-05-112-1/+16
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4804 from nextcloud/proper-upgrade-sizeLukas Reschke2017-05-111-1/+1
|\ \ | |/ |/| Properly decide on actual users if instance is too big
| * Properly decide on actual users if instance is too bigMorris Jobke2017-05-101-1/+1
| | | | | | | | | | | | * state the reason why NC thinks it is a big instance Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-05-112-0/+2
| |
* | Merge pull request #4783 from nextcloud/lite-application-classesMorris Jobke2017-05-103-33/+8
|\ \ | |/ |/| Use automatic injection for appdata folders
| * Automatic creation of Identity managerJoas Schilling2017-05-101-7/+0
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Automatic injection for CssControllerJoas Schilling2017-05-102-14/+4
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Automatic injection for JsControllerJoas Schilling2017-05-102-12/+4
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4771 from nextcloud/error-page-logo-cssJoas Schilling2017-05-101-0/+6
|\ \ | |/ |/| use the same logo css for the error page as the login page
| * use the same logo css for the error page as the login pageRobin Appelman2017-05-091-1/+7
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #4737 from nextcloud/logo-icon-containerRobin Appelman2017-05-091-1/+2
|\ \ | | | | | | fix sizing of logo in header
| * | fix sizing of logo in headerRobin Appelman2017-05-081-1/+2
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-05-086-0/+14
| |
* | Merge pull request #4675 from nextcloud/fix_4651Morris Jobke2017-05-081-1/+2
|\ \ | | | | | | Create a photo cache to speedup the contactsmenu
| * | Request proper size for contacts menuRoeland Jago Douma2017-05-081-1/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4740 from nextcloud/external-moved-to-appstoreLukas Reschke2017-05-081-1/+0
|\ \ \ | | | | | | | | External has been moved to appstore
| * | | External has been moved to appstoreLukas Reschke2017-05-081-1/+0
| | |/ | |/| | | | | | | | | | | | | As discussed with Joas. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* / | Check if Nextcloud is installedLukas Reschke2017-05-081-1/+2
|/ / | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/4735 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #4514 from nextcloud/automatic-mysql-4byte-detectionLukas Reschke2017-05-081-6/+6
|\ \ | | | | | | Automatic mysql 4byte detection
| * | Add console command to migrate the charsetThomas Müller2017-04-281-6/+6
| | |
* | | Merge pull request #4632 from nextcloud/login-logo-ratioLukas Reschke2017-05-082-1/+11
|\ \ \ | |_|/ |/| | show non landscape logos bigger on the login page
| * | smaller max logo sizes and cleaner codeRobin Appelman2017-05-022-3/+3
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | show non landscape icons bigger on the login pageRobin Appelman2017-05-012-1/+11
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-05-082-42/+44
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-05-076-0/+8
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-05-0616-0/+16
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-05-0560-144/+102
| | |
* | | Update login flow redirectionMario Danic2017-05-042-4/+5
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4694 from nextcloud/fix_4676Christoph Wurst2017-05-041-0/+24
|\ \ \ | | | | | | | | Load proper fonts in guest.css
| * | | Load proper fonts in guest.cssRoeland Jago Douma2017-05-041-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #4676 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Fix event firingRoeland Jago Douma2017-05-041-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Add radio class to read/write sharing options and 1px left adjustmentFelix A. Epp2017-05-042-3/+6
| | | | | | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
* | | | Fix read-only label idFelix A. Epp2017-05-041-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
* | | | Make files drop more permanentRoeland Jago Douma2017-05-042-59/+65
|/ / / | | | | | | | | | | | | | | | Implement the suggestions from #2207 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-05-032-0/+26
| | |
* | | Merge pull request #4620 from nextcloud/preview-error-handlingRoeland Jago Douma2017-05-021-0/+2
|\ \ \ | | | | | | | | better handling of preview generation errors
| * | | Handle more error casesMorris Jobke2017-05-021-0/+2
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4611 from nextcloud/js-use-dot-notationRoeland Jago Douma2017-05-026-9/+9
|\ \ \ | | | | | | | | Use dot notation for array access - JSLint recommendation
| * | | Use dot notation for array access - JSLint recommendationMorris Jobke2017-05-016-9/+9
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4638 from nextcloud/fix-copy-tooltipLukas Reschke2017-05-021-3/+0
|\ \ \ \ | | | | | | | | | | Fix "Copied" message for public links
| * | | | Fix "Copied" message for public linksMorris Jobke2017-05-011-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * share a file/fodler by public link and click the copy to clipboard icon and watch the tooltip * before: it said "Copy" * after: it now says "Copied" after clicking the button Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-05-0264-648/+902
| | | | |
* | | | | Merge pull request #4626 from nextcloud/adjust-shipped-jsonLukas Reschke2017-05-011-4/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove apps delivered from the appstore
| * | | | | Remove apps delivered from the appstoreLukas Reschke2017-05-011-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps that are in shipped.json follow some more requirements such as having a valid code integrity check. This is not something that we require when they come from the appstore as there we verify the download integrity via the signature. Also the updater treats apps that are shipped differently. We should however handle the apps like any other app from the appstore. Fixes https://github.com/nextcloud/server/issues/4605 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4615 from nextcloud/js-reduce-share.js-complexityLukas Reschke2017-05-011-87/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove abandoned methods in OC.Share that refer to old API endpoints