Commit Graph

Select branches

Hide Pull Requests

G0dwin-copy-edits

development

master

Mono Color

• 18b0cd72be A small fix Godwin 2014-07-06 19:37:57 -06:00
• d171b90c2f A small fix Godwin 2014-07-06 19:34:27 -06:00
• 2b8d2638b7 A small fix Godwin 2014-07-06 19:30:56 -06:00
• 1c64a02ffc A small fix Godwin 2014-07-06 19:27:38 -06:00
• 1794adaf98 A small fix Godwin 2014-07-06 19:25:31 -06:00
• de1ece59a0 A small fix Godwin 2014-07-06 19:21:26 -06:00
• ca301f9876 A small fix Godwin 2014-07-06 19:19:16 -06:00
• d5de21429e Regenerate images rake task (fix) Godwin 2014-07-06 19:12:44 -06:00
• e204ef039f Regenerate images rake task Godwin 2014-07-06 19:09:52 -06:00
• 1907122880 A lot of updates so far today... Godwin 2014-07-06 19:02:23 -06:00
• 546f1d4cbd Fixes for orgs-json Godwin 2014-07-05 17:17:47 -06:00
• 73b0893b71 Testing... Godwin 2014-07-05 14:49:50 -06:00
• 2b319fe94b Asset pipeline change Godwin 2014-07-05 14:45:55 -06:00
• 853aa63df0 Another test Godwin 2014-07-05 14:32:21 -06:00
• 7663917dfe a TEST Godwin 2014-07-05 14:22:07 -06:00
• 200f3ad723 Conference select issue Godwin 2014-07-05 14:15:25 -06:00
• c40a7b65ba Gemfile change Godwin 2014-07-05 11:13:41 -06:00
• f66f456cc4 New look Godwin 2014-07-05 10:27:49 -06:00
• a04a72d776 Add the default cucumber bootstrap files momoko saunders 2014-06-11 19:47:29 -07:00
• 4c7a1f84bd Add cucumber to the Gemfile momoko saunders 2014-06-11 19:39:35 -07:00
• d2290af3db Add platforms to the Gemfile momoko saunders 2014-06-11 19:38:00 -07:00
• 930aa130d6 Preparing for deployment to new server Godwin 2014-06-02 18:45:26 -06:00
• 8bcc1852b5 Migrations complete Godwin 2014-06-01 11:28:15 -06:00
• 87fbd50af1 Changed default port and added migration tasks Godwin 2014-05-26 18:01:28 -06:00
• 8caad2a009 Merging with wotk done in PDX Godwin 2014-05-22 19:10:30 -06:00
• f7809518aa Merging with wotk done in PDX Godwin 2014-05-22 19:08:41 -06:00
• 4f448df63a Tests fixed G0dwin 2014-05-17 19:00:39 -06:00
• f6b39ea93f User login error fixed G0dwin 2014-05-17 18:25:43 -06:00
• 20c9791f52 User login error fixed G0dwin 2014-05-17 18:20:13 -06:00
• 3d9650f531 Fix gemfile for openshift Graham Kaplan 2014-05-17 16:31:10 -07:00
• a2f2f630a4 Add OpenShift hooks Graham Kaplan 2014-05-17 13:34:42 -07:00
• e5bf3f5a5c Fixed a problem preventing login G0dwin 2014-05-17 12:54:39 -06:00
• ffa8239e42 Moved form helpers from application_helper to a real FormHelper Godwin 2014-05-12 20:09:19 -06:00
• 9ae7135c6a Trying to fix travis errors Godwin 2014-05-04 21:21:55 -06:00
• b004b7b7d0 Custom password hashing for migrating data Godwin 2014-05-04 21:13:05 -06:00
• 9516ce11ab Custom password hashing for migrating data Godwin 2014-05-04 21:02:49 -06:00
• 7a768068ec Custom password hashing for migrating data Godwin 2014-05-04 21:01:27 -06:00
• 1aee8c09da Translation migrations Godwin 2014-05-04 15:39:08 -06:00
• f5c7cca626 Translations Godwin 2014-05-04 15:33:59 -06:00
• 91708ef81b Translations Godwin 2014-05-04 15:31:36 -06:00
• ad2a897ef7 Translations Godwin 2014-05-04 15:29:50 -06:00
• e5f9dc5666 Translations Godwin 2014-05-04 15:22:22 -06:00
• 52e5e10232 Translations Godwin 2014-05-04 14:56:18 -06:00
• cc948937bc Some updates to translation engine, added dotenv but have not yet set it up. Godwin 2014-04-29 21:02:02 -06:00
• 3759910993 Forgot to fix conflicts, oops Graham Kaplan 2014-04-05 19:33:22 -07:00
• abaf5b55a4 Merge branch 'master' of https://github.com/bikebike/BikeBike Graham Kaplan 2014-04-05 19:27:05 -07:00
• 230295790b Add Facebook login with Sorcery Graham Kaplan 2014-04-05 19:18:57 -07:00
• a6da30dc08 Needed to comment this out to get app working Graham Kaplan 2014-04-05 19:17:19 -07:00
• c9a09de740 Add flash message display Graham Kaplan 2014-04-05 19:16:15 -07:00
• ab42618bbd Add rails-footnotes to make development debugging easier Graham Kaplan 2014-04-05 19:15:37 -07:00
• b0c0e029fd Testing tests 8 Godwin 2014-03-23 16:23:29 -06:00
• 973a2ba4d2 Testing tests 7 Godwin 2014-03-23 14:51:10 -06:00
• 53d26c62a8 Testing tests 7 Godwin 2014-03-23 14:41:29 -06:00
• f409825838 Testing tests 6 Godwin 2014-03-23 14:37:03 -06:00
• 4084669d0c Testing tests 6 Godwin 2014-03-23 14:28:53 -06:00
• 58e948f946 Testing tests 5 Godwin 2014-03-23 14:21:23 -06:00
• 5edc596f33 Testing tests 4 Godwin 2014-03-23 14:14:52 -06:00
• fb19bb1220 Testing tests 3 Godwin 2014-03-23 14:09:19 -06:00
• 078b65813e Testing tests 3 Godwin 2014-03-23 13:49:06 -06:00
• f5ec601fac Testing tests 2 Godwin 2014-03-23 13:40:09 -06:00
• fda5646974 Testing tests Godwin 2014-03-23 13:31:08 -06:00
• 55d47180e0 Fixed some issues with registration Godwin 2014-03-15 20:43:16 -06:00
• 243c47a6e7 Messed up event migration Godwin 2014-03-15 13:46:24 -06:00
• 8e26bb1797 Workshop and event scaffolds Godwin 2014-03-15 13:40:38 -06:00
• 3d6ad3b432 Registration form more-or-less working, workshop scaffold is up Godwin 2014-03-13 21:20:17 -06:00
• 4b79de7a24 Registration form working Godwin 2014-03-09 21:18:31 -06:00
• 5e9e3d5fec Added to the readme Godwin 2014-03-09 19:05:49 -06:00
• a70d15ee3c Added to the readme Godwin 2014-03-09 19:03:27 -06:00
• 38ed0c7c53 The working basics Godwin 2014-03-09 16:05:46 -06:00
• 76bf7164e8 The working basics Godwin 2014-03-09 15:50:56 -06:00
• 1a5af29d14 The working basics Godwin 2014-03-09 15:47:42 -06:00
• 91b427ba58 The working basics Godwin 2014-03-09 15:37:11 -06:00
• 96bc841e7b The working basics Godwin 2014-03-09 15:06:26 -06:00
• bbec690e2f The working basics Godwin 2014-03-09 14:56:24 -06:00
• db60933506 The working basics Godwin 2014-03-09 14:43:33 -06:00
• b490a97852 Attempt #6 Godwin 2013-10-28 23:30:42 -06:00
• 7a7fbc62c6 Attempt #5 Godwin 2013-10-28 23:27:42 -06:00
• 0cc81bf38d Attempt #5 Godwin 2013-10-28 23:27:02 -06:00
• 212d8e1294 Attempt #4 Godwin 2013-10-28 23:23:57 -06:00
• 86d92b7559 Turning off config.assets.initialize_on_precompile Godwin 2013-10-28 23:22:19 -06:00
• 40f3f7fd0c Attempt #2 Godwin 2013-10-28 23:17:45 -06:00
• 7a556ee126 Attempting to fix heroku not serving static assets Godwin 2013-10-28 23:15:59 -06:00
• 693dcc31aa Looking a little more like a real site Godwin 2013-10-27 19:07:56 -06:00
• 5681ff1dc5 Foundation is now functional Godwin 2013-10-26 19:08:31 -06:00
• 25664fe55d Removed Bootstrap and converted to scss Godwin 2013-10-26 18:40:06 -06:00
• 8df05b288f added thin Godwin 2013-10-20 20:54:52 -06:00
• 7aee52c54b Added compass Godwin 2013-10-20 20:43:11 -06:00
• 99965c0819 Readded the ruby racer Godwin 2013-10-20 20:41:05 -06:00
• 3f0ed58b70 ??? Godwin 2013-10-20 20:37:29 -06:00
• 6904c1c4ec Not sure whats going on Godwin 2013-10-20 20:36:18 -06:00
• cba67378e2 Not sure whats going on Godwin 2013-10-20 20:35:19 -06:00
• c2406e2dca removed servers Godwin 2013-10-20 20:31:27 -06:00
• 97aa0f6f72 Merge branch 'hotfix/1.2.2' Geremia Taglialatela 2013-09-28 13:07:27 +02:00
• dce8146744 Updated gems Geremia Taglialatela 2013-09-28 13:07:20 +02:00
• be7e19c28c Merge branch 'hotfix/1.2.1' Geremia Taglialatela 2013-08-23 14:35:33 +02:00
• e562fbbd09 Updated gems Geremia Taglialatela 2013-08-23 14:35:26 +02:00
• 588eddef69 Merge branch 'release/1.2.0' Cesidio Di Landa 2013-08-05 16:51:38 +02:00
• d565e97349 * Removed nokogiri * Updated gems Cesidio Di Landa 2013-08-05 16:51:27 +02:00
• 89206c1631 Merge branch 'hotfix/1.1.2' into develop Cesidio Di Landa 2013-07-26 11:39:08 +02:00
• 9956194d4c Merge branch 'hotfix/1.1.2' Cesidio Di Landa 2013-07-26 11:39:04 +02:00