Skip to content

Commit

Permalink
Merge pull request #3 from nextcloud/nextcloud-branding
Browse files Browse the repository at this point in the history
Nextcloud branding
  • Loading branch information
irgendwie authored Oct 27, 2016
2 parents 3af7c03 + 37fea11 commit fc31979
Show file tree
Hide file tree
Showing 18 changed files with 774 additions and 109 deletions.
27 changes: 13 additions & 14 deletions issue_template.md → .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<!--
Please report only issues corresponding to the contacts app for ownCloud 9 or later.
The old contacts app, which is compatible with ownCloud 8.2 or earlier, is discontinued!
Please report only issues corresponding to the contacts app for Nextcloud.
Migration and CardDAV issues belong in the core repo!
https://github.com/owncloud/core/issues
Migration and CardDAV issues belong in the server repo!
https://github.com/nextcloud/server/issues
-->
### Steps to reproduce
1.
Expand All @@ -25,16 +24,16 @@ Tell us what happens instead

**PHP version:**

**ownCloud version:** (see ownCloud admin page)
**Nextcloud version:** (see Nextcloud admin page)

**Contacts version:** (see ownCloud apps page)
**Contacts version:** (see Nextcloud apps page)

**Updated from an older ownCloud or fresh install:**
**Updated from an older Nextcloud or fresh install:**

**Signing status (ownCloud 9.0 and above):**
**Signing status:**

```
Login as admin user into your ownCloud and access
Login as admin user into your Nextcloud and access
http://example.com/index.php/settings/integrity/failed
paste the results here.
```
Expand All @@ -44,15 +43,15 @@ paste the results here.
```
If you have access to your command line run e.g.:
sudo -u www-data php occ app:list
from within your ownCloud installation folder
from within your Nextcloud installation folder
```

**The content of config/config.php:**

```
If you have access to your command line run e.g.:
sudo -u www-data php occ config:list system
from within your ownCloud installation folder
from within your Nextcloud installation folder
or
Expand All @@ -71,7 +70,7 @@ Insert your config.php content here
```
With access to your command line run e.g.:
sudo -u www-data php occ ldap:show-config
from within your ownCloud installation folder
from within your Nextcloud installation folder
Without access to your command line download the data/owncloud.db to your local
computer or access your SQL server remotely and run the select query:
Expand All @@ -94,9 +93,9 @@ Eventually replace sensitive data as the name/IP-address of your LDAP server or
Insert your webserver log here
```

#### ownCloud log (data/owncloud.log)
#### Nextcloud log (data/nextcloud.log)
```
Insert your ownCloud log here
Insert your Nextcloud log here
```

#### Browser log
Expand Down
661 changes: 661 additions & 0 deletions COPYING

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @author Bernhard Posselt <dev@bernhard-posselt.com>
# @copyright Bernhard Posselt 2016

# Generic Makefile for building and packaging an ownCloud app which uses npm and
# Generic Makefile for building and packaging an Nextcloud app which uses npm and
# Composer.
#
# Dependencies:
Expand Down
40 changes: 19 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
# ownCloud Contacts
# Nextcloud Contacts

[![irc](https://img.shields.io/badge/irc%20channel-%23owncloud--contacts%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=owncloud-contacts)
[![Build Status](https://scrutinizer-ci.com/g/owncloud/contacts/badges/build.png?b=master)](https://scrutinizer-ci.com/g/owncloud/contacts/build-status/master)
![Dev Dependencies](https://david-dm.org/owncloud/contacts/dev-status.svg)
[![codecov.io](https://codecov.io/github/owncloud/contacts/coverage.svg?branch=master)](https://codecov.io/github/owncloud/contacts?branch=master)
[![irc](https://img.shields.io/badge/IRC-%23nextcloud--contacts%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-contacts)

![codecov.io](https://codecov.io/github/owncloud/contacts/branch.svg?branch=master)
**A contacts app for [Nextcloud](https://nextcloud.com). Easily sync contacts from various devices with your Nextcloud and edit them online.**

**A contacts app for [ownCloud](https://owncloud.org) and [Nextcloud](https://nextcloud.com).**
![](https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Contacts/contacts.png)

This is the new contacts app that has replaced the [old contacts app](https://github.com/owncloudarchive/contacts), and is only the frontend for the new server-integrated CardDAV-Backend.
## Why is this so awesome?

![](https://raw.githubusercontent.com/owncloud/screenshots/master/contacts/contacts.png)
* :rocket: **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.
* :tada: **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.
* :busts_in_silhouette: **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!
* :see_no_evil: **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.

## Installation

In your Nextcloud, simply navigate to »Apps«, choose the category »Productivity«, find the Contacts app and enable it.
Then open the Contacts app from the app menu.

## Support

If you need assistance or want to ask a question about Contacts, you are welcome to [ask for support](https://help.nextcloud.com) in our Forums or the [IRC-Channel](https://webchat.freenode.net/?channels=nextcloud-contacts). If you have found a bug, feel free to open a new Issue on GitHub. Keep in mind, that this repository only manages the frontend. If you find bugs or have problems with the CardDAV-Backend, you should ask the guys at [Nextcloud server](https://github.com/nextcloud/server) for help!

## Maintainers:

Expand All @@ -20,9 +29,7 @@ This is the new contacts app that has replaced the [old contacts app](https://gi
- [Alexander Weidinger](https://github.com/irgendwie)
- [Tom Needham](https://github.com/tomneedham)


If you’d like to join, just go through the [issue list](https://github.com/owncloud/contacts/issues) and fix some. :)

If you'd like to join, just go through the [issue list](https://github.com/nextcloud/contacts/issues) and fix some. :)

## Building the app

Expand All @@ -37,15 +44,6 @@ This requires the following things to be present:
* curl: used if phpunit and composer are not installed to fetch them from the web
* npm: for building and testing everything JS


## Publish to App Store

First get an account for the [App Store](http://apps.owncloud.com/) then run:

make && make appstore

The archive is located in build/artifacts/appstore and can then be uploaded to the App Store.

## Running tests
You can use the provided Makefile to run all tests by using:

Expand Down
4 changes: 2 additions & 2 deletions appinfo/app.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - contacts
* Nextcloud - contacts
*
* This file is licensed under the Affero General Public License version 3 or
* later. See the COPYING file.
Expand All @@ -20,7 +20,7 @@
$urlGenerator = $container->query('OCP\IURLGenerator');
$l10n = $container->query('OCP\IL10N');
return [
// the string under which your app will be referenced in owncloud
// the string under which your app will be referenced in Nextcloud
'id' => 'contacts',

// sorting weight for the navigation. The higher the number, the higher
Expand Down
47 changes: 27 additions & 20 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
<?xml version="1.0"?>
<info>
<id>contacts</id>
<name>Contacts</name>
<description>The new and improved app for your Contacts.</description>
<licence>AGPL</licence>
<author>Hendrik Leppelsack, Thomas Müller, Alexander Weidinger, Jan-Christoph Borchardt, Tom Needham</author>
<version>1.5.0.0</version>
<documentation>
<user>https://doc.owncloud.org/server/9.1/user_manual/pim/contacts.html</user>
<admin>https://doc.owncloud.org/server/9.1/admin_manual/configuration_server/occ_command.html?highlight=contact#dav-commands</admin>
<developer>https://github.com/owncloud/contacts/blob/master/README.md</developer>
</documentation>
<category>tool</category>
<website>https://github.com/owncloud/contacts</website>
<bugs>https://github.com/owncloud/contacts/issues</bugs>
<repository type="git">https://github.com/owncloud/contacts.git</repository>
<dependencies>
<owncloud min-version="9.0" max-version="9.2" />
</dependencies>
<ocsid>168708</ocsid>
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
<id>contacts</id>
<name>Contacts</name>
<description>The new and improved app for your Contacts.</description>
<version>1.4.0</version>
<licence>AGPL</licence>
<author>Alexander Weidinger</author>
<author>Jan-Christoph Borchardt</author>
<author>Hendrik Leppelsack</author>
<documentation>
<user>https://docs.nextcloud.com/server/11/user_manual/pim/contacts.html</user>
<admin>https://docs.nextcloud.com/server/11/admin_manual/configuration_server/occ_command.html?highlight=occ%20commands#dav-label</admin>
<developer>https://github.com/nextcloud/contacts#building-the-app</developer>
</documentation>
<category>office</category>
<category>social</category>
<category>organization</category>
<website>https://github.com/nextcloud/contacts#readme</website>
<bugs>https://github.com/nextcloud/contacts/issues</bugs>
<repository type="git">https://github.com/nextcloud/contacts.git</repository>
<screenshot>https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Contacts/contacts.png</screenshot>
<dependencies>
<owncloud min-version="9.0" max-version="9.2" />
<nextcloud min-version="9" max-version="11" />
</dependencies>
<ocsid>168708</ocsid>
</info>
2 changes: 1 addition & 1 deletion appinfo/routes.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - contacts
* Nextcloud - contacts
*
* This file is licensed under the Affero General Public License version 3 or
* later. See the COPYING file.
Expand Down
2 changes: 1 addition & 1 deletion controller/pagecontroller.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - contacts
* Nextcloud - contacts
*
* This file is licensed under the Affero General Public License version 3 or
* later. See the COPYING file.
Expand Down
Binary file modified img/favicon-touch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion img/favicon-touch.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/favicon.ico
Binary file not shown.
Binary file modified img/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit fc31979

Please sign in to comment.