Url rewrites - Rails Backend part #1933

Kartones · 2015-01-23T11:28:07Z

Tasks still pending:

1) check all user_domain: (pending specs only)
2) check all _path
3) check all _url
share options not working for MU users (embed url, share url, vizjson is ok)
(url_for usage (e.g. cartodb/app/views/admin/pages/shared/_pagination.html.erb)
new config params subdomainless_urls and https_port
torque not working at least for MU users (@javisantana)
Document how subdomains or lack of work at cartodb in the wiki, like this:
https://github.com/CartoDB/cartodb/wiki/creating-tables-though-the-SQL-API
https://github.com/CartoDB/cartodb/wiki/How-to-configure-basemaps-in-CartoDB
Needs a small fix from rochoa for Windshaft in subdomainless mode

Conflicts: NEWS.md app/controllers/admin/pages_controller.rb app/controllers/api/json/users_controller.rb app/controllers/sessions_controller.rb app/models/table.rb app/models/user.rb

Conflicts: config/frontend.yml package.json vendor/assets/javascripts/cartodb.mod.odyssey.uncompressed.js vendor/assets/javascripts/cartodb.uncompressed.js

Conflicts: app/controllers/admin/organization_users_controller.rb vendor/assets/javascripts/cartodb.mod.odyssey.uncompressed.js

Conflicts: config/frontend.yml package.json

Url rewrites - Rails Backend part

Kartones and others added 16 commits January 21, 2015 13:05

#1693 Small refactor of carto_db initializer code

e71239c

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

fe8c68d

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

9801fbc

#1693 subdomain-less urls start to work at dashboard

8c6c04c

Merge branch 'master' into issue-1693

e9cb237

#1693 Removed dead endpoint

64cdfe8

Merge branch 'master' into issue-1693

85148cb

#1693 Fixed status and root page routing

58ea5ce

Merge branch 'master' into issue-1693

1da2568

#1693 fixed login/logout without subdomains

a8a7f30

#1693 misc checks at controllers supporting domain-less now

70f2cd5

#1693 Refactor of some calls

636c128

#1693 dumb commit to update news and retrigger build

e57acae

#1693 comment

ee79a39

refactor to use sqlApiUrl from config

abc55d3

added sql_api_template generation for frontend config

39504c0

Kartones added this to the Sanabria milestone Feb 16, 2015

Kartones added 0 - Backlog labels Feb 16, 2015

Kartones self-assigned this Feb 16, 2015

Kartones removed this from the Sanabria milestone Feb 17, 2015

Kartones removed 2 - Working labels Feb 17, 2015

Kartones added 5 commits February 18, 2015 10:52

Merge branch 'master' into issue-1693

28be3bc

Conflicts: NEWS.md app/controllers/admin/pages_controller.rb app/controllers/api/json/users_controller.rb app/controllers/sessions_controller.rb app/models/table.rb app/models/user.rb

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

b86e666

Merge branch 'master' into issue-1693

cfdbba4

#1693 typos

11944d7

#1693

5b7c19d

Kartones and others added 25 commits April 6, 2015 18:31

Merge branch 'master' into issue-1693

a840a1f

Conflicts: config/frontend.yml package.json vendor/assets/javascripts/cartodb.mod.odyssey.uncompressed.js vendor/assets/javascripts/cartodb.uncompressed.js

fixed export image dialog

d3a8f8d

updated cdb

0190e3e

#1693 bump cartodbui version

167be9a

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

506ec4d

#1693 bug of cachend vizjson key for embed

99b5195

#1693 bugfix for url of regenerate api key

d1df70f

#1693 another bump of js version

5aef150

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

5b5b75c

Merge branch 'master' into issue-1693

c9cd0d2

Conflicts: app/controllers/admin/organization_users_controller.rb vendor/assets/javascripts/cartodb.mod.odyssey.uncompressed.js

#1693 bumping sub-version of cartodbui

c385f0b

#1693 more org urls fixed

41aae58

#1693 more org urls fixed

2d4bdce

#1693 more org urls fixed (III)

5cbd93e

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

e468c1e

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

6f3738a

updated cartodb.js

d0ceb43

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

f06a5e3

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

221242b

#1693 Fixed Oauth urls

73acc2d

Merge branch 'master' into issue-1693

c3a09a4

Conflicts: config/frontend.yml package.json

#1693 another missing SSL require and updated NEWS.md

59d9afe

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

0b019fa

updated cartodb.js to develop

7c0fe92

Merge branch 'master' into issue-1693

86fc3d8

Conflicts: config/frontend.yml package.json

Kartones changed the title ~~Url rewrites - Rails Backend part [Don't Merge]~~ Url rewrites - Rails Backend part Apr 8, 2015

Kartones removed the do not merge yet label Apr 8, 2015

Kartones added a commit that referenced this pull request Apr 8, 2015

Merge pull request #1933 from CartoDB/issue-1693

d04d61e

Url rewrites - Rails Backend part

Kartones merged commit d04d61e into master Apr 8, 2015

Kartones deleted the issue-1693 branch April 8, 2015 09:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Url rewrites - Rails Backend part #1933

Url rewrites - Rails Backend part #1933

Kartones commented Jan 23, 2015

Url rewrites - Rails Backend part #1933

Url rewrites - Rails Backend part #1933

Conversation

Kartones commented Jan 23, 2015