Skip to content
This repository has been archived by the owner on Jul 26, 2020. It is now read-only.

Commit

Permalink
chore: rename from Colmena CMS to Colmena
Browse files Browse the repository at this point in the history
  • Loading branch information
beeman committed Jun 1, 2017
1 parent 8c7fd06 commit cb7a7ab
Show file tree
Hide file tree
Showing 15 changed files with 57 additions and 54 deletions.
2 changes: 1 addition & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"projectName": "colmena-cms",
"projectName": "colmena",
"projectOwner": "colmena",
"files": [
"README.md"
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Please use the following link syntaxes:
- #42 (to reference issues in the current repository)
- colmena/colmena-cms#42 (to reference issues in another repository)
- colmena/colmena#42 (to reference issues in another repository)
-->

- None
Expand Down
20 changes: 10 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing to Colmena CMS
# Contributing to Colmena

Thanks for your interest in contributing to Colmena CMS.
Thanks for your interest in contributing to Colmena.

As a contributor, here are the guidelines we would like you to follow:

Expand All @@ -12,7 +12,7 @@ As a contributor, here are the guidelines we would like you to follow:
- [Commit Message Guidelines](#commit)

## <a name="coc"></a> Code of Conduct
Help us keep Colmena CMS open and inclusive. Please read and follow our [Code of Conduct][coc].
Help us keep Colmena open and inclusive. Please read and follow our [Code of Conduct][coc].

## <a name="question"></a> Got a Question or Problem?

Expand Down Expand Up @@ -49,7 +49,7 @@ In order to reproduce bugs we might ask you to provide a minimal reproduction sc
GitHub. Having a live, reproducible scenario gives us wealth of important information without going back & forth to you
with additional questions like:

- version of Colmena CMS used
- version of Colmena used
- 3rd-party libraries and their versions
- and most importantly - a use-case that fails

Expand All @@ -63,12 +63,12 @@ we really need to isolate the problem before we can fix it.
Unfortunately we are not able to investigate / fix bugs without a minimal reproduction, so if we don't hear back from
you we are going to close an issue that don't have enough info to be reproduced.

You can file new issues by filling out our [new issue form](https://github.com/colmena/colmena-cms/issues/new).
You can file new issues by filling out our [new issue form](https://github.com/colmena/colmena/issues/new).

### <a name="submit-pr"></a> Submitting a Pull Request (PR)
Before you submit your Pull Request (PR) consider the following guidelines:

* Search [GitHub](https://github.com/colmena/colmena-cms/pulls) for an open or closed PR that relates to your submission.
* Search [GitHub](https://github.com/colmena/colmena/pulls) for an open or closed PR that relates to your submission.
You don't want to duplicate effort.
* Make your changes in a new git branch:

Expand All @@ -91,10 +91,10 @@ You don't want to duplicate effort.
git push origin my-fix-branch
```

* In GitHub, send a pull request to `colmena-cms:develop`.
* In GitHub, send a pull request to `colmena:develop`.
* If we suggest changes then:
* Make the required updates.
* Re-run the Colmena CMS test suites to ensure tests are still passing.
* Re-run the Colmena test suites to ensure tests are still passing.
* Rebase your branch and force push to your GitHub repository (this will update your Pull Request):

```shell
Expand Down Expand Up @@ -137,7 +137,7 @@ from the main (upstream) repository:
We have very precise rules over how our git commit messages can be formatted. This leads to **more
readable messages** that are easy to follow when looking through the **project history**. But also,
we use the git commit messages to **generate the Colmena CMS change log**.
we use the git commit messages to **generate the Colmena change log**.
### Commit Message Format
Each commit message consists of a **header**, a **body** and a **footer**. The header has a special
Expand Down Expand Up @@ -217,7 +217,7 @@ reference GitHub issues that this commit **Closes**.
**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this.

[coc]: CODE_OF_CONDUCT.md
[github]: https://github.com/colmena/colmena-cms
[github]: https://github.com/colmena/colmena

### Credits
This CONTRIBUTING.md is a modified version from [angular/angular](https://github.com/angular/angular/blob/master/CONTRIBUTING.md)
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
![](apps/admin/src/assets/logo.png?raw=true)

# Colmena CMS
# Colmena

> Free and Open Source API and Admin powered by LoopBack and Angular
> Free and Open Source mobile backend powered by LoopBack and Angular
> This project was formerly known as [Loopback Angular Admin](https://github.com/beeman/loopback-angular-admin).
Expand All @@ -15,7 +15,7 @@

## About

Colmena CMS is a starter kit for an API with an Admin interface that can be easily extended and built upon.
Colmena is a starter kit for an API with an Admin interface that can be easily extended and built upon.

It is built using a collection of great Open Source projects, including but not limited to:

Expand Down Expand Up @@ -55,12 +55,12 @@ And lastly (not needed to run the app, but will be useful during development):

First clone the repository to get the project files:

$ git clone -b develop https://github.com/colmena/colmena-cms
$ cd colmena-cms
$ git clone -b develop https://github.com/colmena/colmena
$ cd colmena

### Top-level directory

From inside the project dir (`colmena-cms`) run `npm install`:
From inside the project dir (`colmena`) run `npm install`:

$ npm install

Expand All @@ -70,7 +70,7 @@ Currently there is no way to build the project, it can only be run in developmen

### Running in development mode

From inside the project dir (`colmena-cms`) run `INITDB=1 npm run dev`:
From inside the project dir (`colmena`) run `INITDB=1 npm run dev`:

$ INITDB=1 npm run dev

Expand Down Expand Up @@ -104,7 +104,7 @@ You should now be able to connect to the Admin on http://192.168.12.34:9000 and

## Work in Progress

Colmena CMS is still a work in progress and not all functionality is built yet.
Colmena is still a work in progress and not all functionality is built yet.

- Almost no ACLS are implemented, this means that the API can be used by whoever has access to it
- There is no advanced user management
Expand All @@ -116,11 +116,11 @@ Colmena CMS is still a work in progress and not all functionality is built yet.
Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
| [<img src="https://avatars.githubusercontent.com/u/36491?v=3" width="100px;"/><br /><sub>Bram Borggreve</sub>](http://colmena.io/)<br />💬 [🐛](https://github.com/colmena/colmena-cms/issues?q=author%3Abeeman) [💻](https://github.com/colmena/colmena-cms/commits?author=beeman) 🎨 [📖](https://github.com/colmena/colmena-cms/commits?author=beeman) 🔧 | [<img src="https://avatars.githubusercontent.com/u/1755489?v=3" width="100px;"/><br /><sub>Willian Ribeiro Angelo</sub>](https://github.com/movibe)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=movibe) | [<img src="https://avatars.githubusercontent.com/u/977025?v=3" width="100px;"/><br /><sub>Nick Portokallidis</sub>](http://nporto.com)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=portokallidis) | [<img src="https://avatars.githubusercontent.com/u/90312?v=3" width="100px;"/><br /><sub>drmikecrowe</sub>](https://github.com/drmikecrowe)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=drmikecrowe) | [<img src="https://avatars.githubusercontent.com/u/1899626?v=3" width="100px;"/><br /><sub>Vladimir Mechkauskas</sub>](http://elartix.com/)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=elartix) | [<img src="https://avatars.githubusercontent.com/u/4164460?v=3" width="100px;"/><br /><sub>Bernardo Arevalo</sub>](https://github.com/nardoguy14)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=nardoguy14) | [<img src="https://avatars.githubusercontent.com/u/8195533?v=3" width="100px;"/><br /><sub>yieme</sub>](https://github.com/yieme)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=yieme) |
| [<img src="https://avatars.githubusercontent.com/u/36491?v=3" width="100px;"/><br /><sub>Bram Borggreve</sub>](http://colmena.io/)<br />💬 [🐛](https://github.com/colmena/colmena/issues?q=author%3Abeeman) [💻](https://github.com/colmena/colmena/commits?author=beeman) 🎨 [📖](https://github.com/colmena/colmena/commits?author=beeman) 🔧 | [<img src="https://avatars.githubusercontent.com/u/1755489?v=3" width="100px;"/><br /><sub>Willian Ribeiro Angelo</sub>](https://github.com/movibe)<br />[💻](https://github.com/colmena/colmena/commits?author=movibe) | [<img src="https://avatars.githubusercontent.com/u/977025?v=3" width="100px;"/><br /><sub>Nick Portokallidis</sub>](http://nporto.com)<br />[💻](https://github.com/colmena/colmena/commits?author=portokallidis) | [<img src="https://avatars.githubusercontent.com/u/90312?v=3" width="100px;"/><br /><sub>drmikecrowe</sub>](https://github.com/drmikecrowe)<br />[💻](https://github.com/colmena/colmena/commits?author=drmikecrowe) | [<img src="https://avatars.githubusercontent.com/u/1899626?v=3" width="100px;"/><br /><sub>Vladimir Mechkauskas</sub>](http://elartix.com/)<br />[💻](https://github.com/colmena/colmena/commits?author=elartix) | [<img src="https://avatars.githubusercontent.com/u/4164460?v=3" width="100px;"/><br /><sub>Bernardo Arevalo</sub>](https://github.com/nardoguy14)<br />[💻](https://github.com/colmena/colmena/commits?author=nardoguy14) | [<img src="https://avatars.githubusercontent.com/u/8195533?v=3" width="100px;"/><br /><sub>yieme</sub>](https://github.com/yieme)<br />[💻](https://github.com/colmena/colmena/commits?author=yieme) |
| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
| [<img src="https://avatars.githubusercontent.com/u/339169?v=3" width="100px;"/><br /><sub>Brian McIntyre</sub>](https://github.com/bmcintyre)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=bmcintyre) | [<img src="https://avatars.githubusercontent.com/u/274358?v=3" width="100px;"/><br /><sub>Rob Halff</sub>](https://github.com/rhalff)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=rhalff) | [<img src="https://avatars.githubusercontent.com/u/3543429?v=3" width="100px;"/><br /><sub>Asgeir Birkisson</sub>](https://github.com/asgeirbirkis)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=asgeirbirkis) | [<img src="https://avatars.githubusercontent.com/u/6855743?v=3" width="100px;"/><br /><sub>dthib</sub>](https://github.com/dthib)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=dthib) | [<img src="https://avatars.githubusercontent.com/u/3319777?v=3" width="100px;"/><br /><sub>Oleh Kukil</sub>](http://brainstorage.me/flashbag)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=flashbag) | [<img src="https://avatars.githubusercontent.com/u/821963?v=3" width="100px;"/><br /><sub>Pulkit Singhal</sub>](http://pulkitsinghal.blogspot.com)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=pulkitsinghal) | [<img src="https://avatars.githubusercontent.com/u/1904924?v=3" width="100px;"/><br /><sub>Tuan PM</sub>](http://tuanpm.net)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=tuanpmt) |
| [<img src="https://avatars.githubusercontent.com/u/314539?v=3" width="100px;"/><br /><sub>brownman</sub>](http://brownman.github.io)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=brownman) | [<img src="https://avatars.githubusercontent.com/u/8570291?v=3" width="100px;"/><br /><sub>Hoàng Phúc</sub>](https://github.com/hoangtrongphuc)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=hoangtrongphuc) | [<img src="https://avatars.githubusercontent.com/u/175838?v=3" width="100px;"/><br /><sub>Brian Dunnette</sub>](http://brian.dunnette.us)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=bdunnette) | [<img src="https://avatars.githubusercontent.com/u/4792828?v=3" width="100px;"/><br /><sub>Chenzc</sub>](https://github.com/Chenzc)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=Chenzc) | [<img src="https://avatars.githubusercontent.com/u/6417718?v=3" width="100px;"/><br /><sub>Tersius Kuhne</sub>](https://github.com/ktersius)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=ktersius) | [<img src="https://avatars.githubusercontent.com/u/1888261?v=3" width="100px;"/><br /><sub>Alex Quiambao</sub>](https://github.com/silverbux)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=silverbux) | [<img src="https://avatars.githubusercontent.com/u/791137?v=3" width="100px;"/><br /><sub>José Luis Di Biase</sub>](http://www.camba.coop)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=josx) |
| [<img src="https://avatars.githubusercontent.com/u/5630513?v=3" width="100px;"/><br /><sub>Shing.</sub>](https://github.com/yshing)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=yshing) | [<img src="https://avatars.githubusercontent.com/u/67973?v=3" width="100px;"/><br /><sub>Alex Wilde</sub>](alexthewilde.github.io)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=alexthewilde) | [<img src="https://avatars.githubusercontent.com/u/529030?v=3" width="100px;"/><br /><sub>dmtw</sub>](https://github.com/dmtw)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=dmtw) | [<img src="https://avatars3.githubusercontent.com/u/5523938?v=3" width="100px;"/><br /><sub>Marcus</sub>](https://github.com/kumorig)<br />[💻](https://github.com/colmena/colmena-cms/commits?author=kumorig) |
| [<img src="https://avatars.githubusercontent.com/u/339169?v=3" width="100px;"/><br /><sub>Brian McIntyre</sub>](https://github.com/bmcintyre)<br />[💻](https://github.com/colmena/colmena/commits?author=bmcintyre) | [<img src="https://avatars.githubusercontent.com/u/274358?v=3" width="100px;"/><br /><sub>Rob Halff</sub>](https://github.com/rhalff)<br />[💻](https://github.com/colmena/colmena/commits?author=rhalff) | [<img src="https://avatars.githubusercontent.com/u/3543429?v=3" width="100px;"/><br /><sub>Asgeir Birkisson</sub>](https://github.com/asgeirbirkis)<br />[💻](https://github.com/colmena/colmena/commits?author=asgeirbirkis) | [<img src="https://avatars.githubusercontent.com/u/6855743?v=3" width="100px;"/><br /><sub>dthib</sub>](https://github.com/dthib)<br />[💻](https://github.com/colmena/colmena/commits?author=dthib) | [<img src="https://avatars.githubusercontent.com/u/3319777?v=3" width="100px;"/><br /><sub>Oleh Kukil</sub>](http://brainstorage.me/flashbag)<br />[💻](https://github.com/colmena/colmena/commits?author=flashbag) | [<img src="https://avatars.githubusercontent.com/u/821963?v=3" width="100px;"/><br /><sub>Pulkit Singhal</sub>](http://pulkitsinghal.blogspot.com)<br />[💻](https://github.com/colmena/colmena/commits?author=pulkitsinghal) | [<img src="https://avatars.githubusercontent.com/u/1904924?v=3" width="100px;"/><br /><sub>Tuan PM</sub>](http://tuanpm.net)<br />[💻](https://github.com/colmena/colmena/commits?author=tuanpmt) |
| [<img src="https://avatars.githubusercontent.com/u/314539?v=3" width="100px;"/><br /><sub>brownman</sub>](http://brownman.github.io)<br />[💻](https://github.com/colmena/colmena/commits?author=brownman) | [<img src="https://avatars.githubusercontent.com/u/8570291?v=3" width="100px;"/><br /><sub>Hoàng Phúc</sub>](https://github.com/hoangtrongphuc)<br />[💻](https://github.com/colmena/colmena/commits?author=hoangtrongphuc) | [<img src="https://avatars.githubusercontent.com/u/175838?v=3" width="100px;"/><br /><sub>Brian Dunnette</sub>](http://brian.dunnette.us)<br />[💻](https://github.com/colmena/colmena/commits?author=bdunnette) | [<img src="https://avatars.githubusercontent.com/u/4792828?v=3" width="100px;"/><br /><sub>Chenzc</sub>](https://github.com/Chenzc)<br />[💻](https://github.com/colmena/colmena/commits?author=Chenzc) | [<img src="https://avatars.githubusercontent.com/u/6417718?v=3" width="100px;"/><br /><sub>Tersius Kuhne</sub>](https://github.com/ktersius)<br />[💻](https://github.com/colmena/colmena/commits?author=ktersius) | [<img src="https://avatars.githubusercontent.com/u/1888261?v=3" width="100px;"/><br /><sub>Alex Quiambao</sub>](https://github.com/silverbux)<br />[💻](https://github.com/colmena/colmena/commits?author=silverbux) | [<img src="https://avatars.githubusercontent.com/u/791137?v=3" width="100px;"/><br /><sub>José Luis Di Biase</sub>](http://www.camba.coop)<br />[💻](https://github.com/colmena/colmena/commits?author=josx) |
| [<img src="https://avatars.githubusercontent.com/u/5630513?v=3" width="100px;"/><br /><sub>Shing.</sub>](https://github.com/yshing)<br />[💻](https://github.com/colmena/colmena/commits?author=yshing) | [<img src="https://avatars.githubusercontent.com/u/67973?v=3" width="100px;"/><br /><sub>Alex Wilde</sub>](alexthewilde.github.io)<br />[💻](https://github.com/colmena/colmena/commits?author=alexthewilde) | [<img src="https://avatars.githubusercontent.com/u/529030?v=3" width="100px;"/><br /><sub>dmtw</sub>](https://github.com/dmtw)<br />[💻](https://github.com/colmena/colmena/commits?author=dmtw) | [<img src="https://avatars3.githubusercontent.com/u/5523938?v=3" width="100px;"/><br /><sub>Marcus</sub>](https://github.com/kumorig)<br />[💻](https://github.com/colmena/colmena/commits?author=kumorig) |
<!-- ALL-CONTRIBUTORS-LIST:END -->

This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
Expand Down
2 changes: 1 addition & 1 deletion apps/admin/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# colmena-cms-admin
# colmena-admin

This project is based on CoreUI - Angular 2.

Expand Down
11 changes: 6 additions & 5 deletions apps/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
"private": false,
"license": "MIT",
"author": "Bram Borggreve <bram@colmena.io>",
"url": "https://github.com/colmena/colmena-cms",
"homepage": "https://github.com/colmena/colmena-cms",
"url": "https://github.com/colmena/colmena",
"homepage": "https://github.com/colmena/colmena",
"repository": {
"type": "git",
"url": "https://github.com/colmena/colmena-cms"
"url": "https://github.com/colmena/colmena"
},
"bugs": {
"url": "https://github.com/colmena/colmena-cms/issues"
"url": "https://github.com/colmena/colmena/issues"
},
"keywords": [
"colmena",
"cms",
"colmena-cms",
"mobile",
"backend",
"loopback",
"angular",
"admin"
Expand Down
6 changes: 3 additions & 3 deletions apps/admin/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="Colmena CMS - Open Source API and Admin">
<meta name="description" content="Colmena - Open Source mobile backend">
<meta name="author" content="Bram Borggreve">
<meta name="keyword" content="Loopback,Angular,Bootstrap,Admin,Open Source,AngularJS,MIT,Dashboard">
<title>Colmena CMS - Open Source API and Admin</title>
<meta name="keyword" content="Mobile,Backend,Loopback,Angular,Bootstrap,Admin,Open Source,MIT,Dashboard">
<title>Colmena - Open Source mobile backend</title>

<base href="/">
<link rel="icon" type="image/x-icon" href="favicon.ico">
Expand Down
2 changes: 1 addition & 1 deletion apps/api/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# colmena-cms-api
# colmena-api

The project is based on [LoopBack](http://loopback.io).
11 changes: 6 additions & 5 deletions apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
"private": false,
"license": "MIT",
"author": "Bram Borggreve <bram@colmena.io>",
"url": "https://github.com/colmena/colmena-cms",
"homepage": "https://github.com/colmena/colmena-cms",
"url": "https://github.com/colmena/colmena",
"homepage": "https://github.com/colmena/colmena",
"repository": {
"type": "git",
"url": "https://github.com/colmena/colmena-cms"
"url": "https://github.com/colmena/colmena"
},
"bugs": {
"url": "https://github.com/colmena/colmena-cms/issues"
"url": "https://github.com/colmena/colmena/issues"
},
"keywords": [
"colmena",
"cms",
"colmena-cms",
"mobile",
"backend",
"loopback",
"angular",
"admin"
Expand Down
2 changes: 1 addition & 1 deletion apps/api/server/boot/10-init-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = function(app, cb) {
system: true,
type: 'string',
key: 'appName',
value: 'Colmena CMS',
value: 'Colmena',
},
]

Expand Down
2 changes: 1 addition & 1 deletion modules/admin-dashboard/src/about/about.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<i class="icon-info"></i>
&nbsp; About
</ui-card-header>
<ui-card-content>This is Colmena CMS</ui-card-content>
<ui-card-content>This is Colmena</ui-card-content>
</ui-card>
</div>
</div>
Loading

0 comments on commit cb7a7ab

Please sign in to comment.