Commit Graph

32983 Commits (3.12.3-dani)
 

Author SHA1 Message Date
Dani Carrion 9f604d5c4e remove byebug from Gemfile.lock too
8 years ago
Dani Carrion 50fb73f788 remove byebug as a dependency (we could find the exact version that
8 years ago
javi santana 0c4ca42fac Merge pull request #6562 from CartoDB/avatar_fix
9 years ago
javi 4426c73f08 fixes avatar urls, now they can point to an absolute url or a local url.
9 years ago
Guido Fioravantti 5a456a2783 Merge pull request #6554 from CartoDB/fix-google-services-rake
9 years ago
Guido Fioravantti 06d48f71fb Fixes message typo for org raise
9 years ago
Guido Fioravantti 690188c0c0 Removes unecessary args from block
9 years ago
Guido Fioravantti 0d8c05d3da Fixes google services rake for delete for all
9 years ago
Juan Ignacio Sánchez Lara 1c16bb8562 Merge pull request #6549 from CartoDB/cp1605-omnibus_avatar_uploading_doesnt_work
9 years ago
Juan Ignacio Sánchez Lara 22c9d20df1 Merge pull request #6547 from CartoDB/custom_com_hosted_cartodb_com_hosted
9 years ago
Juan Ignacio Sánchez Lara 560f22882e Remove http from avatar url fixes CartoDB/cartodb-platform#1605
9 years ago
Juan Ignacio Sánchez Lara 603f3295d2 Asset mode for local uploads fixes #1605
9 years ago
Juan Ignacio Sánchez Lara b7de50694d upgradeUrl should be false, no an string containing '', if upgrading is not appropiate
9 years ago
Nicklas Gummesson e8b2f2aa42 Update .travis.yml
9 years ago
Juan Ignacio Sánchez Lara e0fbac3450 3.23.32 package version
9 years ago
Juan Ignacio Sánchez Lara f91e7fe297 custom_com_hosted -> cartodb_com_hosted fixes #6536 and #6534
9 years ago
javi santana f166aef81d Merge pull request #6545 from CartoDB/6544-Login_URL_is_wrong_after_closing_session
9 years ago
Juan Ignacio Sánchez Lara cf3c0664a6 login_url canonical url fixes #6544
9 years ago
javi santana b5de5e6535 Merge pull request #6543 from CartoDB/fix_api_keys
9 years ago
javi 0804a6b38c reverted
9 years ago
javi 1624871a41 revert style
9 years ago
javi 6d4d5e7248 style fix
9 years ago
javi 311dcf5d6a using base_url
9 years ago
javi 555f039c3b fixes api key when using subdomainless urls
9 years ago
Juan Ignacio Sánchez Lara 1a4b68895d Merge pull request #6541 from CartoDB/remove_groups_feature_flag
9 years ago
javi santana 4c8df62d73 Merge pull request #6540 from CartoDB/3.12.X_fix-missing-icons
9 years ago
xavijam 3d435a6336 Using base_url for API regeneration POST url
9 years ago
Juan Ignacio Sánchez Lara 666da5902f Remove groups feature flag
9 years ago
javi ab2a226be1 reverted imports to the old ones
9 years ago
xavijam bf94fa6358 merged fix-missing-icons
9 years ago
xavijam 7e85449ada merged
9 years ago
xavijam 3fb4531a03 merged
9 years ago
xavijam 66ba25ca1d Fixed problem with select2 icon
9 years ago
xavijam 20f739841a Adding icon-font to sessions stylesheet
9 years ago
Juan Ignacio Sánchez Lara f51f77f538 Merge branch '3.12.X' of github.com:CartoDB/cartodb into 3.12.X
9 years ago
Juan Ignacio Sánchez Lara 144a61dcea db:setup_user doc
9 years ago
Santi Saez efdec22e0f [cartodb] split db:setup task, fixes #6523
9 years ago
Juan Ignacio Sánchez Lara 16b496fe15 487-rake-task-to-enable-google-services rake
9 years ago
Javier Arce f006e139e4 Merge pull request #6477 from CartoDB/6437-cartoassets
9 years ago
Javier Arce 486cec9d20 Fixes conflicts
9 years ago
María Checa 3eacdc80d9 Merge pull request #6451 from CartoDB/6404-org_user_quota_improvements
9 years ago
María Checa 0d7590516d Merge pull request #6462 from CartoDB/6450-org_users_list_maps_info
9 years ago
Juan Ignacio Sánchez Lara 3338bcc083 Merge pull request #6472 from CartoDB/6428-Vizjson_including_widgets
9 years ago
Juan Ignacio Sánchez Lara 6baecc831e Merge pull request #6482 from CartoDB/6481-Check_layerId_exists_in_visualization_when_new_widget_is_created
9 years ago
María Checa f4407626bf Slider css minor fix
9 years ago
Javier Arce 784f3961f0 Generates css for editor3
9 years ago
Javier Arce 48f50754e8 Fixes css import. Bump frontend
9 years ago
Javier Arce 273701a1b6 Fixes paths for icon-font
9 years ago
Javier Arce 526b1c0bd1 Adds cartoassets file
9 years ago
Juan Ignacio Sánchez Lara 09dd7e7e2f Hound
9 years ago