-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
gabbydgab
committed
Jan 9, 2015
1 parent
d960ee5
commit 8f74840
Showing
63 changed files
with
6,211 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,3 +18,6 @@ temp/ | |
# Legacy ZF1 | ||
demos/ | ||
extras/documentation | ||
|
||
# 3rd-party assets | ||
public/assets |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
# USING THE GIT REPOSITORY | ||
|
||
## Setup your own public repository | ||
|
||
Your first step is to establish a public repository from which we can | ||
pull your work into the master repository. You have two options: use | ||
GitHub or other public site, or setup/use your own repository. | ||
|
||
While you can use a private repository and utilize ``git format-patch`` to | ||
submit patches, this is discouraged as it does not facilitate public peer | ||
review. | ||
|
||
### Option 1: GitHub | ||
|
||
1. Setup a GitHub account (http://github.com/), if you haven't yet | ||
2. Fork the Coding Matters, Inc. Official Site repository (http://github.com/CodingMatters/OfficialSite) | ||
3. Clone your fork locally and enter it (use your own GitHub username | ||
in the statement below) | ||
|
||
```sh | ||
% git clone git@github.com:<username>/OfficialSite.git | ||
% cd OfficialSite | ||
``` | ||
|
||
4. Add a remote to the canonical Coding Matters, Inc. Official Site repository, so you can keep your fork | ||
up-to-date: | ||
|
||
```sh | ||
% git remote add OfficialSite https://github.com/CodingMatters/OfficialSite.git | ||
% git fetch OfficialSite | ||
``` | ||
|
||
### Option 2: Personal Repository | ||
|
||
We assume you will use gitosis (http://git-scm.com/book/en/Git-on-the-Server-Gitosis) | ||
or gitolite (http://git-scm.com/book/en/Git-on-the-Server-Gitolite) to host your | ||
own repository. If you go this route, we will assume you have the knowledge to | ||
do so, or know where to obtain it. We will not assist you in setting up such a | ||
repository. | ||
|
||
1. Create a new repository | ||
|
||
```sh | ||
% git init | ||
``` | ||
|
||
2. Add an "origin" remote pointing to your gitosis/gitolite repo: | ||
|
||
```sh | ||
% git remote add origin git://yourdomain/yourrepo.git | ||
``` | ||
|
||
3. Add a remote for the Coding Matters, Inc. Official Site repository and fetch it | ||
|
||
```sh | ||
% git remote add OfficialSite https://github.com/CodingMatters/OfficialSite.git | ||
% git fetch OfficialSite | ||
``` | ||
|
||
4. Create a new branch for the Coding Matters, Inc. Official Site repository (named "OfficialSite/master" here) | ||
|
||
```sh | ||
% git checkout -b OfficialSite/master OfficialSite/master | ||
``` | ||
|
||
5. Create your master branch off the OfficialSite branch, and push to your | ||
repository | ||
|
||
```sh | ||
% git checkout -b master | ||
% git push origin HEAD:master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,8 @@ | ||
Official website of Coding Matters, Inc | ||
Official site of Coding Matters, Inc | ||
============ | ||
|
||
[![Latest Stable Version](https://poser.pugx.org/codingmatters/official-website/v/stable.svg)](https://packagist.org/packages/codingmatters/official-website) [![Total Downloads](https://poser.pugx.org/codingmatters/official-website/downloads.svg)](https://packagist.org/packages/codingmatters/official-website) [![Latest Unstable Version](https://poser.pugx.org/codingmatters/official-website/v/unstable.svg)](https://packagist.org/packages/codingmatters/official-website) [![License](https://poser.pugx.org/codingmatters/official-website/license.svg)](https://packagist.org/packages/codingmatters/official-website) [![Build Status](https://travis-ci.org/CodingMatters/OfficialSite.svg)](https://travis-ci.org/CodingMatters/OfficialSite) | ||
|
||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
{ | ||
"name": "codingmatters/official-website", | ||
"version": "1.0.0", | ||
"homepage": "https://github.com/CodingMatters/OfficialSite", | ||
"authors": [ | ||
"gabbydgab <gamba@gabbydgab.com>" | ||
], | ||
"description": "Official Website", | ||
"main": "dist/sample.js", | ||
"moduleType": [ | ||
"globals" | ||
], | ||
"keywords": [ | ||
"megamitch" | ||
], | ||
"license": "MIT", | ||
"directory": "public/testasset", | ||
"dependencies": { | ||
"jquery": "2.1.1", | ||
"jquery-ui": "1.11.2", | ||
"components-font-awesome": "4.2.0", | ||
"components-bootstrap": "3.3.1" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
{ | ||
"name": "codingmatters/official-website", | ||
"description": "Official website of Coding Matters, Inc.", | ||
"license": "MIT", | ||
"type": "application", | ||
"keywords": [ | ||
"coding matters", | ||
"zf2" | ||
], | ||
"homepage": "http://www.codingmatters.io", | ||
"authors": [ | ||
{ | ||
"name": "Gab Amba", | ||
"email": "gamba@gabbydgab.com", | ||
"homepage": "http://www.gabbydgab.com/" | ||
} | ||
], | ||
"require": { | ||
"php": ">=5.4", | ||
"zendframework/zendframework": "2.3.*", | ||
"evandotpro/edp-module-layouts": "dev-master" | ||
}, | ||
"require-dev": { | ||
"phpunit/phpunit": "4.*", | ||
"phpunit/php-invoker": "1.*" | ||
}, | ||
"scripts": { | ||
"pre-install-cmd": [ | ||
"rm -rf public/assets/jquery", | ||
"rm -rf public/assets/jquery-ui", | ||
"rm -rf public/assets/font-awesome", | ||
"rm -rf public/assets/bootstrap" | ||
], | ||
"post-install-cmd": [ | ||
"git submodule update --init", | ||
"bower install", | ||
"mv bower_components/jquery/dist public/assets/jquery", | ||
"mv bower_components/jquery-ui public/assets/jquery-ui", | ||
"mv bower_components/components-font-awesome public/assets/font-awesome", | ||
"mv bower_components/components-bootstrap public/assets/bootstrap", | ||
"rm -rf bower_components" | ||
], | ||
"pre-update-cmd": [ | ||
"rm -rf public/assets/jquery", | ||
"rm -rf public/assets/jquery-ui", | ||
"rm -rf public/assets/font-awesome", | ||
"rm -rf public/assets/bootstrap" | ||
], | ||
"post-update-cmd": [ | ||
"git submodule sync", | ||
"bower update", | ||
"mv bower_components/jquery/dist public/assets/jquery", | ||
"mv bower_components/jquery-ui public/assets/jquery-ui", | ||
"mv bower_components/components-font-awesome public/assets/font-awesome", | ||
"mv bower_components/components-bootstrap public/assets/bootstrap", | ||
"rm -rf bower_components" | ||
] | ||
} | ||
} |
Oops, something went wrong.