74 Commits

Author SHA1 Message Date
Godwin
83986fe51c Email testing support, added Gemfile.lock and compiled bumbleberry assets to gitignore. 2015-09-07 12:25:17 -07:00
Godwin
dcfdc5e5ad Translation improvements 2015-09-01 20:50:45 -07:00
Godwin
9b02e0540c Added daemons to gemfile to enable delayed_job in prod 2015-08-30 19:06:25 -07:00
Godwin
24281ad9e2 Fixed translation, CDN, and POST issues for prod 2015-08-26 21:02:08 -07:00
Godwin
c3aec0b71e Almost ready to merge 2015-08-18 22:18:29 -07:00
Godwin
9da5f6a223 Registration working until workshops 2015-08-04 21:54:04 -07:00
Godwin
d151e37e2e Adding preview environment 2015-05-02 17:41:41 -07:00
Godwin
98b3013e3e Added unicorn to gemfile 2015-05-02 15:14:16 -07:00
Godwin
94fddcf54e Getting ready for preview deployment 2015-05-02 11:11:17 -07:00
Godwin
37ee6cfee7 Updates styles, translations page, links, etc 2015-04-01 18:02:51 -07:00
Godwin
e476457ea3 Updated style and layout 2015-03-17 20:29:17 -07:00
Godwin
f28a6b3ed8 Working on a bunch of new changes 2014-12-18 21:29:53 -08:00
Dylan Peerenboom
46335c1435 fix paper-trail version control to 3.0.5 2014-09-01 13:46:16 -07:00
Godwin
1430e505a0 Paypal Registration 2014-07-24 00:16:33 -06:00
Godwin
1efe20fe42 Fixed merge conflicts 2014-07-18 20:35:15 -06: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
853aa63df0 Another test 2014-07-05 14:32:21 -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
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
Godwin
ffa8239e42 Moved form helpers from application_helper to a real FormHelper 2014-05-12 20:09:19 -06:00
Godwin
9ae7135c6a Trying to fix travis errors 2014-05-04 21:21:55 -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
f409825838 Testing tests 6 2014-03-23 14:37:03 -06:00
Godwin
58e948f946 Testing tests 5 2014-03-23 14:21:23 -06:00
Godwin
fb19bb1220 Testing tests 3 2014-03-23 14:09:19 -06:00
Godwin
078b65813e Testing tests 3 2014-03-23 13:49:06 -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
55d47180e0 Fixed some issues with registration 2014-03-15 20:43:16 -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
7a7fbc62c6 Attempt #5 2013-10-28 23:27:42 -06:00