master

Commits

05e56437
add html validator link to footer, move chrome frame to partial
mo k
2012-06-03 07:24:18
84e548cd
add help links
mo k
2012-06-03 07:08:48
99ac3db7
replace wufoo with uservoice links.
mo k
2012-06-03 07:07:28
140e263e
add location to profiles#show and profiles#mine
mo k
2012-06-03 07:04:17
144cf82b
add file upload form to the show page to add another photo.
mo k
2012-06-03 06:59:50
ce39e873
fix bug where the interests were not getting saved.
mo k
2012-06-03 06:53:34
283d37f6
move nav bar to the right hand side.
mo k
2012-06-03 06:50:40
a6c25140
minor reformatting.
mo k
2012-06-03 06:42:37
331b7173
clean up the profiles show page.
mo k
2012-06-03 06:32:03
f9761ac1
tidy up nav on my profile page.
mo k
2012-06-03 06:29:16
70d7855c
tidy up navigation of the creations/#new page.
mo k
2012-06-03 06:22:59
7b60d15a
update navigation on the favorites page.
mo k
2012-06-03 06:20:56
b91dde66
move settings edit js to a separate file.
mo k
2012-06-03 06:18:34
6d8eed64
fix alignment of confirm password label.
mo k
2012-06-03 06:08:01
0734a80e
tidy up the profile picture section on the settings page.
mo k
2012-06-03 05:46:27
f31db6af
remove top nav from the settings page.
mo k
2012-06-03 05:35:24
29a5237d
adjust navigation on the settings page.
mo k
2012-06-03 05:33:51
b3e93864
tidy up the forgot password page.
mo k
2012-06-03 05:06:05
879c78f8
remove commented out stuff from custom.css
mo k
2012-06-03 01:00:32
f5c3f94c
fix error styles.
mo k
2012-06-03 00:59:54
5b8201a2
split out error messages to separate partial and style devise errors using bootstrap.
mo k
2012-06-03 00:34:45
522c8044
trying to tidy up the devise error messages.
mo k
2012-06-02 15:16:04
8a40ffb5
tidy up some of the page headers and create route alias for login, logout
mo k
2012-06-02 13:35:53
8db18c1a
add rake task to deploy rake deploy:production and rake deploy:staging. PLEASE USE THESE TASKS not cap staging deploy
mo k
2012-06-02 12:56:53
3ce7caac
install capistrano-gitflow gem.
mo k
2012-06-02 12:29:18
d8cc5f8a
start to build rake task to deploy to staging and create appropriate branch/tag.
mo k
2012-06-02 12:26:10
bc0417a7
Merge branch 'master' of bitbucket.org:mocheen/cakeside
mo k
2012-06-02 11:33:24
b890262b
extra background color removed
luu stiles
2012-06-01 13:27:46
8d57d683
added bootstrap file for development purposes and removed some not needed CSS's
luu stiles
2012-06-01 05:35:35
057bc021
update gravatar urls
mo k
2012-06-01 02:35:29
2b56148d
clean up document layouts for creations edit and form
mo k
2012-05-31 14:04:13
30423cfd
use page-header class on category#show
mo k
2012-05-31 13:57:58
45312025
fix profile show page.
mo k
2012-05-31 13:55:52
7815f6bb
split out 9 column and 12 column partials and update references.
mo k
2012-05-31 13:53:56
5c0446fb
Merge branch 'master' of bitbucket.org:mocheen/cakeside
mo k
2012-05-31 13:19:03
06a59c64
update the autocomplete styles to look like the twitter typeahead css.
mo k
2012-05-31 13:18:52
5c788c47
updated interest label and sentence describing it to the user
luu stiles
2012-05-31 12:57:36
610caeff
added interests model to be editable in activeadmin
luu stiles
2012-05-31 12:43:33
cfb0c083
Merge branch 'master' of bitbucket.org:mocheen/cakeside
mo k
2012-05-31 12:39:32
af7c8de7
add lat and long migrations and add to model.
mo k
2012-05-31 12:39:12
d8a98115
add lat and long to settings page.
mo k
2012-05-31 12:33:02
f3d09384
removed scaffolds styles
luu stiles
2012-05-31 12:29:49
c3ed9f03
moving scaffolding styles and going to use bootstrap to do it
luu stiles
2012-05-31 12:25:30
a0483c05
connect autocomplete js to new city field on User model.
mo k
2012-05-29 13:12:04
2ba36995
add city to users table
mo k
2012-05-29 13:04:12
144b2c10
ignore .sass-cache
mo k
2012-05-29 13:00:47
221f2012
fixed the link to settings ooops
luu stiles
2012-05-29 06:00:03
6da59a93
added profile fields to show in mine view
luu stiles
2012-05-29 05:45:52
8f320d1a
spike out city selection using autocomplete and geonames
mo k
2012-05-29 04:09:24
508ca3d3
remove local bootstrap files, and use bootstrap-sass gem.
mo k
2012-05-28 04:24:28
aa0516ab
move third party css and js to vendor folder.
mo k
2012-05-28 04:02:09
4a27553c
rip apart application layout into separate partials.
mo k
2012-05-28 03:40:08
ec7ca409
Merge branch 'master' of bitbucket.org:mocheen/cakeside
mo k
2012-05-26 15:00:02
826db1f9
drop users_interests table in drop portion of migration script.
mo k
2012-05-26 14:08:58
a23612cf
run rake db:seed when deploying to staging or production
mo k
2012-05-26 14:08:42
699aef33
tidy up ui for the new interests checkbox.
mo k
2012-05-26 14:05:53
2389fbea
add interests to the settings page and add to seeds.rb
mo k
2012-05-26 14:01:46
7a06d64f
add interests database migrations and model.
mo k
2012-05-26 13:50:22
fad62a78
add rake task to copy the keys to the correct location.
mo k
2012-05-26 13:33:08
6f1d72fc
update staging server ip.
mo k
2012-05-26 13:29:52
1fb87983
try to write a single test for the registrations controller, but i keep getting a silly undefined 'name' method error on nilclass:nil
mo k
2012-05-26 13:19:38
430094a2
added fb logo and show it on profile
luu stiles
2012-05-26 05:32:25
64fa3648
Merge branch 'master' of bitbucket.org:mocheen/cakeside
mo k
2012-05-26 01:36:03
cf4f7ff7
start building specs for registration controller.
mo k
2012-05-26 01:35:51
3e0d407c
override to_param to get seo friendly urls to creations
mo k
2012-05-25 04:06:19
26d503ea
got the code working to change with or without a password, but the tests are broken and missing.
mo k
2012-05-24 13:44:03
5ba53ad2
Merge branch 'dev'
mo k
2012-05-24 13:06:26
92863546
Merge branch 'master' of bitbucket.org:mocheen/cakeside
mo k
2012-05-24 13:06:00
acce94c4
update vimrc and start to write tests for registrations controller.
mo k
2012-05-24 13:05:42
e27ab9dd
add production key.
mo k
2012-05-24 13:05:05
c202e42a
add new staging server key.
mo k
2012-05-24 13:02:03
b79f606a
updated error message styles so it doesn't wrap and show twitter handle for another cakeside user
luu stiles
2012-05-24 13:01:45
82d20357
update settings without password, right now it will never allow you update your password. that's next
mo k
2012-05-23 03:54:39
c3664d12
upgrade devise.en.yml https://github.com/plataformatec/devise/issues/1177
mo k
2012-05-23 03:27:38
eb80ff1b
remove empty pending specs.
mo k
2012-05-23 03:22:32
64e208af
Merge branch 'master' of bitbucket.org:mocheen/cakeside
mo k
2012-05-22 14:04:33
6ec9ed6f
got the tests passing.
mo k
2012-05-22 14:01:54
f6b46ba7
trying to figure out why the specs are failing after adding the website validation.
mo k
2012-05-22 13:57:54
7b14f5fb
added uservoice js partial and edit placeholder label on twitter
luu stiles
2012-05-22 13:32:35
c245b717
add specs to test the error message supplied when an invalid url is specified.
mo k
2012-05-22 13:20:02
f71649a4
add validation for website url on User model.
mo k
2012-05-22 13:13:23
3b923cea
Merge branch 'master' of bitbucket.org:mocheen/cakeside
mo k
2012-05-22 11:56:00
3dfaf4a9
added fields for twitter and facebooks; view, model, updated with fields and migration script created and run
luu stiles
2012-05-22 06:16:07
a40481e8
start to put together category controller specs.
mo k
2012-05-19 03:07:02
f931d3ab
remove growl gems
mo k
2012-05-18 00:40:00
3c674aa5
switch to html5 url input element.
mo k
2012-05-17 13:37:36
996d194c
validate the users entered website and add nifty placeholder to website textbox.
mo k
2012-05-17 13:32:29
d981d167
Merge branch 'master' of bitbucket.org:mocheen/cakeside
mo k
2012-05-17 13:15:52
0fa11a58
remove commented out code.
mo k
2012-05-17 13:15:32
4d8a4032
Merge branch 'master' of bitbucket.org:mocheen/cakeside
luu stiles
2012-05-17 13:13:05
f914c609
gemfile.lock and wording on home page
luu stiles
2012-05-17 13:13:00
fc8dece9
add link to personal website.
mo k
2012-05-17 13:02:03
69f17bc4
Merge branch 'master' of bitbucket.org:mocheen/cakeside
mo k
2012-05-17 12:58:57
a72eae9e
add website property to the User model and create migration.
mo k
2012-05-17 12:58:47
224be574
add website field to edit settings page.
mo k
2012-05-17 12:47:39
2534ead2
update gemfile.lock again.
mo k
2012-05-17 12:39:43
c21bf0a8
add deploy_rc, deploy_live tasks to rakefile.
mo k
2012-05-14 03:00:59
52243622
testing first commit to gitbucket.com
luu stiles
2012-05-13 14:14:46
4bbe8cae
update path to new bit bucket repo.
mo k
2012-05-13 14:13:02
4eab10bb
fix path production server.
mo k
2012-05-13 05:17:25