Godwin
6435e99deb
Final fixes for the day
11 years ago
Godwin
cb44f3d53b
A small fix
11 years ago
Godwin
f11b40320d
A small fix
11 years ago
Godwin
dd3caa1161
A small fix
11 years ago
Godwin
a3468274ff
A small fix
11 years ago
Godwin
18b0cd72be
A small fix
11 years ago
Godwin
d171b90c2f
A small fix
11 years ago
Godwin
2b8d2638b7
A small fix
11 years ago
Godwin
1c64a02ffc
A small fix
11 years ago
Godwin
1794adaf98
A small fix
11 years ago
Godwin
de1ece59a0
A small fix
11 years ago
Godwin
ca301f9876
A small fix
11 years ago
Godwin
d5de21429e
Regenerate images rake task (fix)
11 years ago
Godwin
e204ef039f
Regenerate images rake task
11 years ago
Godwin
1907122880
A lot of updates so far today...
11 years ago
Godwin
546f1d4cbd
Fixes for orgs-json
11 years ago
Godwin
73b0893b71
Testing...
11 years ago
Godwin
2b319fe94b
Asset pipeline change
11 years ago
Godwin
853aa63df0
Another test
11 years ago
Godwin
7663917dfe
a TEST
11 years ago
Godwin
200f3ad723
Conference select issue
11 years ago
Godwin
c40a7b65ba
Gemfile change
11 years ago
Godwin
f66f456cc4
New look
11 years ago
Godwin
930aa130d6
Preparing for deployment to new server
11 years ago
Godwin
8bcc1852b5
Migrations complete
11 years ago
Godwin
87fbd50af1
Changed default port and added migration tasks
11 years ago
Godwin
8caad2a009
Merging with wotk done in PDX
11 years ago
Godwin
f7809518aa
Merging with wotk done in PDX
11 years ago
G0dwin
4f448df63a
Tests fixed
11 years ago
G0dwin
f6b39ea93f
User login error fixed
11 years ago
G0dwin
20c9791f52
User login error fixed
11 years ago
Graham Kaplan
3d9650f531
Fix gemfile for openshift
11 years ago
Graham Kaplan
a2f2f630a4
Add OpenShift hooks
11 years ago
G0dwin
e5bf3f5a5c
Fixed a problem preventing login
11 years ago
Godwin
ffa8239e42
Moved form helpers from application_helper to a real FormHelper
11 years ago
Godwin
9ae7135c6a
Trying to fix travis errors
11 years ago
Godwin
b004b7b7d0
Custom password hashing for migrating data
11 years ago
Godwin
9516ce11ab
Custom password hashing for migrating data
11 years ago
Godwin
7a768068ec
Custom password hashing for migrating data
11 years ago
Godwin
1aee8c09da
Translation migrations
11 years ago
Godwin
f5c7cca626
Translations
11 years ago
Godwin
91708ef81b
Translations
11 years ago
Godwin
ad2a897ef7
Translations
11 years ago
Godwin
e5f9dc5666
Translations
11 years ago
Godwin
52e5e10232
Translations
11 years ago
Godwin
cc948937bc
Some updates to translation engine, added dotenv but have not yet set it up.
11 years ago
Graham Kaplan
3759910993
Forgot to fix conflicts, oops
11 years ago
Graham Kaplan
abaf5b55a4
Merge branch 'master' of https://github.com/bikebike/BikeBike
Conflicts:
Gemfile
Gemfile.lock
11 years ago
Graham Kaplan
230295790b
Add Facebook login with Sorcery
The facebook key and secret defined in the sorcery config file are for
testing only and need to be changed and not committed to source when
app is ready to go live
11 years ago
Graham Kaplan
a6da30dc08
Needed to comment this out to get app working
11 years ago