summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-11-2832-4/+144
|
* Merge pull request #2343 from nextcloud/fix-exteranl-storage-redirectJoas Schilling2016-11-271-1/+1
|\ | | | | [Minor] Fix link to external storage settings on error notification
| * Fix link to external storage settings on error notificationFelix A. Epp2016-11-261-1/+1
| | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
* | [tx-robot] updated from transifexNextcloud bot2016-11-2750-34/+314
|/
* [tx-robot] updated from transifexNextcloud bot2016-11-26234-960/+2294
|
* Merge pull request #2340 from nextcloud/autocomplete-max-width-to-inputMorris Jobke2016-11-253-0/+10
|\ | | | | Add jquery ui fixes js file + fix autocomplete width
| * Add jquery ui fixes js fileJohn Molakvoæ (skjnldsv)2016-11-253-0/+10
|/ | | | | | + fix autocomplete width (fix #2324) Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #2322 from nextcloud/compat-with-chrome54Morris Jobke2016-11-251-9/+0
|\ | | | | Remove exception for Chrome on Mobile
| * 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 #2325 from nextcloud/fix-slogan-stylingLukas Reschke2016-11-251-5/+0
|\ \ | | | | | | Fix styling of slogan on login page for longer text
| * | Fix styling of slogan on login page for longer textJulius Haertl2016-11-251-5/+0
| | | | | | | | | | | | | | | | | | Fixes #851 Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | Merge pull request #2276 from nextcloud/update-email-addressMorris Jobke2016-11-258-50/+705
|\ \ \ | | | | | | | | Update email address
| * | | bring back setEmailAddress for the user managementBjoern Schiessle2016-11-257-25/+344
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | update accounts table if email address or display name changes from outsideBjoern Schiessle2016-11-254-20/+123
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | update email address correctlyBjoern Schiessle2016-11-232-28/+261
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Increase to 11.0.0.4Lukas Reschke2016-11-251-1/+1
| | | |
* | | | Merge pull request #2323 from nextcloud/add-announcements-to-shippedLukas Reschke2016-11-251-0/+1
|\ \ \ \ | | | | | | | | | | Add nextcloud_announcements to shipped.json
| * | | | Add nextcloud_announcements to shipped.jsonLukas Reschke2016-11-251-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise on the update from beta1 to beta2 the app would be disabled again as incompatible: ``` root@cloud:/var/www/html# sudo -u www-data php occ upgrade Nextcloud or one of the apps require upgrade - only a limited number of commands are available You may use your browser or the occ upgrade command to do the upgrade Set log level to debug Turned on maintenance mode Updating database schema Updated database Disabled 3rd-party app: calendar Disabled 3rd-party app: contacts Disabled 3rd-party app: nextcloud_announcements Disabled 3rd-party app: spreed Update 3rd-party app: calendar Update 3rd-party app: contacts ``` Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Increase version for oneLukas Reschke2016-11-251-1/+1
| | | |
* | | | Merge pull request #2314 from nextcloud/log-upgrade-stepsLukas Reschke2016-11-251-0/+131
|\ \ \ \ | | | | | | | | | | Log all events that happen during an upgrade
| * | | | Log all events that happen during an updateMorris Jobke2016-11-241-0/+131
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #2285 from nextcloud/identityproof_testsMorris Jobke2016-11-255-25/+254
|\ \ \ \ \ | |_|_|_|/ |/| | | | Add Identityproof tests
| * | | | Add Identityproof testsRoeland Jago Douma2016-11-245-25/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add tests for Key * Add tests for Manager * Add tests for Signer * Removed URLGenerator from Signer Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | 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