93 Commits

Author SHA1 Message Date
Godwin
96d70d6317 Tests are passing 2014-09-14 16:05:18 -07:00
Godwin
839aa7bbb7 Merge branch 'master' of https://github.com/bikebike/BikeBike 2014-09-14 16:01:21 -07:00
Godwin
a31d3295ab Tests are passing 2014-09-14 16:00:41 -07:00
Dylan Peerenboom
a9c1f9a02a enable localhost:3000 in 18n set_locale(host) 2014-09-12 09:51:21 -07:00
Dylan Peerenboom
8bbd369f7a Merge pull request #11 from zflat/setup-on-ubuntu
Setup on ubuntu
2014-09-06 18:00:43 -07:00
Dylan Peerenboom
5b1434feee remove extra database.yml.example 2014-09-05 15:48:10 -07:00
Dylan Peerenboom
02e29e953a cleaner database.yml 2014-09-05 15:46:13 -07:00
Dylan Peerenboom
8a7aa23511 include example file 2014-09-05 15:42:11 -07:00
Dylan Peerenboom
bd96072235 removed database.yml due to sensitive data 2014-09-05 15:40:03 -07:00
William Wedler
976a679d7d translation-info.yml after running cucumber features with a database containing translations loaded via the translations:migrate rake task run on RAILS_ENV=test 2014-09-04 19:38:49 -04:00
William Wedler
ca9603cc1e restore translation-info.yml 2014-09-04 19:34:11 -04:00
William Wedler
a8569c25ce translation-info.yml after running cucumber features with a database containing translations loaded via the translations:migrate rake task 2014-09-04 19:30:02 -04:00
William Wedler
33a1b3a8f5 restore translation-info.yml 2014-09-04 19:27:03 -04:00
William Wedler
5828c55152 translation-info.yml after running cucumber features with a new database (no tranlsations migrated) 2014-09-04 19:25:29 -04:00
William Wedler
fc557e75fc restore translation-info.yml file 2014-09-04 19:03:31 -04:00
William Wedler
39926b7e81 put tranlation-info.yml back, undoing 3aa6d0b 2014-09-04 18:58:29 -04:00
William Wedler
3aa6d0b925 moved translation-info.yml to temporary directory since it is only used in development and test to show translations 2014-09-03 19:41:44 -04:00
Dylan Peerenboom
e8e55fe6d1 added database.yml to .gitignore, created database.yml.example, set db path to withink BikeBike 2014-09-01 14:35:09 -07:00
Godwin
fe107076af Registrations page 2014-07-27 23:14:54 -06:00
Godwin
9c36cd5576 Volunteer questions removed and primary merged with participant questions 2014-07-27 21:58:28 -06:00
Godwin
c960cb7458 Workshop test. 2014-07-27 12:46:48 -06:00
Godwin
16d1f9fdf9 Tested, translations are now in 2014-07-24 22:43:26 -06:00
Godwin
534b9303e9 Paypal is now working 2014-07-24 21:12:39 -06:00
Godwin
015602d720 Attempting to fix font-awesome 2014-07-24 01:35:37 -06:00
Godwin
1c09a9f46e New translations 2014-07-24 01:21:29 -06:00
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
56778ae63c CDN fix 2014-07-12 21:53:32 -06:00
Godwin
cd00ef679e Sidebar content 2014-07-12 20:19:48 -06:00
Godwin
e1bbbe1a6b asset_host 2014-07-12 16:46:39 -06:00
Godwin
051a564db0 asset_host 2014-07-12 16:29:29 -06:00
Godwin
1e7dbec86b Error with CDN 2014-07-12 15:42:05 -06:00
Godwin
466e7fccc5 Created a CDN 2014-07-12 15:29:19 -06:00
Godwin
8088159c48 Layout changes 2014-07-11 23:15:12 -06:00
Godwin
0d1cc032aa Maybe this then? 2014-07-11 21:50:13 -06:00
Godwin
d1af3d46c4 Broke it 2014-07-11 21:38:01 -06:00
Godwin
6fb392fa37 Fix for invalid slugs, force trailing slash 2014-07-11 21:15:23 -06:00
Godwin
db621f244b SSL test 2014-07-11 19:48:44 -06:00
Godwin
dd3caa1161 A small fix 2014-07-06 20:02:15 -06:00
Godwin
18b0cd72be A small fix 2014-07-06 19:37:57 -06:00
Godwin
d171b90c2f A small fix 2014-07-06 19:34:27 -06:00
Godwin
2b8d2638b7 A small fix 2014-07-06 19:30:56 -06:00
Godwin
1c64a02ffc A small fix 2014-07-06 19:27:38 -06:00
Godwin
1794adaf98 A small fix 2014-07-06 19:25:31 -06:00