Commit Graph

36244 Commits

Author SHA1 Message Date
Roeland Jago Douma 2ddee155f7
Bump php7.1 container to RC6
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-24 20:46:15 +01:00
Roeland Jago Douma 5fb43b1cc9 Merge pull request #2301 from nextcloud/pass-confirm-cookie-login
fix password check when using remember me login
2016-11-24 20:39:13 +01:00
Roeland Jago Douma 147b3d6f00 Merge pull request #2243 from nextcloud/file-drop-wording
fix wording of File drop, ref #2207
2016-11-24 20:32:00 +01:00
Roeland Jago Douma 10db5bf7d2 Merge pull request #2316 from nextcloud/fix-personal-loading-icon
Loading icon fix #2198
2016-11-24 20:21:31 +01:00
John Molakvoæ (skjnldsv) dc4ceb7338
Loading icon fix #2198
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-24 17:28:21 +01:00
Morris Jobke 8f14ffd734 Merge pull request #2306 from nextcloud/dont-log-user-password
Don't log the user password in case something goes wrong
2016-11-24 17:08:25 +01:00
blizzz cb69accdc5 Merge pull request #2307 from nextcloud/better-filter-on-appstore
Loop for newest version in appstore response
2016-11-24 16:57:14 +01:00
Morris Jobke 98891751bf Merge pull request #2313 from nextcloud/fix-naming
fix some outdated naming
2016-11-24 16:49:37 +01:00
Morris Jobke 3620d81184
Log all events that happen during an update
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-24 16:37:57 +01:00
Lukas Reschke b394151d1c Merge pull request #2309 from nextcloud/fix-favicons
fix favicon viewbox, remove decimals
2016-11-24 16:32:30 +01:00
Joas Schilling 5c2ec58440
Move ShareByMail activities to new API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 16:15:51 +01:00
Jan-Christoph Borchardt e75dede590 fix some outdated naming
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-24 16:05:05 +01:00
Lukas Reschke cbf943301f Merge pull request #2224 from nextcloud/fix-visibility-switcher
Fix visibility switcher for avatar
2016-11-24 15:47:55 +01:00
Lukas Reschke ddf944eca1 Merge pull request #2302 from nextcloud/register-command-error-handling
handle errors in apps while registering commands
2016-11-24 15:47:20 +01:00
Jan-Christoph Borchardt 3069ee912b fix favicon viewbox, remove decimals
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-24 15:42:05 +01:00
Lukas Reschke d6ade509cf Merge pull request #2299 from nextcloud/oc-mounts-non-existing-user
filter out oc_mounts results from non existing users
2016-11-24 15:28:40 +01:00
Robin Appelman 65ace7c5a7
handle errors in apps while registering commands
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-24 15:13:29 +01:00
Lukas Reschke 7162166bae
Also show updates on the "enabled" page
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>
2016-11-24 15:04:23 +01:00
Morris Jobke b74b6671c1 Merge pull request #2305 from nextcloud/fix_previews_federated_shares
Fix previews for federated shares
2016-11-24 14:37:12 +01:00
Lukas Reschke 6a4c0cf237
Loop for newest version in appstore response
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>
2016-11-24 14:29:57 +01:00
Joas Schilling df0eeb8089
Don't log the user password in case something goes wrong
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 13:58:03 +01:00
Morris Jobke e3489d92fd Merge pull request #2303 from nextcloud/password-check-improvements
small password check improvements
2016-11-24 13:30:11 +01:00
Roeland Jago Douma dab87ef6fd
Fix previews for federated shares
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>
2016-11-24 13:20:51 +01:00
Bjoern Schiessle 9361952596
show dialog again of operation failed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-24 12:35:59 +01:00
Bjoern Schiessle adb581431f
set focus on input field
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-24 12:35:28 +01:00
Robin Appelman dd7d493e4d
fix password check when using remember me login
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-24 11:57:10 +01:00
Robin Appelman ce2f9493a7
filter out oc_mounts results from non existing users
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-24 11:44:18 +01:00
Lukas Reschke f4cf125a4a Merge pull request #2296 from nextcloud/nitpicking-on-federation-admin-section
Fix some language issues in the federation admin panel
2016-11-24 10:13:57 +01:00
Roeland Jago Douma dd1ab21887 Merge pull request #2290 from nextcloud/placeholder-typo-public-link-activity
Fix placeholder typo in public link activity
2016-11-24 09:34:35 +01:00
Joas Schilling fbd574cc82
Fix some language issues in the federation admin panel
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-24 09:34:06 +01:00
Julius Härtl 25acce7e0d Merge pull request #2283 from nextcloud/no-padding-if-no-settings-area
Remove padding from apps navigation if there is no settings area
2016-11-23 21:52:13 +01:00
Joas Schilling 1c564fd554 Fix placeholder typo in public link activity
https://www.transifex.com/nextcloud/nextcloud/translate/#152/files_sharing/101548786/
2016-11-23 21:43:14 +01:00
Lukas Reschke 7d64d7ac8b Merge pull request #2233 from nextcloud/change-link-to-11
Update link to the docs to 11
2016-11-23 20:58:20 +01:00
Lukas Reschke 38658da12b Merge pull request #2286 from nextcloud/ldap_password_pr-1
LDAP PR with tests
2016-11-23 20:54:31 +01:00
Bjoern Schiessle 546989959c
update email address correctly
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-23 20:19:31 +01:00
Lukas Reschke 4c5e7d270a
Add tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-23 19:58:43 +01:00
Roeland Jago Douma 56c926bc8b Merge pull request #2247 from nextcloud/avatar-fallback
use ? instead of X for avatar name fallback
2016-11-23 19:27:59 +01:00
root 861c8572c0
restore ldap_password_pr
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>
2016-11-23 19:02:48 +01:00
Morris Jobke 51b7d0490e
Remove padding from apps navigation if there is no settings area
* fixes #2189

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-23 18:41:35 +01:00
Morris Jobke d342eedc77 Merge pull request #2242 from nextcloud/fix-installation-spinner
show installation spinner correctly, fix #2129
2016-11-23 18:20:56 +01:00
Morris Jobke 34849f7bd3
fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-23 18:02:23 +01:00
Morris Jobke 59db9fada2 Merge pull request #2281 from nextcloud/fix-translation
Fix language typo
2016-11-23 17:53:21 +01:00
Lukas Reschke 5473475fa7 Merge pull request #2232 from nextcloud/imagescale-fix
Workaround for PHP bug when calling imagescale
2016-11-23 17:45:59 +01:00
Joas Schilling 14f01dbe33
Fix language typo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 16:55:49 +01:00
Lukas Reschke 6d92550772 Merge pull request #2278 from nextcloud/filelist-share-visible
make the share icon in the filelist visible again
2016-11-23 16:40:10 +01:00
Lukas Reschke e03512d4bc Merge pull request #2280 from nextcloud/do_not_escape_sharees
Do not escape sharees
2016-11-23 16:40:01 +01:00
Morris Jobke 6281607d7a
improved style of shared entry
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-23 15:25:48 +01:00
Roeland Jago Douma 9394713e72
Do not escape sharees
Fixes #2253

Do not escape special characters else it will look very strange.
2016-11-23 15:22:36 +01:00
Lukas Reschke aa30c4cd80 Merge pull request #2240 from nextcloud/daita-encryption-init_on_master_key
init Session/privateKeys on Master Key
2016-11-23 15:19:24 +01:00
Morris Jobke 25f519c855 Merge pull request #2266 from nextcloud/avatar_image
VCARDS don't hold binary data
2016-11-23 14:49:32 +01:00