Code

Url rewrites - Rails Backend part #1933

Code

Merged

Kartones merged 153 commits intomasterCartoDB/cartodb:masterfrom issue-1693CartoDB/cartodb:issue-1693Copy head branch name to clipboardApr 8, 2015

+2,018-1,314

Commits

Commits on Jan 21, 2015

• #1693 Small refactor of carto_db initializer code

  

  Kartones

  committed
  e71239c

• #1693 Now HTTP port comes via config (also relates to #1317)

  

  Kartones

  committed
  fe8c68d

• #1693 Making port optional to avoid having to setup it if not wanted

  

  Kartones

  committed
  9801fbc

• #1693 subdomain-less urls start to work at dashboard

  

  Kartones

  committed
  8c6c04c

Commits on Jan 22, 2015

• Merge branch 'master' into issue-1693

  

  Kartones

  committed
  e9cb237

• #1693 Removed dead endpoint

  

  Kartones

  committed
  64cdfe8

• Merge branch 'master' into issue-1693

  

  Kartones

  committed
  85148cb

• #1693 Fixed status and root page routing

  

  Kartones

  committed
  58ea5ce

Commits on Jan 23, 2015

• Merge branch 'master' into issue-1693

  

  Kartones

  committed
  1da2568

• #1693 fixed login/logout without subdomains

  

  Kartones

  committed
  a8a7f30

• #1693 misc checks at controllers supporting domain-less now

  

  Kartones

  committed
  70f2cd5

• #1693 Refactor of some calls

  

  Kartones

  committed
  636c128

• #1693 dumb commit to update news and retrigger build

  

  Kartones

  committed
  e57acae

• #1693 comment

  

  Kartones

  committed
  ee79a39

Commits on Jan 30, 2015

• refactor to use sqlApiUrl from config

  javisantana

  committed
  abc55d3

• added sql_api_template generation for frontend config

  javisantana

  committed
  39504c0

Commits on Feb 18, 2015

• Merge branch 'master' into issue-1693

  Show description for 28be3bc
  

  Kartones

  committed
  28be3bc

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  b86e666

• Merge branch 'master' into issue-1693

  

  Kartones

  committed
  cfdbba4

• #1693 typos

  

  Kartones

  committed
  11944d7

• #1693

  

  Kartones

  committed
  5b7c19d

Commits on Feb 19, 2015

• Merge branch 'master' into issue-1693

  Show description for a6858ca
  

  Kartones

  committed
  a6858ca

• #1693

  

  Kartones

  committed
  2ca9f18

Commits on Mar 6, 2015

• Merge branch 'master' into issue-1693

  Show description for cce293d
  

  Kartones

  committed
  cce293d

Commits on Mar 10, 2015

• #1693 another merge from hell

  

  Kartones

  committed
  4dc7e9a

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  Show description for 8b53b53
  

  Kartones

  committed
  8b53b53

Commits on Mar 11, 2015

• #1693 ongoing testing and small refactor of Cartodb url related methods

  

  Kartones

  committed
  a10fad9

• #1693 Some tests and small code cleaning

  

  Kartones

  committed
  a00a529

• #1693 more specs to CartoDB Module

  

  Kartones

  committed
  a7a08f5

• Merge branch 'master' into issue-1693

  

  Kartones

  committed
  5c1a647

Commits on Mar 12, 2015

• #1693 ongoing oembed controller refactor & specs

  

  Kartones

  committed
  30245e8

• #1693 ongoing oembed code testing

  

  Kartones

  committed
  334d306

Commits on Mar 13, 2015

• #1693 oembed specs working

  

  Kartones

  committed
  ca0dc03

• #1693 proper exceptions

  

  Kartones

  committed
  1b395b4

• #1693 hiding config access for account_host

  

  Kartones

  committed
  57e72d3

• replace tiler_* and sql_api_* by tamplates in frontend config

  javisantana

  committed
  22a9168

• using url templates in frontend

  javisantana

  committed
  38cd972

• fixed merged

  javisantana

  committed
  477e413

• Merge branch 'master' into issue-1693

  

  Kartones

  committed
  7b9c756

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  94de061

• fixing specs

  javisantana

  committed
  86a8025

• merged

  javisantana

  committed
  8992af8

• updated cdb

  javisantana

  committed
  1d8cce4

• added npm install to cdb build

  javisantana

  committed
  4127edf

• updated cartodb

  javisantana

  committed
  adce09a

Commits on Mar 16, 2015

• #1693 Started adding support for optional subdomains

  

  Kartones

  committed
  64c354c

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  3aca456

• #1693 auto-detection of domainless urls (ongoing)

  

  Kartones

  committed
  acd6f6e

Commits on Mar 17, 2015

• #1693 specs stabilization

  

  Kartones

  committed
  45b4ee8

• #1693 removal of FE isOrganizationUrl checks, misc controller fixes to esend request to Presenters

  

  Kartones

  committed
  518b239

• #1693 spec stabilization

  

  Kartones

  committed
  55fb897

• #1693 More stabilization and request sending

  

  Kartones

  committed
  09cbff1

• #1693 related and unrelated vis needed also options passing

  

  Kartones

  committed
  d7bedf5

• #1693 specs stabilization

  

  Kartones

  committed
  7181dc9

Commits on Mar 18, 2015

• using url templates in vis.json too

  javisantana

  committed
  890967d

• merged with issue-1693

  javisantana

  committed
  a2d21b1

• Merge branch 'master' into issue-1693

  Show description for 318913a
  

  Kartones

  committed
  318913a

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  1c074df

• #1693 proper submodule

  

  Kartones

  committed
  5ef61f2

Commits on Mar 20, 2015

• Merge branch 'master' into issue-1693

  

  Kartones

  committed
  25ec33b

• #1693 Spec stabilization + bugfix at oembed controller

  

  Kartones

  committed
  e229c6e

Commits on Mar 23, 2015

• Merge branch 'master' into issue-1693

  Show description for e884013
  

  Kartones

  committed
  e884013

Commits on Mar 24, 2015

• #1693 handling empty, non-null ports

  

  Kartones

  committed
  abbcbcb

• #1693 spec stabilization

  

  Kartones

  committed
  ff9adae

• #1693 moar spec stabilization

  

  Kartones

  committed
  8e22eac

• #1693 bugfix for controller flow and get_authenticated_users

  

  Kartones

  committed
  5a8d90a

• fixed problems with multiuser urls

  javisantana

  committed
  9eeb51d

• fixed organization urls using base_url

  javisantana

  committed
  73439b0

Commits on Mar 25, 2015

• #1693 ongoing sweep to reduce to just subdomain and subdomainless calls

  

  Kartones

  committed
  09b8cc9

• #1693 ongoing sweep to reduce to just subdomain and subdomainless calls

  

  Kartones

  committed
  65ab753

• #1693 ongoing sweep to reduce to just subdomain and subdomainless calls

  

  Kartones

  committed
  98d9253

• fixed url_prefix

  javisantana

  committed
  237a1ec

• #1693 bugfixing to make new url format work

  

  Kartones

  committed
  fdebd4c

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  486f354

• use fontend_config variable to send the default basemap

  javisantana

  committed
  bde5e3c

• #1693 Fixed a few url generation points

  

  Kartones

  committed
  5fad38d

• #1693

  

  Kartones

  committed
  3ba53b3

Commits on Mar 26, 2015

• #1693 misc bugfixes

  

  Kartones

  committed
  7c476c8

• #1693 redundant code removal

  

  Kartones

  committed
  419b4c5

• #1693 specs stabiliztion

  

  Kartones

  committed
  1c9356e

• #1693 added more specs for subdomainless methods

  

  Kartones

  committed
  4069cc6

• added fallback baseman config

  javisantana

  committed
  a48dc5e

• merged

  javisantana

  committed
  168d0ca

• Merge branch 'master' into issue-1693

  Show description for 7f2b438
  

  Kartones

  committed
  7f2b438

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  8cae9ea

• #1693 removed no longer needed request passing

  

  Kartones

  committed
  ecfd5ed

• #1693 bugfix for not sent organization

  

  Kartones

  committed
  cb75287

Commits on Mar 27, 2015

• fixed maps_api_template url generation for dominoes

  javisantana

  committed
  64bdc44

• fixed urls for viz.json

  javisantana

  committed
  bcc82bb

• fixed tests failing when including full viz.json urls

  javisantana

  committed
  3572164

• fixed tests

  javisantana

  committed
  2d42ea6

• #1963 Ongoing replace of rails routing url helpers by CartoDB.url and CartoDB.path to control domainless and MU scenarios

  

  Kartones

  committed
  95d9797

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  2661fe9

• update catodb.js

  javisantana

  committed
  f9e7ce3

• #1963 Ongoing replace of rails routing url helpers

  

  Kartones

  committed
  a50bff9

Commits on Mar 30, 2015

• #1693 Remaining :user_domain _path calls changed except tests

  

  Kartones

  committed
  c7bab94

• merged

  javisantana

  committed
  9d9b179

• #1693 Many _url replacements

  

  Kartones

  committed
  0e64cdd

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  8de95fd

• #1693 more url substitutions

  

  Kartones

  committed
  8e8a094

• Merge branch 'master' into issue-1693

  Show description for 7bf83c1
  

  Kartones

  committed
  7bf83c1

• #1693 More fixes including url_for

  

  Kartones

  committed
  2769aad

• #1693 spec stabilization

  

  Kartones

  committed
  5e8ff1b

Commits on Mar 31, 2015

• Merge branch 'master' into issue-1693

  

  Kartones

  committed
  ee5d486

• #1693

  

  Kartones

  committed
  df69b33

• updated cdb submodule

  javisantana

  committed
  e95fbca

• Merge branch 'master' into issue-1693

  Show description for 06c1236
  

  Kartones

  committed
  06c1236

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  c2eb230

• updated cdb

  javisantana

  committed
  ef474cf

• merged

  javisantana

  committed
  3005347

• updated cab

  javisantana

  committed
  60fec98

• #1693 Improvements based on CR

  

  Kartones

  committed
  b4c64c8

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  099fa95

• fixed torque

  javisantana

  committed
  0300bcb

• #1693 proper NEWS

  

  Kartones

  committed
  7acdbfd

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  6c73fc7

Commits on Apr 1, 2015

• Merge branch 'master' into issue-1693

  Show description for 88f224c
  

  Kartones

  committed
  88f224c

• #1693 bugfix at get_authenticated_users (wrong url)

  

  Kartones

  committed
  2d1fce9

• #issue-1693 changing js version to avoid overlapping

  

  Kartones

  committed
  6f17eff

• #1693 Sending correct api type for tiler depending on request protocol

  

  Kartones

  committed
  baed8ac

• Merge branch 'master' into issue-1693

  Show description for 087a522
  

  Kartones

  committed
  087a522

Commits on Apr 6, 2015

• #1693 Removal of request propagation to some Presenters (no longer needed)

  

  Kartones

  committed
  94aef79

• #1693 last commit removed one line it shouldn't

  

  Kartones

  committed
  5625eea

• fixes "edit in carted" link in public map

  javisantana

  committed
  f62ce4e

• fixed old public dashboard

  javisantana

  committed
  bffe042

• #1693 using private config for maps api and sql api if request is https

  

  Kartones

  committed
  d8845cf

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  a9725da

• #1693 missed the inline vizjson calls for protocol change on APIs

  

  Kartones

  committed
  2b62f30

• Merge branch 'master' into issue-1693

  Show description for a840a1f
  

  Kartones

  committed
  a840a1f

• fixed export image dialog

  javisantana

  committed
  d3a8f8d

• updated cdb

  javisantana

  committed
  0190e3e

Commits on Apr 7, 2015

• #1693 bump cartodbui version

  

  Kartones

  committed
  167be9a

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  506ec4d

• #1693 bug of cachend vizjson key for embed

  

  Kartones

  committed
  99b5195

• #1693 bugfix for url of regenerate api key

  

  Kartones

  committed
  d1df70f

• #1693 another bump of js version

  

  Kartones

  committed
  5aef150

• #1693 bugfix for wrong destination urls changing api key for MU users

  

  Kartones

  committed
  5b5b75c

• Merge branch 'master' into issue-1693

  Show description for c9cd0d2
  

  Kartones

  committed
  c9cd0d2

• #1693 bumping sub-version of cartodbui

  

  Kartones

  committed
  c385f0b

• #1693 more org urls fixed

  

  Kartones

  committed
  41aae58

• #1693 more org urls fixed

  

  Kartones

  committed
  2d4bdce

• #1693 more org urls fixed (III)

  

  Kartones

  committed
  5cbd93e

• #1693 more url fixes (redoing some after manually checking)

  

  Kartones

  committed
  e468c1e

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  6f3738a

• updated cartodb.js

  javisantana

  committed
  d0ceb43

• #1693 issue editing org users found (ssl enforce missing)

  

  Kartones

  committed
  f06a5e3

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  221242b

• #1693 Fixed Oauth urls

  

  Kartones

  committed
  73acc2d

• Merge branch 'master' into issue-1693

  Show description for c3a09a4
  

  Kartones

  committed
  c3a09a4

Commits on Apr 8, 2015

• #1693 another missing SSL require and updated NEWS.md

  

  Kartones

  committed
  59d9afe

• Merge branch 'issue-1693' of github.com:CartoDB/cartodb into issue-1693

  

  Kartones

  committed
  0b019fa

• updated cartodb.js to develop

  javisantana

  committed
  7c0fe92

• Merge branch 'master' into issue-1693

  Show description for 86fc3d8
  

  Kartones

  committed
  86fc3d8