Commit Graph

39161 Commits

Author SHA1 Message Date
Roeland Jago Douma 684997f79c Merge pull request #4751 from nextcloud/wait-for-postgres
Wait for Postgres to be available
2017-05-09 08:44:28 +02:00
Roeland Jago Douma 888e719671 Merge pull request #4750 from nextcloud/allow-requests-to-manifest-json
Don't redirect requests to /core/img/manifest.json
2017-05-09 08:43:35 +02:00
Nextcloud bot 37b847ec48
[tx-robot] updated from transifex 2017-05-09 05:08:07 +00:00
Nextcloud bot 43275b1000
[tx-robot] updated from transifex 2017-05-09 04:32:51 +00:00
Morris Jobke d6c25748be Merge pull request #4755 from nextcloud/l10n-extraction
Extract app name and navigation entries for l10n
2017-05-08 23:25:20 -05:00
Morris Jobke 692e056df9 Extract app name and navigation entries for l10n
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 23:24:28 -05:00
Morris Jobke 9309217ecb Fix escaped HTML on error pages
* fixes #4655

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 21:16:08 -05:00
Morris Jobke f8044cbbce Proper exception for upload of .htaccess file via WebDAV
* fixes #2860

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 20:03:41 -05:00
Nextcloud bot f6a4028fad
[tx-robot] updated from transifex 2017-05-09 00:07:51 +00:00
Morris Jobke e696b92297 Wait for Postgres to be available
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 17:57:49 -05:00
Lukas Reschke ccd0ded812
Don't redirect requests to /core/img/manifest.json
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-09 00:02:37 +02:00
Nextcloud bot 9d8e9b1efb
[tx-robot] updated from transifex 2017-05-08 20:49:06 +00:00
Lukas Reschke 3a22f9dfe5 Merge pull request #4745 from nextcloud/improve-text
Improve readability of verify text
2017-05-08 22:29:04 +02:00
Daniel Calviño Sánchez 0db3a413b3 Fix mentioned user not clickable after posting or editing a comment
The contactsMenu plugin was called on avatar elements from
_postRenderItem, which is called when a new comment is added to the
collection. Due to this contactsMenu was not called when messages were
edited; when a new comment is posted _postRenderItem is called, but at
that time the "mentions" attribute is not filled yet, so "@username" is
not replaced by avatars in the message and thus contactsMenu has no
avatars to be called on.

Calling contactsMenu was moved to a new method, _postRenderMessage,
which is called from _postRenderItem and from the success callback when
fetching the model in _onSubmitSuccess (which replaces "@username" by
avatars in the message after posting or editing a comment).

Fixes #4555

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 22:24:33 +02:00
Morris Jobke e77ea713b2 Improve readability of verify text
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 15:03:25 -05:00
Daniel Calviño Sánchez 002018d8ad Add missing unit tests for comments with mentions
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 21:55:22 +02:00
Morris Jobke fe13f214fd Merge pull request #4692 from nextcloud/unify-sharing-messages
don't mention the owner of a file in case of a re-share by mail.
2017-05-08 13:32:04 -05:00
Morris Jobke 1a83f11925 Merge pull request #4718 from nextcloud/handle-stalled-or-invisible-elements-automatically-in-acceptance-tests
Handle stale or invisible elements automatically in acceptance tests
2017-05-08 12:52:30 -05:00
Morris Jobke 2d707fdfb5 Merge pull request #4621 from nextcloud/fix_readonly_shared_calendar_proppatch
fix PROPPATCH requests to read-only shared calendars
2017-05-08 12:42:30 -05:00
Bjoern Schiessle adb60ae965
don't mention the owner of a file in case of a re-share by mail. The recipient doesn't care about the owner and probably don't even know it
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-08 19:20:31 +02:00
Morris Jobke df6ce6b385 Merge pull request #4675 from nextcloud/fix_4651
Create a photo cache to speedup the contactsmenu
2017-05-08 12:20:27 -05:00
Robin Appelman 36d0c3da69 Merge pull request #4733 from nextcloud/fix-browser-dav-root
fix error when browsing the dav root
2017-05-08 18:04:13 +02:00
Lukas Reschke 9bc77f2914 Merge pull request #4695 from nextcloud/reset-verify-state
reset verification state if max tries are reached
2017-05-08 17:51:07 +02:00
Lukas Reschke ecba440574 Merge pull request #4741 from nextcloud/bump-to-beta2
Increase version to beta2
2017-05-08 17:50:06 +02:00
Lukas Reschke c28fe270b6 Merge pull request #4727 from stffabi/IncreaseDeviceEntropy
Increase device password entropy.
2017-05-08 17:49:52 +02:00
Lukas Reschke 5213c56197 Merge pull request #4734 from nextcloud/allow-specifying-logo-mimetype
Add function to request SVG or regular fallback image
2017-05-08 17:48:50 +02:00
Lukas Reschke 157be421a9 Merge pull request #4740 from nextcloud/external-moved-to-appstore
External has been moved to appstore
2017-05-08 17:48:25 +02:00
Lukas Reschke f859a3a5e8 Merge pull request #4738 from nextcloud/check-if-nextcloud-is-installed
Check if Nextcloud is installed
2017-05-08 17:48:11 +02:00
Lukas Reschke 9904d1ab43
Increase version to beta2
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-08 16:04:57 +02:00
Lukas Reschke dcfd1f5b48
External has been moved to appstore
As discussed with Joas.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-08 15:46:09 +02:00
Lukas Reschke 26f7a3b462
Check if Nextcloud is installed
Fixes https://github.com/nextcloud/server/issues/4735

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-08 15:10:53 +02:00
Robin Appelman 02f3b74409
fix sizing of logo in header
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-08 15:08:30 +02:00
Maxence Lange ce2afca0e4 open-graph
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-05-08 11:57:41 -01:00
Lukas Reschke 099234cf12
Add function to request SVG or regular fallback image
Fixes https://github.com/nextcloud/server/issues/4647

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-08 14:51:55 +02:00
Robin Appelman 9d8936c5bf
fix error when browsing the dav root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-08 14:34:36 +02:00
Robin Appelman 6acae94a02 Merge pull request #4716 from nextcloud/user-settings-dropdown
polish user actions dropdown
2017-05-08 14:25:52 +02:00
Fabrizio Steiner f2a2b34e46 Increase device password entropy. Use lower- and upper-case characters and digits, but exclude ambiguous characters. The number of digits has also been increased to 25.
Signed-off-by: Fabrizio Steiner <fabrizio.steiner@gmail.com>
2017-05-08 14:04:40 +02:00
Roeland Jago Douma dea6edb066
Fix init
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 12:40:00 +02:00
Lukas Reschke 278637feb5 Merge pull request #4556 from nextcloud/downstream-ldap-78
LDAP: only use proxy classes as backend
2017-05-08 12:29:38 +02:00
Lukas Reschke 4d101ca2be Merge pull request #4514 from nextcloud/automatic-mysql-4byte-detection
Automatic mysql 4byte detection
2017-05-08 12:18:40 +02:00
Lukas Reschke 7cc750fe37 Merge pull request #4617 from nextcloud/theming-plain-background
Theming app: Add plain background color option
2017-05-08 12:15:59 +02:00
Lukas Reschke fecf72fb70 Merge pull request #4632 from nextcloud/login-logo-ratio
show non landscape logos bigger on the login page
2017-05-08 12:11:15 +02:00
Georg Ehrke 255442f281
fix PROPPATCH requests to read-only shared calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-05-08 12:09:15 +02:00
Lukas Reschke 69c5bcd804 Merge pull request #4719 from nextcloud/error-page-theming
ensure theming app is loaded when showing an error page
2017-05-08 11:51:34 +02:00
Joas Schilling 3afad7fe40
Fix docs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-08 11:34:47 +02:00
Roeland Jago Douma 92408390b0
Fix ImageExportPluginTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma 747990b03a
No more XSS
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma 3ab53d000f
Clear cache on vcard change/delete
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma 34d97aa51c
Request proper size for contacts menu
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma dd430c2fd7
Cache the carddav photo endpoint
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00