55 Commits

Author SHA1 Message Date
momoko saunders
d2290af3db Add platforms to the Gemfile 2014-06-11 19:38:00 -07:00
Godwin
930aa130d6 Preparing for deployment to new server 2014-06-02 18:45:26 -06:00
Godwin
87fbd50af1 Changed default port and added migration tasks 2014-05-26 18:01:28 -06:00
G0dwin
4f448df63a Tests fixed 2014-05-17 19:00:39 -06:00
G0dwin
f6b39ea93f User login error fixed 2014-05-17 18:25:43 -06:00
G0dwin
20c9791f52 User login error fixed 2014-05-17 18:20:13 -06:00
Graham Kaplan
3d9650f531 Fix gemfile for openshift 2014-05-17 16:31:10 -07:00
G0dwin
e5bf3f5a5c Fixed a problem preventing login 2014-05-17 12:54:39 -06:00
Godwin
52e5e10232 Translations 2014-05-04 14:56:18 -06:00
Godwin
cc948937bc Some updates to translation engine, added dotenv but have not yet set it up. 2014-04-29 21:02:02 -06:00
Graham Kaplan
3759910993 Forgot to fix conflicts, oops 2014-04-05 19:33:22 -07:00
Graham Kaplan
abaf5b55a4 Merge branch 'master' of https://github.com/bikebike/BikeBike
Conflicts:
	Gemfile
	Gemfile.lock
2014-04-05 19:27:05 -07:00
Graham Kaplan
ab42618bbd Add rails-footnotes to make development debugging easier 2014-04-05 19:15:37 -07:00
Godwin
b0c0e029fd Testing tests 8 2014-03-23 16:23:29 -06:00
Godwin
53d26c62a8 Testing tests 7 2014-03-23 14:41:29 -06:00
Godwin
4084669d0c Testing tests 6 2014-03-23 14:28:53 -06:00
Godwin
fb19bb1220 Testing tests 3 2014-03-23 14:09:19 -06:00
Godwin
f5ec601fac Testing tests 2 2014-03-23 13:40:09 -06:00
Godwin
fda5646974 Testing tests 2014-03-23 13:31:08 -06:00
Godwin
bbec690e2f The working basics 2014-03-09 14:56:24 -06:00
Godwin
db60933506 The working basics 2014-03-09 14:43:33 -06:00
Godwin
40f3f7fd0c Attempt #2 2013-10-28 23:17:45 -06:00
Godwin
25664fe55d Removed Bootstrap and converted to scss 2013-10-26 18:40:06 -06:00
Godwin
7aee52c54b Added compass 2013-10-20 20:43:11 -06:00
Godwin
99965c0819 Readded the ruby racer 2013-10-20 20:41:05 -06:00
Godwin
3f0ed58b70 ??? 2013-10-20 20:37:29 -06:00
Godwin
6904c1c4ec Not sure whats going on 2013-10-20 20:36:18 -06:00
Geremia Taglialatela
dce8146744 Updated gems 2013-09-28 13:07:20 +02:00
Geremia Taglialatela
e562fbbd09 Updated gems 2013-08-23 14:35:26 +02:00
Cesidio Di Landa
d565e97349 * Removed nokogiri
* Updated gems
2013-08-05 16:51:27 +02:00
Cesidio Di Landa
5ef8d0d542 Updated gems 2013-07-26 11:38:55 +02:00
Cesidio Di Landa
df786474eb Updated gems
Bumped VERSION to 1.1.1
Updated CHANGELOG
2013-07-23 10:05:43 +02:00
Cesidio Di Landa
710b698022 Updated gems
Added .rspec to repository
2013-07-19 20:14:29 +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
c3dbbbbc4c Updated gems
Updated CHANGELOG
Bumped VERSION to 1.0.5
2013-07-13 11:36:52 +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
3710f15d0d Bumped VERSION to 1.0.2
Updated CHANGELOG
Updated README
Updated gems
2013-07-02 12:26:52 +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
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
6fe6c89de3 added rails_12factor gem 2013-06-21 11:37:31 +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
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
9df9ff5826 Updated database_cleaner gem 2013-06-12 11:12:40 +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
384edfbfd2 Updated gems 2013-05-17 18:24:38 +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