Commit Graph

63112 Commits (95f66b043a354cd7838b4cb04aa8a81ccadbd06b)
 

Author SHA1 Message Date
Javier Torres 95f66b043a
Merge pull request #13564 from CartoDB/13556ListCurrentApiKey
7 years ago
Javier Torres 27fe8f5eeb
Merge pull request #13577 from CartoDB/13542-user-migrator-logs
7 years ago
Javier Torres 2f78e02f01 Merge branch '13556ListCurrentApiKey' of ssh://github.com/CartoDB/cartodb into 13556ListCurrentApiKey
7 years ago
Javier Torres 8fb9a3867b Merge branch 'master' into 13556ListCurrentApiKey
7 years ago
Pablo Alonso Garcia 5a0e278aba Stale bot
7 years ago
Alberto Romeu 7e287a854c add proper tests
7 years ago
Alberto Romeu 348455cd8e rollback user_migration_import_spec to its previous commit
7 years ago
Alex Martín ed2bc51fad change for skip_filter
7 years ago
Alex Martín 50198b111c CR Comments
7 years ago
Carlos Matallín 77fcb5ce87 Bump version to 4.11.45
7 years ago
Carlos Matallín f2d1b04148 package.json
7 years ago
Carlos Matallín a2db625b22
Merge pull request #13343 from CartoDB/9002-choose-category-ramp
7 years ago
AleGoiko 61a5949a3f
Merge pull request #13563 from CartoDB/13435-sync-error-state
7 years ago
Carlos Matallín 008f5f587d Merge branch 'master' into 9002-choose-category-ramp
7 years ago
Alegoiko 9816ab308e Merge branch 'master' into 13435-sync-error-state
7 years ago
Rafa de la Torre 3b969d1d91
Merge pull request #13551 from CartoDB/1281-cannot-select-geometries
7 years ago
Rafa de la Torre 7bfb146d97 Merge remote-tracking branch 'origin/master' into 1281-cannot-select-geometries
7 years ago
Alex Martín 53f2602d5b Hound
7 years ago
Alex Martín 9c79143e3f Add tests
7 years ago
Alex Martín a7110682ff Ugly hack until we wermove api_key from User model. To be removed
7 years ago
Carlos Matallín 99f5a6e5e9 review changes
7 years ago
Carlos Matallín 88927ce6ce Merge branch 'master' into 9002-choose-category-ramp
7 years ago
Javier Torres 510ba69b83
Merge pull request #13580 from CartoDB/fix-zeus-tests-cleanup
7 years ago
Rafa de la Torre 13b8db66fc
Merge pull request #13553 from CartoDB/upgrade_sql_0.20.0_to_0.21.0
7 years ago
Alberto Romeu bf0f0584d7
Merge pull request #13561 from CartoDB/username_validation_13053
7 years ago
Javier Torres 4dfee54868 Clean all the things
7 years ago
Alberto Romeu dac94204b4 fix typo
7 years ago
Alberto Romeu 644c8dda0d fix tests
7 years ago
Alberto Romeu fd99c75485 force save model on rollback
7 years ago
Alberto Romeu eef646f51b update NEWS.md
7 years ago
Alberto Romeu 298aef25b2 avoid user migration record cascade deletion
7 years ago
Alberto Romeu b27f64a4c6 add tests
7 years ago
jesusbotella 3ed38c192c Merge branch 'master' into 1281-cannot-select-geometries
7 years ago
Alegoiko f79cd69b35 Merge branch 'master' into username_validation_13053
7 years ago
Alberto Romeu 8a3bb710a3 Merge branch 'master' of https://github.com/CartoDB/cartodb into 13435-sync-error-state
7 years ago
Javier Torres 7f856fca20
Merge pull request #13574 from CartoDB/fix-geocodings-spec
7 years ago
Javier Torres 28d4fe86c6 Geocoder test, country order doesn't matter, it changed in pg10 since there is no explicit order by
7 years ago
Alberto Romeu bb6fe4eeb8 Merge branch 'master' of https://github.com/CartoDB/cartodb into 13435-sync-error-state
7 years ago
Javier Torres cea6347882
Merge pull request #13572 from CartoDB/table-spec-fix
7 years ago
Javier Torres 0e941413a0
Merge pull request #13571 from CartoDB/remove-steps-strategy
7 years ago
Javier Torres 9a5246608c Fix table_spec test for PG10
7 years ago
Javier Torres 88e9e66b26 Remove steps strategy
7 years ago
Alberto Romeu 7ea489f91e Merge branch 'master' of https://github.com/CartoDB/cartodb into 13435-sync-error-state
7 years ago
Javier Torres 0de5d93fec
Merge pull request #13568 from CartoDB/update-json-schema
7 years ago
Javier Torres 0e7cec2142 Fix to 2.1.9. Fixes CI problems, and doesn't have strict mode
7 years ago
Javier Torres b151316723 Update json-schema (it broke CI for some reason)
7 years ago
Alegoiko c0f6276f57 updates NEWS.MD
7 years ago
Alegoiko 78373719cb removes extra space
7 years ago
Alex Martín 03d96a2738 unify 'where'
7 years ago
Alegoiko 99992fb5cf proper line length
7 years ago