Commit Graph

2256 Commits (3e95835308d7eb7e77dcd61290fa32f5a6351e0d)

Author SHA1 Message Date
Mario de Frutos e57f09f3b6 Remove v2 for twitter search in sample config
8 years ago
Luis Bosque fa9b0af9ed Allow to override S3 endpoint
8 years ago
xavijam 84889588b2 Conflicts solved
8 years ago
Juan Ignacio Sánchez Lara 26b63df26e Merge branch 'master' into ruby_2.4
8 years ago
Javier Torres e279e5a7e2 Use proper comparison for ruby version
8 years ago
Javier Torres 33dafe5ba8 Encapsulate RUBY 2.4 specific things
8 years ago
Pablo Alonso Garcia 359705fa79 Merge remote-tracking branch 'origin/master' into google-maps
8 years ago
Pablo Alonso Garcia a4be994744 Added Google Maps basemaps to config/app_config.yml.sample
8 years ago
Javier Torres be6cc3151b Monkey patches for ruby 2.4
8 years ago
Javier Torres afc036ec19 Make enforce_non_empty_layer_css: false a default (it is needed in all envs)
8 years ago
Javier Torres cceb180d29 Make enforce_non_empty_layer_css: false a default (it is needed in all envs)
8 years ago
Javier Torres cd53388ee4 Default configuration with working avatars
8 years ago
Francisco López feec05b8b6 Merge pull request #10705 from CartoDB/tangram-integration
8 years ago
Javier Goizueta 87d6644525 Fix incorrect log file name
8 years ago
Javier Goizueta f2c10ac392 :liipstick:
8 years ago
Javier Goizueta 52d6ef627b Use constants for log levels
8 years ago
Javier Goizueta c4fecffb36 💄
8 years ago
Javier Goizueta dc5b67977d Remove SQL statement logging monkey-patching
8 years ago
Javier Goizueta da5a671030 Set the logger level properly
8 years ago
Francisco López 1d1d92e0cd Add tangram deps and use vector flag
8 years ago
Javier Goizueta 6b15129f9b Filter connector creedentials from logged SQL commands
8 years ago
Javier Goizueta 3989a4547f Filter out connection parameters from logged requests
8 years ago
Ivan Malagon 6ee7b3352a 'app_config.yml.sample' commented
8 years ago
Ivan Malagon c6d26bda83 app_config sample
8 years ago
Javier Torres 5a36f5ccbb Missing base_domain_from_name
8 years ago
Javier Torres e2944374b4 Merge pull request #11207 from CartoDB/11142-saml-username-collision
8 years ago
Guido Fioravantti 49ced725db change action call to new method name
8 years ago
Javier Torres f5b341af23 Add SAML metadata controller
8 years ago
Guido Fioravantti 9aa7bc9c0f revert app_config changes
8 years ago
Guido Fioravantti 04ee84e22b change method to be nil resistent
8 years ago
Guido Fioravantti a118ae2f59 add app views in reverse order
8 years ago
Guido Fioravantti 2fb4a3398b use simpler approach
8 years ago
Guido Fioravantti da2c854d99 always load
8 years ago
Guido Fioravantti c73498751e use config variant
8 years ago
Javier Torres 0c67bb9679 Update NEWS
8 years ago
Javier Torres aab21c7b4c Add NEWS
8 years ago
Juan Ignacio Sánchez Lara 4e7a14d945 Automatic user creation for SAML #11073
8 years ago
Juan Ignacio Sánchez Lara 61fc4ae985 Merge branch 'master' of github.com:CartoDB/cartodb into 11073-saml-autocreate-user
8 years ago
Juan Ignacio Sánchez Lara 05498df9ed Straightforward organization users search #11129
8 years ago
Juan Ignacio Sánchez Lara 9e2f9d287b Fixes saml service instantiation at Warden #11129
8 years ago
Juan Ignacio Sánchez Lara 706517a3d4 Merge branch 'master' into 11073-saml-autocreate-user
8 years ago
Juan Ignacio Sánchez Lara 1636f65516 Merge branch 'master' into 11070-subdomainless_saml
8 years ago
Guido Fioravantti 30c94cd5ac refactor warden strategy
8 years ago
Juan Ignacio Sánchez Lara d15f9d87c3 Merge branch 'master' into 11106-layer_controller_refactor
8 years ago
Javier Torres aa19cd781c Enable subdomainless SAML login
8 years ago
Javier Torres 42a7d89a90 Switch routes to new controller
8 years ago
Juan Ignacio Sánchez Lara 2ac2a05705 Merge branch 'master' of github.com:CartoDB/cartodb into azavea-feature/cloudniner/saml-authentication
8 years ago
Javier Torres 31878b1309 Consistent controller action naming
8 years ago
Javier Torres a48e0ca8ac Finish controller cleanup
8 years ago
Juan Ignacio Sánchez Lara 41e39a9fb3 Some SAML details refactor #9142
8 years ago