Commit Graph

3586 Commits (a37229848c2f7534f8605bf1406d9030610a2d46)
 

Author SHA1 Message Date
Luis Bosque 509e0e312c Merge branch 'develop' into feature/from_cartodb1_develop
12 years ago
Luis Bosque 707c04528d Gemfile.lock
12 years ago
Simon Tokumine aecf889866 remove logging and make specs pass- CSV exports only work when there is a row in the table
12 years ago
Simon Tokumine 31e18b8c43 remove spec which imported a file
12 years ago
Simon Tokumine 34f36f259a Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
12 years ago
Simon Tokumine dea938593b simplify table controller and remove file import tests from acceptance. these will now be in the data_import spec
12 years ago
Luis Bosque a0cf667261 Merge branch 'cartodb1_develop' into feature/from_cartodb1_develop
12 years ago
Luis Bosque 90ae687804 dummy change in imports controller
12 years ago
javi 821c25cb6f comment for future guys
12 years ago
javi 9de030b574 importer processing checking
12 years ago
javi e94175ef0e rails controller for imports now returns plain object on show
12 years ago
javi b016f08024 file import wip
12 years ago
saleiva db2918857e adding tooltip to list_item on dashboard
12 years ago
saleiva 8c437660e8 adding tooltip to list_item on dashboard
12 years ago
saleiva c89ef68246 changing closing effect to user_menu view
12 years ago
saleiva d42fa9f19e improving tipsy and adding saleivas fork
12 years ago
Javier Alvarez e2d75ebb43 conflict with scss files solved
12 years ago
Javier Alvarez 04dbc8019e copy to clipboard added to cartodb
12 years ago
David Arango 70c4dafaff Weird error found by @Ferdev
12 years ago
David Arango b20b65958d Fix
12 years ago
Simon Tokumine 6beaf5071f nuke old upload route
12 years ago
Simon Tokumine 1dbf155633 Remove things we'll never do
12 years ago
Simon Tokumine 3df9e08cb7 Merge branch 'feature/cartodb2.0' into develop
12 years ago
Simon Tokumine 54bc33e326 formatting...
12 years ago
Simon Tokumine bbabe7aa41 Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
12 years ago
Simon Tokumine 8a33fadd34 remove request_api as no longer used
12 years ago
javi 55dde9487c fixed specs
12 years ago
David Arango 8fc5fddf06 Weird error found by @Ferdev
12 years ago
Luis Bosque b93419c5c0 disable rspec load in development mode in Rakefile
12 years ago
Luis Bosque b98b03cd6b change order of minitests in Gemfile
12 years ago
Simon Tokumine 13cc7bc31e scrap a lot of unneeded dashboard SQL
12 years ago
Simon Tokumine 08c249877a remove unused public index
12 years ago
Simon Tokumine 3c1b7b2aa8 remove old import controller
12 years ago
Simon Tokumine 2549c52a80 turns out we don't need all that :D
12 years ago
Simon Tokumine eb4e3d6c86 add privacy string output to model and basic create controller
12 years ago
Simon Tokumine df7ea7cd15 enable blank tables to be created and also be created according to a schema
12 years ago
javi c7a74317bd Merge branch 'feature/cartodb2.0' of github.com:CartoDB/cartodb20 into feature/cartodb2.0
12 years ago
javi 9dd7a30d5c table editing func
12 years ago
javi 173193345f fixed some problems on removing reserved columns
12 years ago
javi 7ef37b01b2 return 204 when delete resources
12 years ago
Simon Tokumine b26b1db5bc Merge branch 'feature/cartodb2.0' into develop
12 years ago
Simon Tokumine 69848bd3a8 Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
12 years ago
Simon Tokumine 1b0b5488a4 remove data import cruft from tables controller - moved to data_import model
12 years ago
Simon Tokumine 03d8b3d03c take out sync methods in imports controller and create a small table create method for use by the UI
12 years ago
David Arango ca53733042 Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
12 years ago
David Arango 43a1e1c7b5 Finally fixing the export_tables spec, we should have more coverage here btw
12 years ago
saleiva 369c6498be Merge branch 'feature/cartodb2.0' of https://github.com/CartoDB/cartodb20 into feature/cartodb2.0
12 years ago
Luis Bosque 1ceac3a519 replaced resque-rails by resque-rails-cartodb gem
12 years ago
saleiva 44e74e12ca small fixes on table header h1 and h2
12 years ago
Simon Tokumine 407e5a8d04 Merge branch 'develop' of github.com:Vizzuality/cartodb into develop
12 years ago