68 Commits

Author SHA1 Message Date
Cesidio Di Landa
1a4c2ada52 Updated CHANGELOG
Bumped VERSION to 1.1.0
Support for Nitrous.IO
2013-07-19 20:02:23 +02:00
Geremia Taglialatela
9def4048d2 Merge branch 'hotfix/1.0.6' into develop 2013-07-14 12:04:28 +02:00
Geremia Taglialatela
b0f90baf2e Updated gems
Updated CHANGELOG
Bumped VERSION to 1.0.6
2013-07-14 12:04:16 +02:00
Geremia Taglialatela
59fc45d93f Merge branch 'hotfix/1.0.5' into develop 2013-07-13 11:37:14 +02:00
Geremia Taglialatela
feb482cef0 Merge branch 'hotfix/1.0.5' 2013-07-13 11:37:05 +02:00
Geremia Taglialatela
c3dbbbbc4c Updated gems
Updated CHANGELOG
Bumped VERSION to 1.0.5
2013-07-13 11:36:52 +02:00
Geremia Taglialatela
2a04759143 Merge branch 'hotfix/1.0.4' into develop 2013-07-06 12:35:30 +02:00
Geremia Taglialatela
c514e6d1fc Merge branch 'hotfix/1.0.4' 2013-07-06 12:35:26 +02:00
Geremia Taglialatela
9d5f03d95a Updated gems
Bumped VERSION to 1.0.4
Updated CHANGELOG
2013-07-06 12:35:17 +02:00
Cesidio Di Landa
495701dfaf Merge branch 'hotfix/1.0.3' into develop 2013-07-02 12:33:49 +02:00
Cesidio Di Landa
d4d8446f2b Merge branch 'hotfix/1.0.3' 2013-07-02 12:33:42 +02:00
Cesidio Di Landa
e8600cc1b1 Bumped VERSION to 1.0.3
Updated CHANGELOG
Fixed README
2013-07-02 12:33:40 +02:00
Cesidio Di Landa
d5e98fd6cd Merge branch 'hotfix/1.0.2' into develop 2013-07-02 12:27:03 +02:00
Cesidio Di Landa
c58d7102ed Merge branch 'hotfix/1.0.2' 2013-07-02 12:26:59 +02:00
Cesidio Di Landa
3710f15d0d Bumped VERSION to 1.0.2
Updated CHANGELOG
Updated README
Updated gems
2013-07-02 12:26:52 +02:00
Cesidio Di Landa
852f7b0698 Merge branch 'hotfix/1.0.1' into develop 2013-06-28 12:52:06 +02:00
Cesidio Di Landa
8409a76144 Merge branch 'hotfix/1.0.1' 2013-06-28 12:52:02 +02:00
Cesidio Di Landa
692973fd48 Updated CHANGELOG
Bumped VERSION to 1.0.1
2013-06-28 12:51:55 +02:00
Cesidio Di Landa
67b6888e7b Merge branch 'release/1.0.0' 2013-06-25 17:29:53 +02:00
Cesidio Di Landa
01e5a7a821 Bumped VERSION to 1.0.0
Updated CHANGELOG
Updated README
Updated home
Commented out unused gems
2013-06-25 17:29:38 +02:00
Geremia Taglialatela
ddf03f9c6e Merge branch 'hotfix/0.6.1' into develop 2013-06-21 11:37:58 +02:00
Geremia Taglialatela
5a7a5d14fb Merge branch 'hotfix/0.6.1' 2013-06-21 11:37:49 +02:00
Geremia Taglialatela
6fe6c89de3 added rails_12factor gem 2013-06-21 11:37:31 +02:00
Geremia Taglialatela
877d8949f3 Merge branch 'release/0.6.0' 2013-06-21 11:21:14 +02:00
Geremia Taglialatela
3fd223e322 Updated gems
Fontawesome 3.2.1
Updated CHANGELOG
Bumped version to 0.6.0
2013-06-21 11:21:02 +02:00
Geremia Taglialatela
df96c80a02 Merge branch 'hotfix/0.5.1' into develop 2013-06-13 18:41:49 +02:00
Geremia Taglialatela
0fe1c80c2b Merge branch 'hotfix/0.5.1' 2013-06-13 18:41:45 +02:00
Geremia Taglialatela
b457a48739 Fixed specs
Fixed changelog
2013-06-13 18:41:38 +02:00
Geremia Taglialatela
f91d869946 Merge branch 'release/0.5.0' 2013-06-13 13:02:28 +02:00
Geremia Taglialatela
89072dd53e Using puma instead of thin
Updated gems
Custom twitter-bootstrap-rails with BS 2.3.2 and FA 3.2.0
2013-06-13 13:00:48 +02:00
Cesidio Di Landa
e7c6cb9133 resolved conflicts [ci skip] 2013-06-12 11:13:40 +02:00
Cesidio Di Landa
1845b5d475 Merge branch 'hotfix/0.4.1' 2013-06-12 11:12:52 +02:00
Cesidio Di Landa
9df9ff5826 Updated database_cleaner gem 2013-06-12 11:12:40 +02:00
Cesidio Di Landa
813f06d8c0 Bumped develop version to 0.5.0 2013-06-12 11:05:23 +02:00
Cesidio Di Landa
6cfaa0ef35 fixed conflicts 2013-06-12 11:04:54 +02:00
Cesidio Di Landa
51e80bbc65 fixed conflicts 2013-06-12 11:01:53 +02:00
Cesidio Di Landa
0c67e4e0b8 Rails 4 rc2 2013-06-12 10:58:57 +02:00
Cesidio Di Landa
a9fd149f3d fixed conflicts 2013-05-17 18:25:42 +02:00
Cesidio Di Landa
54a8d31350 Merge branch 'hotfix/0.3.1' 2013-05-17 18:24:56 +02:00
Cesidio Di Landa
384edfbfd2 Updated gems 2013-05-17 18:24:38 +02:00
Geremia Taglialatela
39ea68f466 Bumped development version to 0.4.0
[ci skip]
2013-05-11 15:43:39 +02:00
Geremia Taglialatela
13fd6c53ce Merge branch 'release/0.3.0' 2013-05-11 15:42:23 +02:00
Geremia Taglialatela
8ea53d9800 Updated gems
Fontawesome 3.1.1
Updated CHANGELOG
2013-05-11 15:42:08 +02:00
Geremia Taglialatela
9147b67f30 Attempting to fix fontawesome issue 2013-05-06 20:45:01 +02:00
Geremia Taglialatela
a9d09e2349 Merge branch 'develop' of github.com:diowa/ruby2-rails4-bootstrap-heroku into develop 2013-05-06 19:48:37 +02:00
Cesidio Di Landa
49c8fed7d4 Bumped development version to 0.3.0
[ci skip]
2013-05-02 11:44:01 +02:00
Cesidio Di Landa
e9d6eeef0b Merge branch 'release/0.2.0' 2013-05-02 11:42:30 +02:00
Cesidio Di Landa
bc85296079 Bumped VERSION to 0.2.0
Updated CHANGELOG
Rails 4.0.0rc1
Improved and fixed spec helper
2013-05-02 11:41:41 +02:00
Cesidio Di Landa
11ac794875 Merge branch 'develop' of github.com:diowa/ruby2-rails4-bootstrap-heroku into develop 2013-04-23 18:48:27 +02:00
Cesidio Di Landa
c82b057f6d Merge branch 'hotfix/0.1.5' into develop 2013-04-22 12:43:04 +02:00