Commit Graph

61 Commits (fba7f168bcdc9b2102b8bd4c276f173e5332398e)

Author SHA1 Message Date
javi 66191aee68 s3, uglify and compress tasks
11 years ago
xavijam aeb87ec70f images, fonts and other assets added + generated sprites only present in final dist folder
11 years ago
javi c8eb39e8ec fixed table and dashboard
11 years ago
Carlos Matallín 895bea409a assets: move dist css to public
11 years ago
xavijam 9cda413530 compass grunt task working
11 years ago
Carlos Matallín d60aa24ba5 Merge branch 'CDB-1555' of github.com:CartoDB/cartodb into CDB-1555
11 years ago
Carlos Matallín be7e180eee frontend: move common data dist files to public
11 years ago
javi 4e750a7bce merged with master
11 years ago
xavijam fc6e37d9a7 moved build
11 years ago
Kartones 03e2c48456 CDB-1915 Both fixed the problem, and added a check so visualization doesn't allows to be set to private if user has no private maps enabled
11 years ago
javi d572a29c7c updated to master
11 years ago
David Arango 6eb9384e59 Add .ruby-gemset to gitignore
11 years ago
javi 394d58e08f added to gitignore generated grunt files CDB-1555
11 years ago
David Arango e6abf7c017 Merge branch 'feature/organizations' into feature/CDB-86-adapt-licenses-manager
11 years ago
xavijam e42b32d8d1 import process info changed to support sync tables
11 years ago
David Arango 26a7946b9d Ignore directories inside engines
11 years ago
David Arango 3e30de6e2c Ignore cartodb-private
11 years ago
Lorenzo Planas aac31fff80 Add rbenv local configuration file to .gitignore
11 years ago
Lorenzo Planas 8f76a5dd54 Include file with credentials for importer test database in gitignore
11 years ago
Luis Bosque 0bf2931787 gitignore changes
11 years ago
David Arango 8667162661 Ignore the whole log directory
12 years ago
xavijam 2e731a6db4 adding compass generated sprites again
12 years ago
javi 1dafec1155 removed icons generated file
12 years ago
David Arango ca8c75e5a6 Ading old submodule path to gitignore
12 years ago
David Arango 6eba8c8e5f Removing cartodb-importer from gitignore
12 years ago
javi ccf7fcaf22 hack to use non-rails compass
12 years ago
David Arango 1d5dba875f Adding .spin.rb
12 years ago
David Arango cfb2b31f78 Adding simplecov. We'll use code coverage reports just to find poor tested parts of the app
12 years ago
javi 833da6fd41 added env folder to gitignore (python env path)
12 years ago
javi 6afa998b74 swo files to gitignore
12 years ago
javi d6ace231e2 added cartodb-importer to gitignore
12 years ago
javi ce6120ade8 added vim swp files to ignore
12 years ago
Fernando Espinosa a5c0369234 Adds support for api_key authentication
12 years ago
Andrew W Hill 46ca05aedb purposefully not running very large files live, prompting test runner to check manually first
12 years ago
Simon Tokumine 640bf8395b adding gemfile.lock
12 years ago
Sandro Santilli ad91225a59 Ignore Gemfile.lock (should help with not committing it again)
13 years ago
Simon Tokumine b7521d59f6 add lock for deploy
13 years ago
Simon Tokumine b0138c46c5 remove lock
13 years ago
Simon Tokumine 896a617e24 locking
13 years ago
Simon Tokumine 6fe7daecbf gemfile.lock to ignore
13 years ago
Simon Tokumine 4defd53211 added lock
13 years ago
Simon Tokumine 3addac8301 merge conflicts
13 years ago
Sandro Santilli 2646b5275b Ignore all .pyc files
13 years ago
Simon Tokumine 2082583284 fix specs to play well with new user limits
13 years ago
Simon Tokumine 4ab158d2c8 die gemfile.lock die
13 years ago
Simon Tokumine 0f17424da7 ignore pip src, and idiot proof the varnish trigger.
13 years ago
javi 8c0668a44e added sample config files
13 years ago
Simon Tokumine ac8e994e2c add better cache busting
13 years ago
Simon Tokumine 531a12226c update redis readme and catch errors if already created a public user
13 years ago
Fernando Blat 16a6198a26 App config and database.yml are not ignored anymore
13 years ago