fix nc branding

.github/CONTRIBUTING.md

@@ -15,7 +15,7 @@ If your issue appears to be a bug, and hasn't been reported, open a new issue.
 
 Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
 
-[template]: https://raw.github.com/owncloud/mail/master/.github/issue_template.md
+[template]: https://raw.github.com/nextcloud/mail/master/.github/issue_template.md
 
 ## Contributing to Source Code
 
@@ -24,4 +24,4 @@ Thanks for wanting to contribute source code to the Mail app. That's great!
 ## Translations
 Please submit translations via [Transifex][transifex].
 
-[transifex]: https://www.transifex.com/projects/p/owncloud/
+[transifex]: https://www.transifex.com/projects/p/nextcloud/

.github/issue_template.md

@@ -71,7 +71,7 @@ Insert your config.php content here
 Insert your webserver log here
 ```
 
-##### Server log (data/owncloud.log or data/nextcloud.log)
+##### Server log (data/nextcloud.log)
 <details>
 ```
 Insert your server log here
@@ -81,14 +81,14 @@ Insert your server log here
 ##### Horde IMAP log (data/horde_imap.log)
 <details>
 ```
-Insert your horde IMAP log here, see https://github.com/owncloud/mail#debug-mode
+Insert your horde IMAP log here, see https://github.com/nextcloud/mail#debug-mode
 ```
 </details>
 
 ##### Horde SMTP log (data/horde_smtp.log)
 <details>
 ```
-Insert your horde SMTP log here, see https://github.com/owncloud/mail#debug-mode
+Insert your horde SMTP log here, see https://github.com/nextcloud/mail#debug-mode
 ```
 </details>
 

.travis.yml

@@ -57,7 +57,7 @@ before_install:
   - make install-composer-deps
   - make start-imap-docker
   - cd ..
-  - git clone https://github.com/owncloud/core.git --recursive --depth 1 -b $CORE_BRANCH core
+  - git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b $CORE_BRANCH core
   - mv mail core/apps/
 
 before_script:
@@ -106,5 +106,5 @@ matrix:
     - php: 5.4
       env: "DB=mysql CORE_BRANCH=stable9 PACKAGE=TRUE"
     - php: 5.4
-      env: "DB=mysql CORE_BRANCH=stable9.1"
+      env: "DB=mysql CORE_BRANCH=stable10"
   fast_finish: true

README.md

@@ -1,43 +1,42 @@
-# Mail
+# Nextcloud Mail
 
-[![Build Status](https://travis-ci.org/owncloud/mail.svg?branch=master)](https://travis-ci.org/owncloud/mail)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/owncloud/mail/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/owncloud/mail/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/owncloud/mail/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/owncloud/mail/?branch=master)
+[![Build Status](https://travis-ci.org/nextcloud/mail.svg?branch=master)](https://travis-ci.org/nextcloud/mail)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/mail/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/mail/?branch=master)
+[![Code Coverage](https://scrutinizer-ci.com/g/nextcloud/mail/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/mail/?branch=master)
 [![PHP Dependency Status](https://www.versioneye.com/user/projects/54e50fadd1ec5734f400078a/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54e50fadd1ec5734f400078a)
 [![JS Dependency Status](https://www.versioneye.com/user/projects/567bd06ba7c90e003500033f/badge.svg?style=flat)](https://www.versioneye.com/user/projects/567bd06ba7c90e003500033f)
-[![Bountysource](https://img.shields.io/bountysource/team/owncloud/activity.svg)](https://www.bountysource.com/teams/owncloud/issues?tracker_ids=216487)
 
-**An email app for [ownCloud](https://owncloud.org) and [Nextcloud](https://nextcloud.com)**
+**An email app for [Nextcloud](https://nextcloud.com)**
 
-![](https://raw.githubusercontent.com/owncloud/screenshots/master/mail/mail.png)
+![](screenshots/mail.png)
 
 
 ## Why is this so awesome?
 
-* :rocket: **Integration with other ownCloud apps!** Currently Contacts, Calendar & Files – more to come.
+* :rocket: **Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.
 * :inbox_tray: **Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox.
 * :lock: **Send & receive encrypted emails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.
 * :see_no_evil: **We’re not reinventing the wheel!** Based on the great [Horde](http://horde.org) libraries.
 
-And in the works for the [coming versions](https://github.com/owncloud/mail/milestones/):
-* :books: [Proper grouping of message threads](https://github.com/owncloud/mail/issues/21) 
-* :zap: [Caching to make everything faster](https://github.com/owncloud/mail/issues/480)
-* :paperclip: [Even better attachment support](https://github.com/owncloud/mail/issues/462) 
-* :package: [Folder management & moving mails](https://github.com/owncloud/mail/issues/411) 
+And in the works for the [coming versions](https://github.com/nextcloud/mail/milestones/):
+* :books: Proper grouping of message threads
+* :zap: Caching to make everything faster
+* :paperclip: Even better attachment support
+* :package: Folder management & moving mails
 
 ## Installation
 
-In your ownCloud, simply navigate to »Apps«, choose the category »Productivity«, find the Mail app and enable it.
+In your Nextcloud, simply navigate to »Apps«, choose the category »Productivity«, find the Mail app and enable it.
 Then open the Mail app from the app menu. Put in your email account credentials and off you go!
 
-If you experience any issues or have enhancement suggestions you can report them in our [issue tracker](https://github.com/owncloud/mail/issues). Please follow the [issue template](https://raw.githubusercontent.com/owncloud/mail/master/issue_template.md) so we get the info we need to be able to debug and fix the problem. Thanks!
+If you experience any issues or have enhancement suggestions you can report them in our [issue tracker](https://github.com/nextcloud/mail/issues). Please follow the [issue template](https://raw.githubusercontent.com/nextcloud/mail/master/issue_template.md) so we get the info we need to be able to debug and fix the problem. Thanks!
 
 
 ## Maintainers
 
-[Christoph Wurst](https://github.com/ChristophWurst), [Thomas Müller](https://github.com/DeepDiver1975), [Jan-Christoph Borchardt](https://github.com/jancborchardt), [Steffen Lindner](https://github.com/Gomez) [and many more](https://github.com/owncloud/mail/graphs/contributors)
+[Christoph Wurst](https://github.com/ChristophWurst), [Thomas Müller](https://github.com/DeepDiver1975), [Jan-Christoph Borchardt](https://github.com/jancborchardt), [Steffen Lindner](https://github.com/Gomez) [and many more](https://github.com/nextcloud/mail/graphs/contributors)
 
-If you’d like to join, just go through the [issue list](https://github.com/owncloud/mail/issues) and fix some. :) We’re also in [#owncloud-mail on freenode IRC](https://webchat.freenode.net/?channels=owncloud-mail).
+If you’d like to join, just go through the [issue list](https://github.com/nextcloud/mail/issues) and fix some. :) We’re also in [#nextcloud-mail on freenode IRC](https://webchat.freenode.net/?channels=nextcloud-mail).
 
 ## Troubleshooting
 
@@ -47,11 +46,11 @@ If you can not access your Gmail account use https://accounts.google.com/Display
 
 ### Outlook.com
 
-If you can not access your Outlook.com account try to enable the 'Two-Factor Verification' (https://account.live.com/proofs/Manage) and setup an app password (https://account.live.com/proofs/AppPassword), which you then use for the ownCloud Mail app.
+If you can not access your Outlook.com account try to enable the 'Two-Factor Verification' (https://account.live.com/proofs/Manage) and setup an app password (https://account.live.com/proofs/AppPassword), which you then use for the Nextcloud Mail app.
 
 ### Dovecot IMAP
 
-If your Dovecot IMAP server prefixes all folders with `INBOX`, ownCloud Mail does not work correcty. 
+If your Dovecot IMAP server prefixes all folders with `INBOX`, Nextcloud Mail does not work correctly.
 
 Check `/etc/dovecot/dovecot.conf`:
 
@@ -69,7 +68,7 @@ namespace inbox {
 
 ## Developer setup info
 
-Just clone this repo into your apps directory ([ownCloud core installation needed](https://doc.owncloud.org/server/8.2/developer_manual/general/devenv.html)). Additionally,  [npm](https://docs.npmjs.com/getting-started/installing-node) is needed for installing JavaScript dependencies. On Debian and Ubuntu Systems it can be installed with the following command:
+Just clone this repo into your apps directory (Nextcloud server installation needed). Additionally,  [npm](https://docs.npmjs.com/getting-started/installing-node) is needed for installing JavaScript dependencies. On Debian and Ubuntu Systems it can be installed with the following command:
 ```bash
 sudo apt-get install nodejs-legacy npm
 ```
@@ -84,7 +83,7 @@ make optimize-js
 Instead of setting everything up manually, you can just [download the nightly builds](https://en0ch.se/index.php/s/3v5J3XXeQCCp73p) instead. These builds are updated every 12 hours - 00:00 (12:00 AM) and 12:00 (12:00 PM) UTC+0200, and are pre-configured with all the needed dependencies.
 
 1. Download
-2. Extract the tar archive to 'path-to-owncloud/apps'
+2. Extract the tar archive to 'path-to-nextcloud/apps'
 3. Navigate to »Apps«, choose the category »Productivity«, find the Mail app and enable it.
 
 The nightly builds are provided by [Daniel Hansson](https://github.com/enoch85)
@@ -97,7 +96,7 @@ DROP TABLE oc_mail_accounts;
 DROP TABLE oc_mail_collected_addresses;
 ```
 
-Go to ownCloud Mail in the browser and run this from the developer console to clear the cache:
+Go to Nextcloud Mail in the browser and run this from the developer console to clear the cache:
 ```
 localStorage.clear();
 ```
@@ -108,7 +107,7 @@ localStorage.clear();
 Certain advanced or experimental features need to be specifically enabled in your `config.php`:
 
 ### Debug mode
-You can enable IMAP and SMTP backend logging. A horde_imap.log for IMAP and horde_smtp.log for SMTP will appear in the same directory as your owncloud.log.
+You can enable IMAP and SMTP backend logging. A horde_imap.log for IMAP and horde_smtp.log for SMTP will appear in the same directory as your nextcloud.log.
 #### IMAP logging:
 ```php
 'app.mail.imaplog.enabled' => true
@@ -119,7 +118,7 @@ You can enable IMAP and SMTP backend logging. A horde_imap.log for IMAP and hord
 ```
 
 ### Server-side caching
-Mailbox messages and accounts can be cached on the ownCloud server to reduce mail server load:
+Mailbox messages and accounts can be cached on the Nextcloud server to reduce mail server load:
 This requires a valid memcache to be configured
 ```php
 'app.mail.server-side-cache.enabled' => true

appinfo/info.xml

@@ -7,7 +7,7 @@
 	<licence>AGPL</licence>
 	<author>Christoph Wurst, Thomas Müller, Jan-Christoph Borchardt, Steffen Lindner &amp; many more …</author>
 	<documentation>
-		<admin>https://github.com/owncloud/mail#readme</admin>
+		<admin>https://github.com/nextcloud/mail#readme</admin>
 	</documentation>
 	<dependencies>
 		<owncloud min-version="9.0" max-version="9.2" />

bower.json

@@ -4,7 +4,7 @@
   "description": "Mail app",
   "main": "mail.js",
   "license": "AGPLv3",
-  "homepage": "https://github.com/owncloud/mail",
+  "homepage": "https://github.com/nextcloud/mail",
   "ignore": [
     "**/.*",
     "node_modules",

js/README.md

@@ -1,8 +1,7 @@
 # JavaScript Development
 
 All source files are stored inside this directory or subdirectories of it. With the help of [requirejs](http://www.requirejs.org/)
-any .js and .html template file is loaded into the browser asynchronously if needed. Make sure you have 
-[debug mode](https://doc.owncloud.org/server/8.2/developer_manual/general/devenv.html#enabling-debug-mode) enabled in your development
+any .js and .html template file is loaded into the browser asynchronously if needed. Make sure you have debug mode enabled in your development
 setup because this loads source files instead of the compressed one.
 
 ## Optimizing file loading for production use
@@ -14,8 +13,7 @@ be easily executed with the Makefile in the root of this repository. Simply run
 make optimize-js
 ```
 inside the project's root directory. This combines and compresses all used JavaScript source files and HTML template
-files into one file: ``js/mail.min.js``. If [debug mode](https://doc.owncloud.org/server/8.2/developer_manual/general/devenv.html#enabling-debug-mode)
-is disabled, this compressed file is then used.
+files into one file: ``js/mail.min.js``. If debug mode is disabled, this compressed file is then used.
 
 ## Coding guidelines
 

js/controller/aliasescontroller.js

@@ -1,7 +1,7 @@
 /**
  * @author Tahaa Karim <tahaalibra@gmail.com>
  *
- * ownCloud - Mail
+ * Mail
  *
  * This code is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License, version 3,

js/models/alias.js

@@ -1,5 +1,5 @@
 /**
- * ownCloud - Mail
+ * Mail
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.

js/models/aliasescollection.js

@@ -1,5 +1,5 @@
 /**
- * ownCloud - Mail
+ * Mail
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.

js/service/aliasesservice.js

@@ -1,7 +1,7 @@
 /**
  * @author Tahaa Karim <tahaalibra@gmail.com>
  *
- * ownCloud - Mail
+ * Mail
  *
  * This code is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License, version 3,

js/views/accountsettings.js

@@ -1,5 +1,5 @@
 /**
- * ownCloud - Mail
+ * Mail
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.

js/views/aliases-list.js

@@ -1,5 +1,5 @@
 /**
- * ownCloud - Mail
+ * Mail
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.

js/views/aliases.js

@@ -1,5 +1,5 @@
 /**
- * ownCloud - Mail
+ * Mail
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.

l10n/.tx/config

@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 lang_map = ja_JP: ja
 
-[owncloud.mail]
+[nextcloud.mail]
 file_filter = <lang>/mail.po
 source_file = templates/mail.pot
 source_lang = en

lib/db/alias.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ownCloud - Mail
+ * Mail
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.

lib/db/aliasmapper.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * ownCloud - Mail
+ * Mail
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.

lib/service/aliasesservice.php

@@ -2,7 +2,7 @@
 /**
  * @author Tahaa Karim <tahaalibra@gmail.com>
  *
- * ownCloud - Mail
+ * Mail
  *
  * This code is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License, version 3,

package.json

@@ -12,17 +12,17 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/owncloud/mail.git"
+    "url": "https://github.com/nextcloud/mail.git"
   },
   "keywords": [
     "mail"
   ],
   "author": "Christoph Wurst, Thomas Müller, Jan-Christoph Borchardt, Steffen Lindner and many more …",
   "license": "AGPL-3.0",
   "bugs": {
-    "url": "https://github.com/owncloud/mail/issues"
+    "url": "https://github.com/nextcloud/mail/issues"
   },
-  "homepage": "https://github.com/owncloud/mail",
+  "homepage": "https://github.com/nextcloud/mail",
   "devDependencies": {
     "grunt": "^1.0.1",
     "grunt-cli": "^0.1.13",

tests/controller/proxycontrollertest.php

@@ -58,11 +58,11 @@ protected function setUp() {
 	public function redirectDataProvider() {
 		return [
 			[
-				'http://owncloud.org',
+				'http://nextcloud.com',
 				false
 			],
 			[
-				'https://owncloud.org',
+				'https://nextcloud.com',
 				false
 			],
 			[

tests/data/mail-message-123.txt

@@ -945,7 +945,7 @@ notfoundexception.php
  0 fixed results
 
 
-owncloud.php
+nextcloud.php
  0 new results
  0 fixed results
 
@@ -1060,7 +1060,7 @@ google.php
  0 fixed results
 
 
-owncloud.php
+nextcloud.php
  0 new results
  0 fixed results
 
@@ -1135,7 +1135,7 @@ mountconfig.php
  0 fixed results
 
 
-owncloudfunctions.php
+nextcloudfunctions.php
  0 new results
  0 fixed results
 
@@ -4335,7 +4335,7 @@ errorlog.php
  0 fixed results
 
 
-owncloud.php
+nextcloud.php
  0 new results
  0 fixed results