Commit Graph
42 Commits
Author SHA1 Message Date
Geremia Taglialatela df96c80a02 Merge branch 'hotfix/0.5.1' into develop 2013-06-13 18:41:49 +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
Cesidio Di Landa 743460fc22 Merge branch 'hotfix/0.1.5' 2013-04-22 12:43:00 +02:00
Cesidio Di Landa cffe50afad * Updated gems
* Improved README
* Improved spec_helper
* Improved gemfile
Bumped VERSION to 0.1.5
Updated CHANGELOG
2013-04-22 12:42:54 +02:00
Cesidio Di Landa 10c4b47b46 Merge branch 'hotfix/0.1.4' into develop 2013-04-20 12:58:52 +02:00
Cesidio Di Landa 2d63d7b0e9 Merge branch 'hotfix/0.1.4' 2013-04-20 12:58:49 +02:00
Cesidio Di Landa 7eaa45fe41 Bumped VERSION to 0.1.4
Updated CHANGELOG
* Added postgresql spec configuration
* Using database_cleaner gem from master branch
2013-04-20 12:58:42 +02:00
Cesidio Di Landa 7634253489 Merge branch 'hotfix/0.1.3' into develop 2013-04-20 11:38:23 +02:00
Cesidio Di Landa 197c6c3212 Merge branch 'hotfix/0.1.3' 2013-04-20 11:38:18 +02:00
Cesidio Di Landa 02b08a78ad Bumped VERSION to 0.1.3
Updated CHANGELOG
Added LICENSE file
Added Travis CI
Added Coveralls
Added badges
Removed unneeded gem
2013-04-20 11:38:13 +02:00
Cesidio Di Landa bf74fa9546 Merge branch 'hotfix/0.1.2' into develop 2013-04-20 10:48:22 +02:00
Cesidio Di Landa 7e3fe4ebb6 Merge branch 'hotfix/0.1.2' 2013-04-20 10:48:18 +02:00
Cesidio Di Landa 98c8f5722c Bumped VERSION to 0.1.2
Updated CHANGELOG
Trying to compile assets on heroku
2013-04-20 10:48:09 +02:00
Cesidio Di Landa c557e69115 Merge branch 'hotfix/0.1.1' into develop 2013-04-19 20:06:58 +02:00
Cesidio Di Landa 6d61923e64 Merge branch 'hotfix/0.1.1' 2013-04-19 20:06:48 +02:00
Cesidio Di Landa aa855ead9f moved files to proper folder
added .slugignore
2013-04-19 20:06:41 +02:00
Cesidio Di Landa 41cfc04c77 Merge branch 'release/0.1' 2013-04-19 20:01:27 +02:00
Cesidio Di Landa f070fa45d4 specs
readme
changelog
version
2013-04-19 20:00:54 +02:00
Cesidio Di Landa 3e96be498e Home page
Layout
Assets
2013-04-19 19:51:23 +02:00
Cesidio Di Landa cee2bd02da first commit 2013-04-19 19:14:51 +02:00