Commit b4d3ed88 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige uso de función ya inexistente en ámbito

See merge request redmic-project/client/templates!23
parents 873712e8 4d18c207

.gitignore

+2 −0
Original line number Diff line number Diff line 
node_modules

dist

*.tgz

*.log

.gitlab-ci.yml

+2 −3
Original line number Diff line number Diff line
@@ -14,10 +14,9 @@ build-package: 
    WEB_BUILD_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/web-build

    WEB_BUILD_IMAGE_TAG: latest

  before_script:

    - type yarn grunt

    - yarn install

    - type npm

  script:

    - grunt

    - npm install

  dependencies: []

  artifacts:

    name: ${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}

grunt/config/handlebars.js

+4 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ module.exports = function(grunt) { 
						ActivityInspireTheme: true,

						ActivityResources: true,

						ActivityStarred: true,

						OgcServiceProvider: true,

						ServiceOGCAttribution: true,

						ServiceOGCLegend: true,

						ServiceOGCImageList: true,
@@ -95,8 +96,10 @@ module.exports = function(grunt) { 
				, 'dist/ActivityTypeInfo.js': 'src/ActivityType/Info.hbs'

				, 'dist/ActivityTypeList.js': 'src/ActivityType/List.hbs'

				, 'dist/ActivityTypeDetails.js': 'src/ActivityType/Details.hbs'

				, 'dist/AnimalInfo.js': 'src/Animal/Info.hbs'

				, 'dist/AnimalList.js': 'src/Animal/List.hbs'

				, 'dist/AnimalListExpand.js': 'src/Animal/ListExpand.hbs'

				, 'dist/AnimalSpecimenTag.js': 'src/Animal/SpecimenTag.hbs'

				, 'dist/TrackingPrimaryList.js': 'src/Tracking/PrimaryList.hbs'

				, 'dist/TrackingSecondaryList.js': 'src/Tracking/SecondaryList.hbs'

				, 'dist/TrackingPlatformList.js': 'src/Tracking/PlatformList.hbs'
@@ -170,6 +173,7 @@ module.exports = function(grunt) { 
				, 'dist/WormsList.js': 'src/Worms/List.hbs'

				, 'dist/AtlasSecondaryList.js': 'src/Atlas/SecondaryList.hbs'

				, 'dist/AtlasList.js': 'src/Atlas/List.hbs'

				, 'dist/AtlasMixedList.js': 'src/Atlas/MixedList.hbs'

				, 'dist/AtlasPrimaryList.js': 'src/Atlas/PrimaryList.hbs'

				, 'dist/AtlasRedpromarSecondaryList.js': 'src/Atlas/RedpromarSecondaryList.hbs'

				, 'dist/DomainList.js': 'src/Domain/List.hbs'
@@ -179,7 +183,6 @@ module.exports = function(grunt) { 


				, 'dist/StatisticsList.js': 'src/Statistics/List.hbs'

				, 'dist/NotificationList.js': 'src/Notification/List.hbs'

				, 'dist/StatisticsTitle.js': 'src/Statistics/Title.hbs'



				, 'dist/SpecimenTagSet.js': 'src/SpecimenTag/Set.hbs'

				, 'dist/RecoverySet.js': 'src/Recovery/Set.hbs'

package-lock.json

0 → 100644
+2078 −0

File added.

Preview size limit exceeded, changes collapsed.

package.json

+8 −4
Original line number Diff line number Diff line 
{

  "name": "@redmic-project/templates",

  "version": "0.26.0",

  "version": "0.27.0",

  "author": "REDMIC",

  "homepage": "https://gitlab.com/redmic-project/client/templates/blob/master/README.md",

  "description": "Handlebars templates for REDMIC",
@@ -18,8 +18,12 @@ 
    "type": "git",

    "url": "https://gitlab.com/redmic-project/client/templates.git"

  },

  "scripts": {

    "preinstall": "type grunt",

    "postinstall": "grunt build"

  },

  "devDependencies": {

    "glob": "10.4.1",

    "glob": "11.0.0",

    "grunt": "1.6.1",

    "grunt-contrib-clean": "2.0.1",

    "grunt-contrib-copy": "1.0.0",
@@ -28,8 +32,8 @@ 
  },

  "files": ["dist"],

  "engines": {

    "node": ">=16.0",

    "npm": ">=8.19"

    "node": ">=20.16",

    "npm": ">=10.8"

  },

  "license": "Apache-2.0"

}