Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor changes #42

Merged
merged 4 commits into from Jan 5, 2017
Merged

Minor changes #42

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46e4581
make 'New Note' text visible
rushsteve1 Dec 29, 2016
fdeea64
ownCloud -> nextcloud
rushsteve1 Dec 29, 2016
72176de
Uppercase headers
rushsteve1 Dec 30, 2016
01d279b
More uppercasing
rushsteve1 Dec 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions CONTRIBUTING.md
View file
Open in desktop
@@ -1,6 +1,6 @@
## Submitting issues

If you have questions about how to install or use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc].
If you have questions about how to install or use nextcloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc].
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's nit-picking, but could you please uppercase Nextcloud?


### Short version

Expand All @@ -11,19 +11,19 @@ If you have questions about how to install or use ownCloud, please direct these
- Go to one of the repositories, click "issues" and type any word in the top search/command bar.
- You can also filter by appending e. g. "state:open" to the search string.
- More info on [search syntax within github](https://help.github.com/articles/searching-issues)
* This repository ([notes](https://github.com/owncloud/notes/issues)) is *only* for issues within the ownCloud notes code.
* __SECURITY__: Report any potential security bug to security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
* This repository ([notes](https://github.com/nextcloud/notes/issues)) is *only* for issues within the nextcloud notes code.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here as well

* __SECURITY__: Report any potential security bug to security@nextcloud.com following our [security policy](https://nextcloud.com/security/) instead of filing an issue in our bug tracker
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this advice is still valid or if that mail address even exists.
@LukasReschke any advice?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was also unsure if that email existed, so decided to change it anyway. If anyone knows better please just tell me.

* Report the issue using our [template][template], it includes all the information we need to track down the 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/core/master/issue_template.md
[template]: https://raw.github.com/nextcloud/server/master/issue_template.md
[mailinglist]: https://mailman.owncloud.org/mailman/listinfo/owncloud
[forum]: https://forum.owncloud.org/
[irc]: https://webchat.freenode.net/?channels=owncloud&uio=d4
[irc-dev]: https://webchat.freenode.net/?channels=owncloud-dev&uio=d4
[forum]: https://help.nextcloud.com/
[irc]: https://webchat.freenode.net/?channels=nextcloud&uio=d4
[irc-dev]: https://webchat.freenode.net/?channels=nextcloud-dev&uio=d4

### Contribute Code and translations
Please check [core's contribution guidelines](https://github.com/owncloud/core/blob/master/CONTRIBUTING.md) for further information about contributing code and translations.
Please check [core's contribution guidelines](https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md) for further information about contributing code and translations.

For further development questions / discussions you can also join the [#owncloud-dev][irc-dev] IRC channel.
For further development questions / discussions you can also join the [#nextcloud-dev][irc-dev] IRC channel.
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
@@ -1,5 +1,5 @@
#
# ownCloud scaffolder tool
# Nextcloud scaffolder tool
#
# Copyright (C) 2013 Bernhard Posselt, <nukewhale@gmail.com>
#
Expand Down
2 changes: 1 addition & 1 deletion appinfo/app.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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 appinfo/routes.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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/errors.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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/notesapicontroller.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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/notescontroller.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* This file is licensed under the Affero General Public License version 3 or
* later. See the COPYING file.
Expand Down
1 change: 0 additions & 1 deletion css/notes.css
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@
}

#app-navigation #note-add span {
display: none;
font-weight: bold;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jancborchardt what do you think about this?
We get the demand to show the text every once in a while.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I vote for displaying the text always. And I vote for displaying it more like a button, like in the contacts app (cp. #14 (comment)):
neuer-kontakt

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally I think it adds clarity, and overall looks better. Having it look like a button like @korelstar said would also be nice, though was somewhat out of scope of what i was going for in this PR.

padding-left: 2px;
}
Expand Down
2 changes: 1 addition & 1 deletion db/note.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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 js/bower.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"name": "ownCloud notes",
"name": "Nextcloud notes",
"version": "0.0.1",
"dependencies": {
"angular": "1.4.*",
Expand Down
2 changes: 1 addition & 1 deletion js/karma.conf.js
View file
Open in desktop
@@ -1,6 +1,6 @@

/**
* ownCloud - Notes app
* Nextcloud - Notes app
*
* @author Bernhard Posselt
*
Expand Down
6 changes: 3 additions & 3 deletions js/package.json
View file
Open in desktop
Expand Up @@ -3,12 +3,12 @@
"description": "Notes app",
"version": "0.0.1",
"private": true,
"homepage": "https://github.com/owncloud/notes",
"homepage": "https://github.com/nextcloud/notes",
"repository": {
"type": "git",
"url": "git@github.com:owncloud/notes.git"
"url": "git@github.com:nextcloud/notes.git"
},
"bugs": "https://github.com/owncloud/notes/issues",
"bugs": "https://github.com/nextcloud/notes/issues",
"dependencies": {},
"devDependencies": {
"del": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion service/notedoesnotexistexception.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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 service/notesservice.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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 tests/integration/controller/NotesApiControllerTest.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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 tests/integration/controller/NotesControllerTest.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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 tests/unit/controller/NotesApiControllerTest.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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 tests/unit/controller/NotesControllerTest.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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 tests/unit/controller/PageControllerTest.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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 tests/unit/db/NoteTest.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* 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 tests/unit/service/NotesServiceTest.php
View file
Open in desktop
@@ -1,6 +1,6 @@
<?php
/**
* ownCloud - Notes
* Nextcloud - Notes
*
* This file is licensed under the Affero General Public License version 3 or
* later. See the COPYING file.
Expand Down