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.

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

Disable geocoding options in on-premise #1500

Closed
wants to merge 5 commits into from

Conversation

Xatpy
Copy link
Contributor

@Xatpy Xatpy commented Dec 17, 2014

Ticket related #1227
Disable geocoding by (city names, admin. regions, postal codes and ip)
if the feature flag ‘georef_disabled' is enabled.
Also, I have deleted lib/assets/test/spec/test_runner.html because it
wasn’t being used.

Please, @javisantana @xavijam @viddo could you review it? Thanks!

Ticket related #1227
Disable geocoding by (city names, admin. regions, postal codes and ip)
if the feature flag ‘on_premise) is enabled.
Also, I have deleted lib/assets/test/spec/test_runner.html because it
wasn’t being used.
@@ -1,32 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file shouldn't be committed :S

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, but I understood (at #frontend chat talk with @viddo ) that we had to delete that file because it wasn't being used.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hahaha, sorry mate, my bad, I thought you were adding it!, go ahead!

@Xatpy
Copy link
Contributor Author

Xatpy commented Jan 13, 2015

Please, @javisantana , could you review it? It's using new naming as we discussed ( https://github.com/CartoDB/cartodb-onpremise/issues/48 )

@Xatpy Xatpy mentioned this pull request Jan 13, 2015
@@ -1,6 +1,6 @@
{
"browserify_debug": true,
"browserify_watch": true,
"browserify_watch": false,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if this change should go here

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This value matches master though, is this branch up-to-date?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that no, so I won't commit this file

Also it was removed the alignment (as it was before)
@Xatpy
Copy link
Contributor Author

Xatpy commented Jan 13, 2015

@javisantana why did Jenkins fail? _SpecRunner passed correctly.

@javisantana
Copy link
Contributor

@Xatpy looks like a problem with clinker itself: http://clinker.cartodb.net/jenkins/job/CartoDB-PR-testing/1089/console

@Xatpy
Copy link
Contributor Author

Xatpy commented Jan 14, 2015

retest this please

@Xatpy
Copy link
Contributor Author

Xatpy commented Jan 14, 2015

@javisantana I retested it, but same result.
Error:

stderr: error: The following untracked working tree files would be overwritten by checkout:
10:20:31    themes/css/cartodb.css
10:20:31 Please move or remove them before you can switch branches.

I don't understand it, because I didn't commit cartodb.css

Could be config/grunt_development.json the reason?

@javisantana
Copy link
Contributor

@Xatpy dunno, but try to remove that change (you finally didn't do it)

@Xatpy
Copy link
Contributor Author

Xatpy commented Jan 14, 2015

retest this please

@Xatpy
Copy link
Contributor Author

Xatpy commented Jan 14, 2015

Mail sent to support@clinkerhq.zendesk.com asking for details about this.

@Xatpy
Copy link
Contributor Author

Xatpy commented Jan 14, 2015

retest this please

@Xatpy
Copy link
Contributor Author

Xatpy commented Jan 16, 2015

I close this pr because it was done in this other PR

The reason is because there were a lot of conflicts here, and I preferred to start in an updated branch.

@Xatpy Xatpy closed this Jan 16, 2015
@elenatorro elenatorro deleted the Container_Disable_geocoding branch February 16, 2018 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants