Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[QA ded05] 3902 organization user signup #4138

Merged
merged 141 commits into from
Jul 1, 2015
Merged

[QA ded05] 3902 organization user signup #4138

merged 141 commits into from
Jul 1, 2015

Commits on Jun 19, 2015

  1. Recovering deleted template fixes #4047

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    3872bd9 View commit details
    Browse the repository at this point in the history

  2. Fix require_dependency paths

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    44f3897 View commit details
    Browse the repository at this point in the history

  3. Basic organization user signup

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    e6423c8 View commit details
    Browse the repository at this point in the history

  4. Basic Google Plus signup for organizations

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    af74610 View commit details
    Browse the repository at this point in the history

  5. User creation async job with state machine

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    7a16605 View commit details
    Browse the repository at this point in the history

  6. User creation polling endpoint

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    73a9df8 View commit details
    Browse the repository at this point in the history

  7. Organization signup parameters

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    ed03c04 View commit details
    Browse the repository at this point in the history

  8. signup_page_enabled behaviour

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    d1aa324 View commit details
    Browse the repository at this point in the history

  9. Organization mail whitelisting

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    bfbd04c View commit details
    Browse the repository at this point in the history

  10. Signup controller renaming and default quota for organizations closes #… 

    …4036
    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    5e36aa8 View commit details
    Browse the repository at this point in the history

  11. enable_account_token assignment on creation

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    32f04d4 View commit details
    Browse the repository at this point in the history

  12. Account token enabling

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    15e6400 View commit details
    Browse the repository at this point in the history

  13. Mail validation job

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    7ff50d2 View commit details
    Browse the repository at this point in the history

  14. Mail validation mail

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    7b1616e View commit details
    Browse the repository at this point in the history

  15. Migration unification

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    6569183 View commit details
    Browse the repository at this point in the history

  16. organization_signup instead of signup path so rules don't conflict

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    ef0544d View commit details
    Browse the repository at this point in the history

  17. Enabling SSL for new endpoints

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    d3f8217 View commit details
    Browse the repository at this point in the history

  18. Activation link moved to new organization user mail

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    3fe447f View commit details
    Browse the repository at this point in the history

  19. Fixed enable account link at mail

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    b978da1 View commit details
    Browse the repository at this point in the history

  20. Activate instead of enable

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    d196ff2 View commit details
    Browse the repository at this point in the history

  21. User accounts with enable_account_token not empty are not enabled

    @juanignaciosl
    juanignaciosl committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    46b334e View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2015

  1. enable_remote_db_user stub

    @juanignaciosl
    juanignaciosl committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    0e6ce8b View commit details
    Browse the repository at this point in the history

  2. Account not validated error on login and resend email support

    @juanignaciosl
    juanignaciosl committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    72918f5 View commit details
    Browse the repository at this point in the history

  3. Changing frontend assets version

    @xavijam
    xavijam committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    c43bfbf View commit details
    Browse the repository at this point in the history

  4. Organization signup without Central

    @juanignaciosl
    juanignaciosl committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    0697bc4 View commit details
    Browse the repository at this point in the history

  5. Stubs create_in_central

    @juanignaciosl
    juanignaciosl committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    295fd34 View commit details
    Browse the repository at this point in the history

  6. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @juanignaciosl
    juanignaciosl committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    2989f8d View commit details
    Browse the repository at this point in the history

  7. More central stubbing

    @juanignaciosl
    juanignaciosl committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    dd3a94e View commit details
    Browse the repository at this point in the history

  8. Fixing google field keys - #4143

    @xavijam
    xavijam committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    20187a9 View commit details
    Browse the repository at this point in the history

  9. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @xavijam
    xavijam committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    7340ec9 View commit details
    Browse the repository at this point in the history

  10. subdomain_from_request instead of extract_subdomain fixes #4074

    @juanignaciosl
    juanignaciosl committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    042c3c0 View commit details
    Browse the repository at this point in the history

  11. Fix Google Plus dependency loading

    @juanignaciosl
    juanignaciosl committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    b4ce6a8 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into 3902-Organization_user_signup 

    Conflicts:
	package.json
    @juanignaciosl
    juanignaciosl committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    1313545 View commit details
    Browse the repository at this point in the history

  13. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @juanignaciosl
    juanignaciosl committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    3732536 View commit details
    Browse the repository at this point in the history

  14. New organization signup styled

    @xavijam
    xavijam committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    a26bf92 View commit details
    Browse the repository at this point in the history

  15. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @xavijam
    xavijam committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    cd59402 View commit details
    Browse the repository at this point in the history

  16. signup_confirmation_development util

    @juanignaciosl
    juanignaciosl committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    e414916 View commit details
    Browse the repository at this point in the history

  17. Fixed problem with font in login and signup pages

    @xavijam
    xavijam committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    5af8d45 View commit details
    Browse the repository at this point in the history

  18. Default host using organization helpers

    @juanignaciosl
    juanignaciosl committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    1395a59 View commit details
    Browse the repository at this point in the history

  19. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @juanignaciosl
    juanignaciosl committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    49cd332 View commit details
    Browse the repository at this point in the history

  20. Change signup entry JS file

    @xavijam
    xavijam committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    902d259 View commit details
    Browse the repository at this point in the history

  21. Applied layout for waiting or static steps after signup in an organiz… 

    …ation
    @xavijam
    xavijam committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    bcb7170 View commit details
    Browse the repository at this point in the history

  22. Signup JS animations back to life

    @xavijam
    xavijam committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    808ee39 View commit details
    Browse the repository at this point in the history

  23. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @xavijam
    xavijam committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    0203437 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2015

  1. host! moved to the test that needs it

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    e9d2610 View commit details
    Browse the repository at this point in the history

  2. Allow token accounts to work without organization

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    cb570f3 View commit details
    Browse the repository at this point in the history

  3. Warden authentication through account enable token

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    260d887 View commit details
    Browse the repository at this point in the history

  4. Improved spec checking and central stubbing

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    9d2c30d View commit details
    Browse the repository at this point in the history

  5. Fixed sessions description link

    @xavijam
    xavijam committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    d8e68d5 View commit details
    Browse the repository at this point in the history

  6. Changed placeholder texts and styles for sessions inputs

    @xavijam
    xavijam committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    c1a6c3f View commit details
    Browse the repository at this point in the history

  7. Fixed problem with margins in sessions pages

    @xavijam
    xavijam committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    afffd2c View commit details
    Browse the repository at this point in the history

  8. Delete partially created user if anything fails during the process

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    a7b48ff View commit details
    Browse the repository at this point in the history

  9. More user creation failure checking

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    8b69af4 View commit details
    Browse the repository at this point in the history

  10. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    5b04373 View commit details
    Browse the repository at this point in the history

  11. Error state is 'failure', not error

    @xavijam
    xavijam committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    1854977 View commit details
    Browse the repository at this point in the history

  12. signup_page_enabled column replaced by a method based in whitelisted … 

    …domains
    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    6514b3d View commit details
    Browse the repository at this point in the history

  13. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    5f4d26e View commit details
    Browse the repository at this point in the history

  14. Fix account activation mail link

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    5b1bcc8 View commit details
    Browse the repository at this point in the history

  15. Changed validation mail warning text

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    583b04e View commit details
    Browse the repository at this point in the history

  16. Symbol instead of string to check warden staging behaviour

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    284be5e View commit details
    Browse the repository at this point in the history

  17. Adding whitelisting and default new user quota to organization settin… 

    …gs form
    @xavijam
    xavijam committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    cc996dc View commit details
    Browse the repository at this point in the history

  18. Fixing sessions input placeholder color

    @xavijam
    xavijam committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    f2366d4 View commit details
    Browse the repository at this point in the history

  19. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @xavijam
    xavijam committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    4094b5b View commit details
    Browse the repository at this point in the history

  20. custom_failure for warden not to override my custom failure action

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    d29af2c View commit details
    Browse the repository at this point in the history

  21. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    64d0e06 View commit details
    Browse the repository at this point in the history

  22. Added debug trace for staging testing

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    cb0c17c View commit details
    Browse the repository at this point in the history

  23. failure instead of error

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    49fd858 View commit details
    Browse the repository at this point in the history

  24. Removed debug trace

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    7454807 View commit details
    Browse the repository at this point in the history

  25. null check

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    1fa37db View commit details
    Browse the repository at this point in the history

  26. Changed warden failure_app for throw to work in staging

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    a680a94 View commit details
    Browse the repository at this point in the history

  27. Changed back warden failure_app for throw to work in staging

    @juanignaciosl
    juanignaciosl committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    fc0a259 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2015

  1. Workaround attempt for warden throw

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    aa84316 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 3902-Organization_user_signup 

    Conflicts:
	package.json
    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    d6b0e0a View commit details
    Browse the repository at this point in the history

  3. Staging test for warden throw

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    9c9c492 View commit details
    Browse the repository at this point in the history

  4. Warden throw actually checks controller method

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    66ceaba View commit details
    Browse the repository at this point in the history

  5. account_token_authentication_error fallback endpoint

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    fa7db82 View commit details
    Browse the repository at this point in the history

  6. Removed debug info

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    bf1dc61 View commit details
    Browse the repository at this point in the history

  7. Removed development and debug code

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    957ec17 View commit details
    Browse the repository at this point in the history

  8. 1k = 1024

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    9482163 View commit details
    Browse the repository at this point in the history

  9. default_quota_in_bytes validation

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    fe1d5c7 View commit details
    Browse the repository at this point in the history

  10. Added error state when default_quota_in_bytes is not valid

    @xavijam
    xavijam committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    4e05f65 View commit details
    Browse the repository at this point in the history

  11. Removed flash message on organization validation error

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    3df55d3 View commit details
    Browse the repository at this point in the history

  12. 1k = 1024

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    632bf71 View commit details
    Browse the repository at this point in the history

  13. Fix allowing empty default_quota_in_bytes

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    6ee48bf View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' of github.com:CartoDB/cartodb into 3902-Organiz… 

    …ation_user_signup

Conflicts:
	config/routes.rb
	package.json
    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    7750c0b View commit details
    Browse the repository at this point in the history

  15. Updated NEWS.md

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    b0117b5 View commit details
    Browse the repository at this point in the history

  16. not null, default value for whitelisted_email_domains

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    8c3c5b6 View commit details
    Browse the repository at this point in the history

  17. Blocks all access if user has not validated his account. Fixes CartoD… 

    …B/cartodb-central#678
    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    4 Configuration menu
    Copy the full SHA
    c72e4c2 View commit details
    Browse the repository at this point in the history

  18. Organization whitelist can't be nil now

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    e583db9 View commit details
    Browse the repository at this point in the history

  19. Whitelisting should only be checked for new users

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    3b3bd16 View commit details
    Browse the repository at this point in the history

  20. Removed frameborder from google button

    @xavijam
    xavijam committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    ab814dd View commit details
    Browse the repository at this point in the history

  21. Added reset style in singup base

    @xavijam
    xavijam committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    5111b92 View commit details
    Browse the repository at this point in the history

  22. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @xavijam
    xavijam committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    e23a02a View commit details
    Browse the repository at this point in the history

  23. Monkeypatching exec_query to try avoiding prepared statements usage

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    956f564 View commit details
    Browse the repository at this point in the history

  24. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    f539cc3 View commit details
    Browse the repository at this point in the history

  25. Removed monkeypatch

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    dde3e08 View commit details
    Browse the repository at this point in the history

  26. Upgraded Rails to 3.2.20 to enjoy prepared_statements disablement

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    af27492 View commit details
    Browse the repository at this point in the history

  27. Fixed gem versions and tests with them

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    c095c19 View commit details
    Browse the repository at this point in the history

  28. Stubbing enable_remote_db_user outside before :all

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    920a626 View commit details
    Browse the repository at this point in the history

  29. avoiding enable_remote_db_user with Cartodb.config[:signups] = nil in… 

    …stead of stubbing
    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    867c835 View commit details
    Browse the repository at this point in the history

  30. code inside before each

    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    2dcd081 View commit details
    Browse the repository at this point in the history

  31. rspec-rails should be in test and development 

    See: https://github.com/rspec/rspec-rails#installation
    @juanignaciosl
    juanignaciosl committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    783b62b View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2015

  1. UUIDHelper spec isolation

    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    2b61476 View commit details
    Browse the repository at this point in the history

  2. Force RAILS_ENV test

    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    90d3e9d View commit details
    Browse the repository at this point in the history

  3. Spec helper requirement

    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    ae551da View commit details
    Browse the repository at this point in the history

  4. Fixed mail message for users that don't need password from their admins

    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    8f2b556 View commit details
    Browse the repository at this point in the history

  5. Upgraded mocha and configured rspec to use it only once through requi… 

    …rement
    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    30f994b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of github.com:CartoDB/cartodb into 3902-Organiz… 

    …ation_user_signup

Conflicts:
	app/assets/stylesheets/common/form-content.css.scss
    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    219cef0 View commit details
    Browse the repository at this point in the history

  7. Skip mocha check on test preparation

    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    d5368c3 View commit details
    Browse the repository at this point in the history

  8. MOCHA_OPTIONS=skip_integration disabling mocha integration checks

    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    2e14c71 View commit details
    Browse the repository at this point in the history

  9. Mocha version

    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    3d91ba5 View commit details
    Browse the repository at this point in the history

  10. Fixed failing tests with new gems

    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    847c5d8 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of github.com:CartoDB/cartodb into 3902-Organiz… 

    …ation_user_signup

Conflicts:
	package.json
    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    1d4fffd View commit details
    Browse the repository at this point in the history

  12. host! is deprecated, now you should use default_url_options[:host]

    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    831cb5f View commit details
    Browse the repository at this point in the history

  13. Empty acl support

    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    b37a8c9 View commit details
    Browse the repository at this point in the history

  14. Missing rspec configurations

    @juanignaciosl
    juanignaciosl committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    3351424 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2015

  1. Fully specified class path

    @juanignaciosl
    juanignaciosl committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    c1fab3f View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2015

  1. Notify last exception

    @juanignaciosl
    juanignaciosl committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    1a94922 View commit details
    Browse the repository at this point in the history

  2. Removed commented code

    @juanignaciosl
    juanignaciosl committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    61afe4f View commit details
    Browse the repository at this point in the history

  3. Fixing problem with upgrade_url in profile and account pages

    @xavijam
    xavijam committed Jun 29, 2015
    3 Configuration menu
    Copy the full SHA
    fef9158 View commit details
    Browse the repository at this point in the history

  4. Removed placeholder from 'add domains' field in organization settings

    @xavijam
    xavijam committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    b39d40d View commit details
    Browse the repository at this point in the history

  5. cartodb_hosted logic moved inside upgrade_url

    @juanignaciosl
    juanignaciosl committed Jun 29, 2015
    2 Configuration menu
    Copy the full SHA
    7f7ecf0 View commit details
    Browse the repository at this point in the history

  6. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @juanignaciosl
    juanignaciosl committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    f01645b View commit details
    Browse the repository at this point in the history

  7. Removed debugger

    @juanignaciosl
    juanignaciosl committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    bb604f7 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into 3902-Organization_user_signup

    @juanignaciosl
    juanignaciosl committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    f9c8523 View commit details
    Browse the repository at this point in the history

  9. Changed text when user updates his/her settings

    @xavijam
    xavijam committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    1ca7c58 View commit details
    Browse the repository at this point in the history

  10. Removed useless text in organization user creation

    @xavijam
    xavijam committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    a9062d8 View commit details
    Browse the repository at this point in the history

  11. Added negative color to signup text + fixed margins in form-footer - f… 

    …ixes #4228
    @xavijam
    xavijam committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    42ffa43 View commit details
    Browse the repository at this point in the history

  12. Fixed user deletion dialog text

    @xavijam
    xavijam committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    a1caaf5 View commit details
    Browse the repository at this point in the history

  13. Changed signup description text

    @xavijam
    xavijam committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    90f2863 View commit details
    Browse the repository at this point in the history

  14. Changed 'manage your seats' text in organization subheader

    @xavijam
    xavijam committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    0e7ab40 View commit details
    Browse the repository at this point in the history

  15. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @xavijam
    xavijam committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    2ff7fd8 View commit details
    Browse the repository at this point in the history

  16. odyssey changes rollback

    @juanignaciosl
    juanignaciosl committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    24e0f61 View commit details
    Browse the repository at this point in the history

  17. Merge branch '3902-Organization_user_signup' of github.com:CartoDB/ca… 

    …rtodb into 3902-Organization_user_signup
    @xavijam
    xavijam committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    17b8fd8 View commit details
    Browse the repository at this point in the history

  18. Adding notification when signup proccess fails or finishes

    @xavijam
    xavijam committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    14c9b7a View commit details
    Browse the repository at this point in the history

  19. Added 'not part of...' text in login/signup pages - closes #4224

    @xavijam
    xavijam committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    7da3f15 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2015

  1. Merge branch 'master' of github.com:CartoDB/cartodb into 3902-Organiz… 

    …ation_user_signup
    @juanignaciosl
    juanignaciosl committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    8d8635a View commit details
    Browse the repository at this point in the history

  2. Patch deep_munge to avoid empty arrays parameters to be changed to null

    @juanignaciosl
    juanignaciosl committed Jun 30, 2015
    2 Configuration menu
    Copy the full SHA
    41d0f9f View commit details
    Browse the repository at this point in the history

  3. Since Rails 3.2.8 ERB::Util.html_escape now escapes single quotes

    @juanignaciosl
    juanignaciosl committed Jun 30, 2015
    2 Configuration menu
    Copy the full SHA
    3862b40 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 3902-Organization_user_signup 

    Conflicts:
	package.json
    @juanignaciosl
    juanignaciosl committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    8de123a View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2015

  1. Merge branch 'master' into 3902-Organization_user_signup 

    Conflicts:
	package.json
    @juanignaciosl
    juanignaciosl committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    36eb5b4 View commit details
    Browse the repository at this point in the history