summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove exception for Chrome on MobileLukas Reschke2016-11-241-9/+0
| | | | | | | | | | This didn't really work anyways and Chrome 54 for Android has been pushed out via Google Play on October 19th. So we should remove this. This is only in master and doesn't affect any stable branch. Fixes https://github.com/nextcloud/server/issues/2318 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Merge pull request #2321 from nextcloud/lint-php7.1Roeland Jago Douma2016-11-241-0/+9
|\ | | | | Run syntax test for php7.1
| * Run syntex test for php7.1Roeland Jago Douma2016-11-241-0/+9
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #2319 from nextcloud/php-7.1rc6Roeland Jago Douma2016-11-241-2/+2
|\ | | | | Bump php7.1 container to RC6
| * Bump php7.1 container to RC6Roeland Jago Douma2016-11-241-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #2301 from nextcloud/pass-confirm-cookie-loginRoeland Jago Douma2016-11-241-4/+3
|\ \ | | | | | | fix password check when using remember me login
| * | fix password check when using remember me loginRobin Appelman2016-11-241-4/+3
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #2243 from nextcloud/file-drop-wordingRoeland Jago Douma2016-11-241-1/+1
|\ \ \ | | | | | | | | fix wording of File drop, ref #2207
| * | | fix wording of File drop, ref #2207Jan-Christoph Borchardt2016-11-221-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #2316 from nextcloud/fix-personal-loading-iconRoeland Jago Douma2016-11-242-5/+5
|\ \ \ \ | | | | | | | | | | Loading icon fix #2198
| * | | | Loading icon fix #2198John Molakvoæ (skjnldsv)2016-11-242-5/+5
|/ / / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #2306 from nextcloud/dont-log-user-passwordMorris Jobke2016-11-242-9/+21
|\ \ \ \ | | | | | | | | | | Don't log the user password in case something goes wrong
| * | | | Don't log the user password in case something goes wrongJoas Schilling2016-11-242-9/+21
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #2307 from nextcloud/better-filter-on-appstoreblizzz2016-11-245-12/+1952
|\ \ \ \ | | | | | | | | | | Loop for newest version in appstore response
| * | | | Also show updates on the "enabled" pageLukas Reschke2016-11-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The enabled page doesn't pass through "getAppsForCategory" thus it also needs to have that special logic applied. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | Loop for newest version in appstore responseLukas Reschke2016-11-244-12/+1946
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation when fetching apps from the appstore is to assume that the first element is the newest version, this is now always applicable and leads to the fact that for some apps (e.g. nextant) the newest version is not delivered. This can be easily tested by comparing the version of the downloaded Nextant version. This change will loop over all releases delivered by the appstore and chooses the newest compatible one. While not the cleanest solution, it does its job. Most of the code are actually unit tests. Whereas I have copied the whole original response from the appstore and also have performed the transformation. So that's why the diff looks so huge. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #2313 from nextcloud/fix-namingMorris Jobke2016-11-244-15/+15
|\ \ \ \ | | | | | | | | | | fix some outdated naming
| * | | | fix some outdated namingJan-Christoph Borchardt2016-11-244-15/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #2309 from nextcloud/fix-faviconsLukas Reschke2016-11-245-5/+5
|\ \ \ \ \ | | | | | | | | | | | | fix favicon viewbox, remove decimals
| * | | | | fix favicon viewbox, remove decimalsJan-Christoph Borchardt2016-11-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #2224 from nextcloud/fix-visibility-switcherLukas Reschke2016-11-243-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix visibility switcher for avatar
| * | | | | | Make Christoph happierLukas Reschke2016-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently this failed for him as per https://github.com/nextcloud/server/pull/2224#issuecomment-262085537 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | Fix visibility switcher for avatarLukas Reschke2016-11-212-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2223 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | Merge pull request #2302 from nextcloud/register-command-error-handlingLukas Reschke2016-11-242-3/+12
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | handle errors in apps while registering commands
| * | | | | | handle errors in apps while registering commandsRobin Appelman2016-11-242-3/+12
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #2299 from nextcloud/oc-mounts-non-existing-userLukas Reschke2016-11-241-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | filter out oc_mounts results from non existing users
| * | | | | | filter out oc_mounts results from non existing usersRobin Appelman2016-11-241-3/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #2305 from nextcloud/fix_previews_federated_sharesMorris Jobke2016-11-241-1/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix previews for federated shares
| * | | | | Fix previews for federated sharesRoeland Jago Douma2016-11-241-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The owner of a federated file is the federated user. For which we obviously can't setup a view. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #2303 from nextcloud/password-check-improvementsMorris Jobke2016-11-242-0/+2
|\ \ \ \ \ | |/ / / / |/| | | | small password check improvements
| * | | | show dialog again of operation failedBjoern Schiessle2016-11-241-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | set focus on input fieldBjoern Schiessle2016-11-241-0/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #2296 from nextcloud/nitpicking-on-federation-admin-sectionLukas Reschke2016-11-241-3/+3
|\ \ \ \ | | | | | | | | | | Fix some language issues in the federation admin panel
| * | | | Fix some language issues in the federation admin panelJoas Schilling2016-11-241-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #2290 from nextcloud/placeholder-typo-public-link-activityRoeland Jago Douma2016-11-241-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix placeholder typo in public link activity
| * | | | Fix placeholder typo in public link activityJoas Schilling2016-11-231-1/+1
| | | | | | | | | | | | | | | https://www.transifex.com/nextcloud/nextcloud/translate/#152/files_sharing/101548786/
* | | | | Merge pull request #2283 from nextcloud/no-padding-if-no-settings-areaJulius Härtl2016-11-232-0/+8
|\ \ \ \ \ | |/ / / / |/| | | | Remove padding from apps navigation if there is no settings area
| * | | | Remove padding from apps navigation if there is no settings areaMorris Jobke2016-11-232-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #2189 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #2233 from nextcloud/change-link-to-11Lukas Reschke2016-11-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Update link to the docs to 11
| * | | | | Update link to the docs to 11Lukas Reschke2016-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #2286 from nextcloud/ldap_password_pr-1Lukas Reschke2016-11-2315-6/+507
|\ \ \ \ \ \ | | | | | | | | | | | | | | LDAP PR with tests
| * | | | | | Add testsLukas Reschke2016-11-237-1/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | restore ldap_password_prroot2016-11-2311-6/+240
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de> remove notification part Signed-off-by: Roger Szabo <roger.szabo@web.de> blizzz comments Signed-off-by: Roger Szabo <roger.szabo@web.de> morris comment Signed-off-by: Roger Szabo <roger.szabo@web.de> improved error message for changing password Signed-off-by: Roger Szabo <roger.szabo@web.de> blizz comments 20161013 Signed-off-by: Roger Szabo <roger.szabo@web.de> Signed-off-by: Roger Szabo <roger.szabo@web.de> Adjust HintException usage Signed-off-by: Roger Szabo <roger.szabo@web.de> Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | | | | | Merge pull request #2247 from nextcloud/avatar-fallbackRoeland Jago Douma2016-11-232-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | use ? instead of X for avatar name fallback
| * | | | | fix unit testsMorris Jobke2016-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | use ? instead of X for avatar name fallbackJan-Christoph Borchardt2016-11-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #2242 from nextcloud/fix-installation-spinnerMorris Jobke2016-11-231-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | show installation spinner correctly, fix #2129
| * | | | | | show installation spinner correctly, fix #2129Jan-Christoph Borchardt2016-11-221-2/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #2281 from nextcloud/fix-translationMorris Jobke2016-11-232-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix language typo
| * | | | | | Fix language typoJoas Schilling2016-11-232-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 09:36:31 +0000