Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 16 additions & 17 deletions modules/classic_ui/pages/apps/market.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,26 @@
:keywords: ownCloud Marketplace, ownCloud Market, apps
:description: Here you will find out all you need to know about working with ownCloud's Market app.

== Log in to the Marketplace From the Market App
== Browse and Install Apps From the Market App

{description} To log in to {oc-marketplace-url}[the ownCloud Marketplace] from the Market app, open the Market app by clicking on the Market app icon in the top-level ownCloud navigation menu, which you can see above.
{description} The Market app lets you browse the {oc-marketplace-url}[ownCloud Marketplace]
and install apps directly from your running ownCloud instance. Open it by clicking the
Market app icon in the top-level ownCloud navigation menu.

image:apps/market/top-level-navigation-bar-highlighting-the-market-app.png[The Market app in the ownCloud top-level navigation menu]

Once on the Market app, click btn:[LOGIN], located at the bottom of the left-hand side navigation menu.
The marketplace catalog is public, so there is no account to create and nothing to log
in to — the Market app reads the catalog directly. Browse or search the available apps,
click an app to view its details, and click btn:[Install] to download, install, and
enable it.

image:apps/market/login-step-1.png[Log in to the Marketplace from the Market App, step 1]
image:apps/market/market-app.png[The Market app showing the ownCloud Marketplace catalog]

You are next asked to grant the Market app access to your Marketplace account.
Enter your Marketplace username and password and click btn:[LOGIN].
Use the categories in the left-hand navigation to filter the catalog, or the search box
to find an app by name.

image:apps/market/login-step-2.png[Log in to the Marketplace from the Market App, step 2]

Next, confirm your request to grant the Market app access to your Marketplace account.
To give this confirmation, click btn:[GRANT ACCESS].

image:apps/market/login-step-3.png[Log in to the Marketplace from the Market App, step 3]

Once you've done this, you are redirected back to the Market app in your ownCloud installation.
The original "_LOGIN_" button is now greyed out and labelled "_LOGGED IN_".

image:apps/market/login-step-4.png[Log in to the Marketplace from the Market App, step 4]
NOTE: If your ownCloud instance runs in a protected environment (DMZ) without internet
access, the Market app cannot reach the marketplace. In that case, download apps manually
from the {oc-marketplace-url}[ownCloud Marketplace] and install them by hand. See
xref:admin_manual:installation/apps/apps_management_installation.adoc[Installing and
Managing Apps].
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ certificate's public key and that the certificate `CN` equals the app identifier
====

Any change to the app after signing invalidates the signature, so remove any
files you do not want to ship *before* signing, then re-sign. After signing, the
app can be uploaded to the {oc-marketplace-url}/[ownCloud Marketplace] — see
files you do not want to ship *before* signing, then re-sign. After signing, package
the app and submit it to the {oc-marketplace-url}/[ownCloud Marketplace] — see
xref:developer_manual:app/fundamentals/publishing.adoc[Publishing in the ownCloud
Marketplace].

Expand Down
24 changes: 13 additions & 11 deletions modules/developer_manual/pages/app/fundamentals/info.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ would be tried under `Myapp`.

== category

The ownCloud Marketplace category where you want to publish the application.
The following categories are available:
The ownCloud Marketplace category where you want to publish the application.
You can list more than one `<category>` element. Category values are matched
case-insensitively, and any value outside the supported set is dropped during
validation. The following categories are supported:

[width="52%",cols="50%,50%",options="header",]
|================
Expand All @@ -80,8 +82,8 @@ The following categories are available:
| Customization
| customization

| External plugins
| external-plugins
| Files
| files

| Games
| games
Expand All @@ -92,6 +94,9 @@ The following categories are available:
| Multimedia
| multimedia

| PIM
| pim

| Productivity
| productivity

Expand All @@ -105,14 +110,11 @@ The following categories are available:
| tools
|================

[IMPORTANT]
[IMPORTANT]
====
For publishing themes the category tag must be present — _but empty_ — as in the example below.

[source,xml]
----
<category></category>
----
Every app — themes included — must declare at least one supported category. A release
whose categories are all outside the supported set is rejected during validation. For
themes, use `customization`.
====

== summary
Expand Down
26 changes: 12 additions & 14 deletions modules/developer_manual/pages/app/fundamentals/market_app.adoc
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
= Market App

Since ownCloud X (10.0.0) every ownCloud instance gets shipped with the
market app. This app makes it easy to manage your applications out of
the box. To connect your market app with the ownCloud Marketplace:
Since ownCloud X (10.0.0) every ownCloud instance ships with the market app. This app
makes it easy to manage your applications out of the box: you can install, update, and
remove apps directly from your running ownCloud instance.

* Get you API key under `My Account`
* Inside the market app go to menu:Settings[]
* Paste your API key and click on btn:[Save]

You are now able to maintain any app in
`downloads/installations/updates` from your ownCloud installation directly.
The market app reads the {oc-marketplace-url}[ownCloud Marketplace] catalog directly
over its public API. The catalog is a static, public resource, so there is no account to
create and no API key to configure — open the market app and you can browse and install
available apps right away.

== ownCloud Instances in Protected Environments (DMZ)

To use the market app your ownCloud instance must have an internet
connection. If your instance is running in a protected environment (DMZ
or similar) you cannot use the market app. You need to upload the apps
manually in this case. Every app can be downloaded manually from the
marketplace.
To use the market app your ownCloud instance must have an internet connection. If your
instance is running in a protected environment (DMZ or similar) and cannot reach the
marketplace, you cannot use the market app to install apps automatically. In this case,
download each app manually from the marketplace and install it by hand. Every app can be
downloaded manually from the {oc-marketplace-url}[ownCloud Marketplace].
Loading