Daniel Rodriguez
|
05cd8142bf
|
Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
wip integration integriaIMS pandora_enterprise#11471
Closes pandora_enterprise#11471
See merge request artica/pandorafms!6131
|
2023-09-28 10:05:15 +00:00 |
daniel
|
f46626e120
|
refactor cluster view pandora_enterprise#12032
|
2023-09-21 10:21:45 +02:00 |
|
daniel
|
09bcedde62
|
ITSM pandora_enterprise#11471
|
2023-09-14 16:36:52 +02:00 |
|
daniel
|
a059f18b4b
|
ITSM pandora_enterprise#11471
|
2023-09-04 16:36:58 +02:00 |
|
daniel
|
1a1087e311
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/66.sql
|
2023-09-04 08:16:48 +02:00 |
|
Daniel Rodriguez
|
aac8aa43fd
|
Merge branch 'ent-11216-clonar-widget' into 'develop'
Ent 11216 clonar widget
See merge request artica/pandorafms!6222
|
2023-09-01 07:05:11 +00:00 |
|
daniel
|
ecfa71b43c
|
ITSM pandora_enterprise#11471
|
2023-08-25 14:15:32 +02:00 |
|
daniel
|
b1c662da67
|
ITSM pandora_enterprise#11471
|
2023-08-14 14:19:09 +02:00 |
|
daniel
|
64c7f56235
|
ITSM pandora_enterprise#11471
|
2023-08-14 10:59:56 +02:00 |
|
daniel
|
f0d78a44d1
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
|
2023-08-11 14:32:54 +02:00 |
|
daniel
|
dbf98689c2
|
ITSM pandora_enterprise#11471
|
2023-08-11 14:30:18 +02:00 |
|
daniel
|
7f82273dc4
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/65.sql
|
2023-08-09 08:59:01 +02:00 |
Daniel Cebrian
|
131f78e21e
|
#11682 fixed special days calendar
|
2023-08-08 18:04:30 +02:00 |
|
Daniel Cebrian
|
a72309ffa9
|
Merge branch 'develop' into ent-11682-no-se-configuran-las-listas-de-dias-especiales
|
2023-08-08 17:35:34 +02:00 |
|
Daniel Cebrian
|
c45b9fb541
|
Merge branch 'develop' into ent-11682-no-se-configuran-las-listas-de-dias-especiales
|
2023-08-08 17:30:16 +02:00 |
|
Daniel Cebrian
|
043e92afe2
|
#11682 fixed error sql in special day when group is empty
|
2023-08-07 09:06:50 +02:00 |
Rafael Ameijeiras
|
507c91ab1e
|
Merge branch 'ent-11683-faltan-opciones-en-las-listas-de-dias-especiales' into 'develop'
Ent 11683 Faltan opciones en las listas de días especiales
See merge request artica/pandorafms!6221
|
2023-08-02 12:01:07 +00:00 |
Pablo Aragon
|
ccf124103d
|
11135-Move js code from ui_print_datatable. Resolve conflict
|
2023-07-24 10:46:19 +02:00 |
|
daniel
|
1bf7f1e36e
|
ITSM pandora_enterprise#11471
|
2023-07-21 14:23:42 +02:00 |
|
daniel
|
9a72d0740c
|
ITSM fixed pandora_enterprise#11471
|
2023-07-18 15:13:08 +02:00 |
|
daniel
|
0722cfca1a
|
ITSM fixed pandora_enterprise#11471
|
2023-07-14 15:42:35 +02:00 |
|
daniel
|
c2297052c1
|
ITSM dashboard pandora_enterprise#11471
|
2023-07-11 15:55:10 +02:00 |
miguel angel rasteu
|
6d848b9fd3
|
#11216 Duplicate widget
|
2023-07-07 12:25:49 +02:00 |
|
Daniel Cebrian
|
aac6e147dc
|
#11683 fixed buttons in calendar
|
2023-07-06 17:22:49 +02:00 |
|
daniel
|
64c8086854
|
wip integration integriaIMS pandora_enterprise#11471
|
2023-06-29 09:45:44 +02:00 |
|
daniel
|
6e3eddff08
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-06-27 08:23:46 +02:00 |
Matias Didier
|
af33f168b6
|
Merge branch 'ent-11415-15702-no-existe-editor-html-al-configurar-el-widget-panel-con-un-mensaje' into 'develop'
Ent 11415 15702 no existe editor html al configurar el widget panel con un mensaje
See merge request artica/pandorafms!6003
|
2023-06-26 14:06:05 +00:00 |
|
miguel angel rasteu
|
7934551ff0
|
#11415 Fix tinymce editor html
|
2023-06-26 15:17:45 +02:00 |
|
daniel
|
d84299d3ab
|
wip api integration pandora #1355
|
2023-06-20 08:43:10 +02:00 |
|
daniel
|
e82c1e6881
|
wip integration integriaIMS pandora_enterprise#11471
|
2023-06-16 13:47:25 +02:00 |
|
miguel angel rasteu
|
db62a91cb6
|
#11476 Fix https url
|
2023-06-08 13:19:01 +02:00 |
|
miguel angel rasteu
|
1f8752ee63
|
#11476 Fix pandora url
|
2023-06-08 13:10:16 +02:00 |
|
miguel angel rasteu
|
64204b6ff7
|
#11476 Fix ascci art
|
2023-06-08 12:42:10 +02:00 |
|
miguel angel rasteu
|
933f69f2ab
|
#11476 Change copyright header
|
2023-06-08 11:53:13 +02:00 |
|
miguel angel rasteu
|
372ef844e7
|
#11415 Add html editor with tinymce
|
2023-05-31 12:17:05 +02:00 |
|
Pablo Aragon
|
886bde919b
|
11135-Move js code from ui_print_datatable
|
2023-05-08 14:25:57 +02:00 |
|
daniel
|
c0172afc3d
|
update composer
|
2023-04-10 16:38:37 +02:00 |
Jonathan
|
93966788eb
|
Slides require mesage
|
2023-03-31 09:51:48 +02:00 |
|
Jonathan
|
9635b4b721
|
Dashboard slides fix
|
2023-03-30 16:45:27 +02:00 |
|
Pablo Aragon
|
e03e1e45ed
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-30 12:26:06 +02:00 |
|
Pablo Aragon
|
5e24706f71
|
Style fix
|
2023-03-30 12:25:45 +02:00 |
|
Jonathan
|
ae58add6a9
|
Dashboard pure fix options
|
2023-03-30 12:18:16 +02:00 |
|
daniel
|
1262fee2e8
|
fixed styles
|
2023-03-30 08:43:23 +02:00 |
|
daniel
|
e7d08fe6d3
|
fixed styles
|
2023-03-29 14:48:47 +02:00 |
Diego Muñoz-Reja
|
35a1c2332d
|
Merge branch 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' into 'develop'
implemented consoles management
See merge request artica/pandorafms!5558
|
2023-03-28 15:33:37 +00:00 |
Alejandro Campos
|
e909686ddc
|
Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob'
# Conflicts:
# pandora_console/extras/mr/62.sql
|
2023-03-28 14:09:33 +00:00 |
|
daniel
|
19ddbdc30a
|
fixed styles
|
2023-03-28 08:34:05 +02:00 |
|
Jonathan
|
f8aefa6e34
|
Merge conflict solution
|
2023-03-27 08:31:00 +02:00 |
|
daniel
|
56e4770b93
|
fixed styles
|
2023-03-23 14:20:54 +01:00 |
|
daniel
|
95834b2de7
|
fixed styles
|
2023-03-23 12:41:39 +01:00 |