959 Commits (master)

Author	SHA1	Message	Date
Román Jiménez	79ffeb9a30	node_modules instead of resolve(node_modules)	7 years ago
rubenmoya	0865960b0d	Merge branch 'poc-migration' of github.com:CartoDB/cartodb into api-keys-dashboard	7 years ago
Román Jiménez	a9e8efa1b2	use webpack.resolve.modules + refactor	7 years ago
Román Jiménez	7342117318	fix specs + webpack alias for dashboard on specs	7 years ago
rubenmoya	0080d57c85	Fix wrong paths in watch task and webpack configs	7 years ago
rubenmoya	2e5d3b9022	Merge branch 'master' into poc-migration	7 years ago
Román Jiménez	f48804fd68	Merge branch 'master' into poc-migration	7 years ago
Carlos Matallín	c76e5fc39c	remove affected specs, always all	7 years ago
Carlos Matallín	f163b49402	unplug pluggable frontends	7 years ago
nobuti	58ad98c5fc	Refactor grunt tasks.	7 years ago
nobuti	40b7c5f192	More specs.	7 years ago
Carlos Matallín	d3263b99c9	router specs	7 years ago
nobuti	b2a64cb55c	Fix specs.	7 years ago
nobuti	bd9ff3c716	Merge branch 'master' into bridge	7 years ago
nobuti	2b2d8ba841	Get rid of tangram forcing no vector rendering.	7 years ago
rubenmoya	720e678e19	Add routing to widgets, also disable the not selected	7 years ago
nobuti	57b8eaaf33	Changed copy task to include tangram.	7 years ago
jesusbotella	748d795c0d	Add Tipsy tooltip styles to public maps styles	7 years ago
Carlos Matallín	22889d5e0b	Merge branch 'master' into 13115-deep-linking-deep-trouble	7 years ago
Ivan Malagon	bc30c227b3	Apply linter fixes	7 years ago
Ivan Malagon	a8b7ba5d3f	Allow several test folders	7 years ago
Carlos Matallín	49054d787e	Merge branch 'master' into 13115-deep-linking-deep-trouble	7 years ago
Jesús Arroyo Torrens	a429aa2e40	Fix lint	7 years ago
Carlos Matallín	81711f67f3	Merge branch 'master' into 13115-deep-linking-deep-trouble	7 years ago
Jesús Arroyo Torrens	0fdbee2847	Check linter in grunt tasks	7 years ago
Jesús Arroyo Torrens	6efd7d1c98	Merge Builder+DI tests	7 years ago
Jesús Arroyo Torrens	1717232173	Include DI tests	7 years ago
Jesús Arroyo Torrens	5c6a5f976c	Include DI in the grunt tasks	7 years ago
Jesús Arroyo Torrens	75aeffcfd1	Move DI stylesheets to `app/assets/stylesheets/deep-insights	7 years ago
Román Jiménez	77c07c9b03	try to get the tests to run properly with routing	7 years ago
elenatorro	21ad9c3cc1	Load hubspot form script when needed	7 years ago
nobuti	d4f6cef980	Approach: Group all migrated files under dashboard folder. ... This way the build and specs process can be separated from Builder. This commit adds all the tasks and webpack config taking this into account.	7 years ago
elenatorro	deb2353aa9	Remove unnecessary library	7 years ago
elenatorro	e3ca391529	Bump version	7 years ago
elenatorro	9c635c94fe	Use Like Model	7 years ago
elenatorro	88597b8300	Request user in vizdata & bump version	7 years ago
elenatorro	d6775bcd69	Fix retrieve google map key	7 years ago
elenatorro	5496dcf5ba	Fix editor redirection [WIP]	7 years ago
elenatorro	32bae38eb8	Fix google maps link & bump version	7 years ago
elenatorro	c2a22875d2	Build	7 years ago
elenatorro	c2f73d56cc	Add Google Maps basemaps for static views	7 years ago
elenatorro	75eaa42b4a	Add google maps to static pages	7 years ago
elenatorro	59555c8074	Add missing template, bump version	7 years ago
elenatorro	0d0a61d3ab	Merge master	7 years ago
elenatorro	771f72c8a8	Merge master	7 years ago
nobuti	1314dca115	Merge branch 'master' into 13031-static-editor	7 years ago
elenatorro	4eec3f345d	fix organization templates task	7 years ago
elenatorro	43d69b1b97	fix trivial errors, bump version	7 years ago
elenatorro	f973281c09	merge public maps, bump version	7 years ago
elenatorro	a11d9f1df6	Merge master	7 years ago
nobuti	0acdbaf3eb	Merge branch 'master' into 12779-static-embed-maps	7 years ago
nobuti	d0cba39651	Fix missing grantables file.	7 years ago
elenatorro	d736943903	add authTokens to export image	7 years ago
nobuti	54495aec33	Specs.	7 years ago
nobuti	ada872d6d1	Merge branch '12867-static-public-maps' into 12779-static-embed-maps	7 years ago
elenatorro	2fd610341d	Merge master	7 years ago
nobuti	99faa4e5e8	Merge branch 'master' into 12867-static-public-maps	7 years ago
elenatorro	d97cef4b4c	merge master	7 years ago
elenatorro	c29892270a	merge master	7 years ago
Elena Torró	d338edc727	Merge branch 'master' into 12740-static-account	7 years ago
Raul Marin	ba0e004d4d	Fix issue with Sass encoding ... Sass::SyntaxError on line LINE of FILE: Invalid US-ASCII character CHAR	7 years ago
elenatorro	432d054dc6	change google plus revoke link	7 years ago
elenatorro	659aeebb4b	fix delete account errors and revoke google account	7 years ago
nobuti	35976a234f	Uglify.	7 years ago
nobuti	4cbdc8749e	Merge branch '12867-static-public-maps' into 12779-static-embed-maps	7 years ago
Ivan Malagon	6048b9c208	Remove leaflet dependency check	7 years ago
nobuti	a8cc28c464	Styles.	7 years ago
elenatorro	2bdd12b3ca	fix organization password form errors	7 years ago
nobuti	1d0527a6e2	Bootstrapping.	7 years ago
elenatorro	41808874c6	fix little issues	7 years ago
elenatorro	da10621e6a	add carto-node as a vendor dependecy to all static pages	7 years ago
elenatorro	0d0457943f	add CartoNode to account dependencies	7 years ago
elenatorro	36314708cb	use carto-node to update user when account is updated	7 years ago
elenatorro	9b7897ac21	WIP account	7 years ago
elenatorro	916cfcbaa3	add main view and tests	7 years ago
nobuti	7f06d14aae	Minor refactor.	7 years ago
nobuti	629a93096d	More fixes.	7 years ago
elenatorro	b45dd078db	change table view to avoid duplication	7 years ago
elenatorro	d84e4b7e9b	set up editor static view	7 years ago
nobuti	22ab320da6	Move password protected files to public maps folder.	7 years ago
elenatorro	9e673767eb	fix tests	7 years ago
Román Jiménez	8ec7228ee7	fix tests	7 years ago
nobuti	b70a35b99c	Fix merge.	7 years ago
Buti	8de96cd35b	Merge branch '12867-static-public-maps' into 12867-static-protected-maps	7 years ago
nobuti	34ee8a97e3	Fix api url. ... Added specs to browserify. º	7 years ago
nobuti	f39e458b8a	Bootstrapping all entry points for build tasks.	7 years ago
elenatorro	858cc173cd	set up protected maps, trivial refactor, added locales	7 years ago
Carlos Matallín	9c8e8edbf5	uglify: ignore static account	7 years ago
elenatorro	e25073ecaf	fix master changes	7 years ago
Carlos Matallín	e817f339a3	Merge branch 'master' into 12740-static-account	7 years ago
elenatorro	7262a5aad5	fix merge errors, add public map tests setup	7 years ago
elenatorro	88ee5869a1	public map static set up [WIP] [skip-cli]	7 years ago
Carlos Matallín	b7676d824a	prevent uglify for static profile assets	7 years ago
Carlos Matallín	2391ef94d5	Merge branch '12674-static-profile' into 12740-static-account	7 years ago
Carlos Matallín	c57135db09	copy carto-node	7 years ago
Carlos Matallín	71e3430ee1	restore carto-node copy	7 years ago
Carlos Matallín	46966f27aa	static profile wip	7 years ago
Carlos Matallín	d56bf878ba	linter	7 years ago
Carlos Matallín	c9d0dd8fe8	flash message specs, duplicate orgganization flash	7 years ago
Carlos Matallín	b985157c6b	vendor script view specs	7 years ago
Carlos Matallín	5baa6361e0	restore editor browser tests	7 years ago
Carlos Matallín	ec69e69869	Merge branch '12674-static-profile' into 12740-static-account	7 years ago
Carlos Matallín	fd53bc71dc	Merge branch '12673-static' into 12674-static-profile	7 years ago
Carlos Matallín	4f97505785	Merge branch '12667-migrate-rails-js' into 12673-static	7 years ago
Carlos Matallín	12a5a47b10	Merge branch '12606-carto-node' into 12667-migrate-rails-js	7 years ago
Carlos Matallín	1e7d9c9e25	bump dependencies	7 years ago
Carlos Matallín	708894e0fc	linter	7 years ago
Carlos Matallín	5227db0837	Merge branch '12674-static-profile' into 12740-static-account	7 years ago
Carlos Matallín	25cd95403c	Merge branch '12673-static' into 12674-static-profile	7 years ago
Carlos Matallín	06c5fa200e	Merge branch '12667-migrate-rails-js' into 12673-static	7 years ago
Carlos Matallín	aad9927a17	linter	7 years ago
Carlos Matallín	e4eed7c7c2	Merge branch '12606-carto-node' into 12667-migrate-rails-js	7 years ago
Carlos Matallín	c8f6ffe2aa	linter	7 years ago
Carlos Matallín	53c7d4a8f6	Merge branch '12673-static' into 12674-static-profile	7 years ago
Carlos Matallín	67b6b74e0a	es6 changes	7 years ago
Carlos Matallín	9c231f20ed	static account, me extra fields	7 years ago
Carlos Matallín	467ee89c97	Merge branch '12674-static-profile' into 12740-static-account	7 years ago
Carlos Matallín	d9d337358f	Merge branch '12673-static' into 12674-static-profile	7 years ago
Carlos Matallín	837871276e	Merge branch '12667-migrate-rails-js' into 12673-static	7 years ago
Carlos Matallín	7c886dbeb9	Merge branch '12606-carto-node' into 12667-migrate-rails-js	7 years ago
Carlos Matallín	546ee60458	Merge branch '12599-me-endpoint' into 12606-carto-node	7 years ago
Carlos Matallín	a97c281876	static account, wip	7 years ago
Carlos Matallín	0b2e582ee1	Merge branch '12674-static-profile' into 12740-static-account	7 years ago
Carlos Matallín	66c6d18240	Merge branch '12673-static' into 12674-static-profile	7 years ago
Carlos Matallín	d037de6460	remove dup dependencies	7 years ago
Ivan Malagon	78399877ae	Remove colors dependency	7 years ago
Ivan Malagon	f0910ae74b	Add protocol replacement script	7 years ago
Carlos Matallín	6e44f18446	static account	7 years ago
Carlos Matallín	1dbda5d071	remove dashboard styles	7 years ago
Carlos Matallín	93b8cc3bf7	static profile	7 years ago
Carlos Matallín	40e7fc4b5c	revert browserify·	7 years ago
Carlos Matallín	7e93716ce8	Merge branch '12673-static' into 12674-static-profile	7 years ago
Carlos Matallín	9f3216e609	Merge branch '12606-carto-node' into 12667-migrate-rails-js	7 years ago
Carlos Matallín	4e2fcd849c	Merge branch '12599-me-endpoint' into 12606-carto-node	7 years ago
Carlos Matallín	9907ae28ac	Merge branch 'master' into 12673-static	7 years ago
Román Jiménez	4a715b293c	explicitely append torque.js before wizards	7 years ago
Carlos Matallín	8855f80b7c	static, profile wip	7 years ago
Carlos Matallín	d1d1235e3e	static: profile, wip	7 years ago
Carlos Matallín	48069af08f	static profile, wip	7 years ago
nobuti	d3e6af6506	Clean warning from tests. ... Move them to webpack.config.dev.	7 years ago
Román Jiménez	bfd0dbe41b	switch back to phantomjs until we have ci chrome	7 years ago
Carlos Matallín	3349733320	Merge branch '12667-migrate-rails-js' into 12673-static	7 years ago
Carlos Matallín	fe0507cd1a	Merge branch '12606-carto-node' into 12667-migrate-rails-js	7 years ago
Carlos Matallín	6663958c67	babel Object.assign	7 years ago
Carlos Matallín	e8fbcda471	Merge branch '12667-migrate-rails-js' into 12673-static	7 years ago
Carlos Matallín	3717636fc3	Merge branch '12606-carto-node' into 12667-migrate-rails-js	7 years ago
Carlos Matallín	a103b4fa63	webpack	7 years ago
Carlos Matallín	d33c28666c	Merge branch '12667-migrate-rails-js' into 12673-static	7 years ago
Carlos Matallín	650ae164f3	Merge branch '12606-carto-node' into 12667-migrate-rails-js	7 years ago
Román Jiménez	f7faa7f43d	disable method depending on environment using webpack	7 years ago
Carlos Matallín	5931c8f8d6	carto-node: tests, mock requests	7 years ago
Carlos Matallín	92fbc11c05	move carto-node to cartodb3	7 years ago
Román Jiménez	09c9a11047	report tests slower than 2 seconds	7 years ago
Carlos Matallín	23e26e6f65	add webpack config for dashboard static view	7 years ago
Carlos Matallín	1de75d070a	migrate rails views to js templates	7 years ago
Román Jiménez	c3270861f0	run tests with headless chrome	7 years ago
Román Jiménez	d76a165efe	Increase timeout to 20 seconds (previously 10)	7 years ago
nobuti	826f394001	Get rid of while loop error prone. ... Set verbosity for debugging.	7 years ago
Carlos Matallín	356187039c	add vendor css to watched files	7 years ago
Carlos Matallín	629a3f3c30	revert webpack 3	7 years ago
Carlos Matallín	7f7370479f	webpack resolve	7 years ago
Carlos Matallín	0d757a4cba	babel tangram in tests	7 years ago
Javier Álvarez Medina	29f82414fd	Adding carto logo image in the copy grunt task	7 years ago
Javier Álvarez Medina	81a57e4654	Resolving conflicts	7 years ago
Ivan Malagon	2a06dd0534	Add CSS watch	7 years ago
Román Jiménez	9630af68bc	remove video tutorials & link directly to our learn platform: ... map_templates are simpler now, they only require a description, a URL and an icon. icon has to be on assets/images/layout/map_templates with extension svg	7 years ago
Carlos Matallín	8b127ae438	back to inlined sourcemap	7 years ago
Carlos Matallín	6466d3d7ee	sass editor3 directly so editor3.css.map resolves	7 years ago
Carlos Matallín	7a198780cf	split common_editor_3	7 years ago
Carlos Matallín	4d69afd61d	editor3 sourcemaps	7 years ago
Carlos Matallín	e9642d9414	Merge branch '11962-assets-build-webpack' of github.com:CartoDB/cartodb into 11962-assets-build-webpack	7 years ago
Carlos Matallín	7a0f55b6ad	replace tpl-loader dependency origin	7 years ago
Carlos Matallín	4911a11607	add comment to pass jasmine tests in terminal	7 years ago
Carlos Matallín	d62446fa08	Merge branch 'cartoassets-entry-point' into 11962-assets-build-webpack	7 years ago
Javier Álvarez Medina	b7961da88d	Removing unnecessary clauses for DI and CARTO CSS library	7 years ago
Javier Álvarez Medina	d4d388c59e	Using last cartoassets changes	7 years ago
Javier Álvarez Medina	f49dfe2edf	Don't take perfect-scrollbar from its dependency, cartoassets will do it	7 years ago
nobuti	7b088ec48f	Merge branch 'master' into 11962-assets-build-webpack	7 years ago
Ivan Malagon	97e723eb2d	Merge branch 'master' into 12018-sql-function	7 years ago
Ivan Malagon	84b2bc70e4	Recovering missing tests	7 years ago
nobuti	f971f59d0f	Less verbose webpack in dev.	7 years ago
nobuti	5389092ef4	Merge branch 'master' into 11962-assets-build-webpack	7 years ago
Ivan Malagon	e1ddfa7753	Added mandatory spec	7 years ago
Javier Álvarez Medina	a20645a45f	Merge branch 'master' into 12066-safari-export-image	7 years ago
xavijam	2bd6a9df68	Uploading carto.png image to s3	7 years ago
xavijam	49fdd28179	Using carto logo with png and fixing IE export image	7 years ago
Carlos Matallín	bfd9fa6eda	move grunt test to webpack	8 years ago
Carlos Matallín	fce9cf2126	remove jasmine spec, wip	8 years ago
Ivan Malagon	aab77d251d	Fixing affected specs	8 years ago
Carlos Matallín	a137322a49	npm-webpack-build	8 years ago
Carlos Matallín	32ae842f32	sass editor-3	8 years ago
Carlos Matallín	816a2af3e4	builder => editor-3	8 years ago
Carlos Matallín	326ca56e81	watch css	8 years ago
Carlos Matallín	8986017184	split compass sass	8 years ago
xavijam	b321ca90d1	Renamed shrinkwrap dependencies 'helper'	8 years ago
xavijam	fb1e495bee	Removed unnecessary params for jasmine task	8 years ago
xavijam	1834b7d49d	Merge conflict solved	8 years ago
xavijam	df767d8113	Trying to fix old specs problems	8 years ago
Carlos Matallín	a085c17b5f	Merge branch 'master' into 11807-notifications	8 years ago
Ivan Malagon	3d469af3aa	Merge branch 'tests-refactor' of https://github.com/CartoDB/cartodb into tests-refactor	8 years ago