69 Commits

Author SHA1 Message Date
Godwin
1430e505a0 Paypal Registration 2014-07-24 00:16:33 -06:00
Godwin
4cf9277d20 Trying to merge 2014-07-18 20:47:56 -06:00
Godwin
1efe20fe42 Fixed merge conflicts 2014-07-18 20:35:15 -06:00
momoko saunders
65d4603093 Merging again 2014-07-18 19:33:42 -07:00
momoko saunders
21ec7bb82a Merging 2014-07-18 18:56:35 -07:00
Godwin
e64eb1f153 Analytics and jquery fallback 2014-07-13 21:27:59 -06:00
Godwin
62b0bea131 Minor adjustments 2014-07-13 17:23:28 -06:00
Godwin
08aecce225 SEO work and resources page 2014-07-13 11:08:01 -06:00
Godwin
466e7fccc5 Created a CDN 2014-07-12 15:29:19 -06:00
Godwin
db621f244b SSL test 2014-07-11 19:48:44 -06:00
Godwin
1907122880 A lot of updates so far today... 2014-07-06 19:02:23 -06:00
Godwin
200f3ad723 Conference select issue 2014-07-05 14:15:25 -06:00
Godwin
c40a7b65ba Gemfile change 2014-07-05 11:13:41 -06:00
momoko saunders
4c7a1f84bd Add cucumber to the Gemfile 2014-06-11 19:39:35 -07:00
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