Merge branch 'dev' into 'master' (cd252c55) · Commits · REDMIC Project / Client / Style

.gitlab-ci.yml

+0 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ build-package:
		name: ${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}
		expire_in: 1 week
		paths:
		- node_modules/
		- dist/
		cache:
		paths:

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ module.exports = function(grunt) {
		});

		// Lee los ficheros con configuraciones para las tareas a ejecutar (propias o de terceros)
		glob.sync('./grunt/config/*.js').forEach(function(file) {
		glob.globSync('./grunt/config/*.js').forEach(function(file) {

		require(path.resolve(file))(grunt);
		});

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		# Style

		Styles of the REDMIC application

deleted100644 → 0

+0 −41

Original line number	Diff line number	Diff line
		module.exports = function(grunt) {

		grunt.registerTask('publishVersion',
		'Publica nueva versión (--ver=newVersion)',
		function() {

		var version = grunt.option('ver'),
		tagVersion = 'v' + version;

		if (!version) {
		console.log('Es necesario pasar el identificador de la nueva versión (--ver=newVersion)');
		return;
		}

		grunt.config('shell.editVersion', {
		options: {
		callback: function(err, stdout, stderr, cb) {

		err && console.error(stderr);
		cb();
		}
		},
		command: function() {

		return [
		'npm version ' + version,
		'git push'
		].join('&&');
		}
		});

		grunt.config('gitpush.publishVersion', {
		options: {
		verbose: true,
		branch: tagVersion
		}
		});

		grunt.task.run(['shell:editVersion', 'gitpush:publishVersion']);
		});
		};

+12 −13

Original line number	Diff line number	Diff line
		{
		"name": "@redmic-project/style",
		"version": "0.25.0",
		"version": "0.26.0",
		"author": "REDMIC",
		"homepage": "https://gitlab.com/redmic-project/client/style/blob/master/README.md",
		"description": "Estilos y recursos para REDMIC",
		"description": "Styles of the REDMIC application",
		"contributors": [
		{
		"name": "Pedro E. Trujillo Brito",
		@@ -19,21 +19,20 @@
		"url": "https://gitlab.com/redmic-project/client/style.git"
		},
		"devDependencies": {
		"alertifyjs": "1.13.1",
		"alertifyjs": "1.14.0",
		"animate.css": "4.1.1",
		"dijit": "1.17.3",
		"dojox": "1.17.3",
		"dropzone": "5.9.3",
		"font-awesome-stylus": "4.7.1",
		"glob": "8.0.3",
		"grunt": "1.5.3",
		"glob": "10.4.1",
		"grunt": "1.6.1",
		"grunt-contrib-clean": "2.0.1",
		"grunt-contrib-copy": "1.0.0",
		"grunt-contrib-cssmin": "4.0.0",
		"grunt-contrib-cssmin": "5.0.0",
		"grunt-contrib-stylus": "1.2.0",
		"grunt-git": "1.1.1",
		"grunt-shell": "4.0.0",
		"leaflet": "1.9.3",
		"grunt-shell": "3.0.1",
		"leaflet": "1.9.4",
		"leaflet-awesome-markers": "https://github.com/lennardv2/Leaflet.awesome-markers.git#2.0/develop",
		"leaflet-draw": "1.0.4",
		"leaflet-measure": "3.1.0",
		@@ -41,13 +40,13 @@
		"load-grunt-tasks": "5.1.0",
		"nib": "1.2.0",
		"prunecluster": "2.1.0",
		"stylus": "0.59.0",
		"stylus": "0.63.0",
		"webfont-dl": "0.2.0"
		},
		"files": ["dist", "yarn.lock"],
		"files": ["dist"],
		"engines": {
		"node": ">=14.0",
		"npm": ">=6.14"
		"node": ">=16.0",
		"npm": ">=8.19"
		},
		"license": "Apache-2.0"
		}