Merge pull request #36 from sjlu/develop

Rewriting to support future versions
sjlu · Apr 17, 2015 · 00d7b05 · 00d7b05
2 parents 68da3f1 + 8a429df
commit 00d7b05
Show file tree

Hide file tree

Showing 215 changed files with 149 additions and 56,876 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
 .swp
-application/cache
-application/logs
+.tmp
+CodeIgniter-Bootstrap
+CodeIgniter-Bootstrap.zip
diff --git a/Makefile b/Makefile
@@ -0,0 +1,4 @@
+build: run
+
+run:
+	./create.sh
diff --git a/README.md b/README.md
@@ -4,13 +4,34 @@ Bundles the following packages together.
 
 * [CodeIgniter](https://github.com/bcit-ci/CodeIgniter)
 * [CodeIgniter Rest Server](https://github.com/chriskacerguis/codeigniter-restserver)
-* [Twiiter Bootstrap](https://github.com/twbs/bootstrap)
+* [Twitter Bootstrap](https://github.com/twbs/bootstrap)
 * [Font Awesome](https://github.com/FortAwesome/Font-Awesome)
+* [lodash](https://github.com/lodash/lodash)
 
 ## Use
 
-* Download this [package](https://github.com/sjlu/CodeIgniter-Bootstrap/archive/master.zip).
-* Use like any other [CodeIgniter install](http://codeigniter.com/user_guide/installation/index.html). 
+* Download this [package](https://github.com/sjlu/CodeIgniter-Bootstrap/releases/download/master/CodeIgniter-Bootstrap.zip)
+* Use like any other [CodeIgniter install](http://codeigniter.com/user_guide/installation/index.html)
+
+## Build
+
+You can alternatively build your own bundle of CodeIgniter Bootstrap.
+
+* First clone this reposistory
+```
+git clone git@github.com:sjlu/CodeIgniter-Bootstrap.git
+cd CodeIgniter-Bootstrap
+```
+
+* Run the makefile
+```
+make
+```
+
+* Unzip the build
+```
+unzip CodeIgniter-Bootstrap.zip
+```
 
 ## Docs
 

diff --git a/application/.htaccess b/application/.htaccess
diff --git a/application/cache/.htaccess b/application/cache/.htaccess
diff --git a/application/cache/index.html b/application/cache/index.html
diff --git a/application/config/autoload.php b/application/config/autoload.php