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

10905 layer onboarding #11532

Merged
merged 58 commits into from
Feb 20, 2017
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
a4f3d0b
WIP: data onboarding first draft
ivanmalagon Feb 3, 2017
302d2a2
Merge branch 'master' into 10905-layer-onboarding
matallo Feb 6, 2017
a4682f1
onboarding: add analysis, and style WIP
matallo Feb 6, 2017
ac2d635
onboarding: layer WIP
matallo Feb 7, 2017
3ebf3ec
Refactored onboarding launchers and views
ivanmalagon Feb 7, 2017
78beaa8
All 4 onboardings working in desktop breakpoint with no widgets
ivanmalagon Feb 7, 2017
024685a
Data onboarding step 4 correctly placed in all cases
ivanmalagon Feb 8, 2017
fa6d331
Connected with notification API
ivanmalagon Feb 8, 2017
3b42918
Aestethic changes: header line height and button spacing
ivanmalagon Feb 8, 2017
e152241
Refactored launcher
ivanmalagon Feb 8, 2017
1dbb363
Linter
ivanmalagon Feb 8, 2017
315fb98
Tests boilerplate
ivanmalagon Feb 8, 2017
1964a9c
Design acceptance changes I
ivanmalagon Feb 9, 2017
db65d31
Style onboarding for different aggregations
ivanmalagon Feb 9, 2017
c065e36
Refactor geometry highlight
ivanmalagon Feb 9, 2017
f385812
Design acceptance minor fixes
ivanmalagon Feb 10, 2017
0c14472
Preparing stuff
ivanmalagon Feb 13, 2017
3a9274c
Previous tests increased and passing
ivanmalagon Feb 13, 2017
7f5d142
Test are ongoing
ivanmalagon Feb 14, 2017
b7924ed
Lint Eastwood
ivanmalagon Feb 14, 2017
172e44f
Tests finished
ivanmalagon Feb 14, 2017
6cb3b94
Deleted unnecessary test
ivanmalagon Feb 14, 2017
d2771ca
Test if this fixes some Hound violations
ivanmalagon Feb 14, 2017
23d8700
Hound
ivanmalagon Feb 14, 2017
e0a5408
Hound II
ivanmalagon Feb 14, 2017
867064f
Hound III
ivanmalagon Feb 14, 2017
4ecb627
Rollback DI
ivanmalagon Feb 14, 2017
d4bcc5a
Merge from master
ivanmalagon Feb 15, 2017
10ca363
Fixing tests
ivanmalagon Feb 15, 2017
b19e453
Reverting a dev process
ivanmalagon Feb 15, 2017
b17cf18
Updated NEWS.md
ivanmalagon Feb 15, 2017
5c80642
Update package.json
ivanmalagon Feb 15, 2017
da5f502
Creating analyses-service
xavijam Feb 15, 2017
0a04fe2
Merge branch '10905-layer-onboarding' of github.com:CartoDB/cartodb i…
xavijam Feb 15, 2017
1c87ec5
CR feedback applied
xavijam Feb 15, 2017
1979d04
Merge branch 'master' into 10905-layer-onboarding
matallo Feb 15, 2017
020ddb5
Merge branch '10905-layer-onboarding' of github.com:CartoDB/cartodb i…
matallo Feb 15, 2017
9091cf0
step
matallo Feb 15, 2017
39a17f9
initbinds
matallo Feb 15, 2017
c76c65a
Conflicts solved
xavijam Feb 15, 2017
c56afc9
tuberia
matallo Feb 15, 2017
ccb40f7
Merge branch '10905-layer-onboarding' of github.com:CartoDB/cartodb i…
matallo Feb 15, 2017
4ac0f09
onboardingNotification
matallo Feb 15, 2017
d4a3486
onboardingNotification
matallo Feb 15, 2017
502f6d4
🔥
matallo Feb 15, 2017
6734a69
tests wip
matallo Feb 16, 2017
a059a1e
tests wip
matallo Feb 16, 2017
54019fa
Merge branch 'master' into 10905-layer-onboarding
matallo Feb 16, 2017
5350db7
fix tests, analyses service tests pending
matallo Feb 16, 2017
09e90fa
fix tests
matallo Feb 16, 2017
3785341
fix tests
matallo Feb 16, 2017
dba44f4
fix onboarding
matallo Feb 16, 2017
fa6ae96
Merge branch 'master' into 10905-layer-onboarding
matallo Feb 16, 2017
de5957e
requiredopts
matallo Feb 16, 2017
3389505
Merge branch 'master' into 10905-layer-onboarding
matallo Feb 16, 2017
0f866fb
Changed texts
xavijam Feb 17, 2017
8761b66
Onboarding fixing problem
xavijam Feb 17, 2017
8de889a
Merge branch 'master' into 10905-layer-onboarding
xavijam Feb 17, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 11 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,11 @@

grunt.registerTask('js', ['cdb', 'pre_client', 'browserify', 'concat:js', 'jst']);
grunt.registerTask('pre_default', ['clean', 'config', 'js']);
grunt.registerTask('test',
'(CI env) Re-build JS files and run all tests. For manual testing use `grunt jasmine` directly', [
'pre_default', 'npm-test', 'jasmine', 'lint'
grunt.registerTask('test', '(CI env) Re-build JS files and run all tests. For manual testing use `grunt jasmine` directly', [
'pre_default',
'npm-test',
'jasmine',
'lint'
]);
grunt.registerTask('editor3', [
'browserify:vendor_editor3',
Expand Down Expand Up @@ -298,8 +300,12 @@
return ['jasmine', name, 'build'].join(':');
})
.value());
grunt.registerTask('dev', 'Typical task for frontend development (watch JS/CSS changes)',
['setConfig:env.browserify_watch:true', 'browserify', 'build-jasmine-specrunners', 'connect', 'watch']);
grunt.registerTask('dev', 'Typical task for frontend development (watch JS/CSS changes)', [
'setConfig:env.browserify_watch:true',
'browserify',
'build-jasmine-specrunners',
'connect',
'watch']);
grunt.registerTask('sourcemaps',
'generate sourcemaps, to be used w/ trackjs.com for bughunting', [
'setConfig:assets_dir:./tmp/sourcemaps',
Expand Down