tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
33,602 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

33602 Commits

Author SHA1 Message Date
daniel 32bc7335ac fixed styles 2023-03-29 09:11:26 +02:00
daniel c610063244 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-29 08:33:02 +02:00
Jonathan a760bbfbc2 MIB Uploader fix delete icon 2023-03-29 08:22:35 +02:00
Jimmy Olano 5044c23ef3 Merge branch 'ent-9529-14208-definir-timezone-por-defecto-para-nuevos-usuarios' into 'develop', JJOS. 
Draft: Ent 9529 14208 definir timezone por defecto para nuevos usuarios

See merge request artica/pandorafms!5492
 2023-03-29 02:28:47 +00:00
artica 5113117a39 Auto-updated build strings. 2023-03-29 01:00:25 +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
daniel 2c0c213a01 Merge branch 'ent-9662-second-round' into 'develop' 
Ent 9662 second round

See merge request artica/pandorafms!5631
 2023-03-28 15:30:54 +00:00
daniel 86e492f275 fixed styles 2023-03-28 17:26:14 +02:00
Daniel Maya eac71560cb #10819 Fixed policy alert img 2023-03-28 17:22:25 +02:00
Pablo Aragon dab2a29b6b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-28 17:07:19 +02:00
Pablo Aragon ce014e4c6b Datatables. Treeview graph meta 2023-03-28 17:07:06 +02: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 0df3ad3ff3 fixed styles 2023-03-28 13:44:24 +02:00
Pablo Aragon c7cd688b4b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-28 12:39:32 +02:00
Pablo Aragon 5969928003 10408-Fix action column & 10398-Events pure mode 2023-03-28 12:39:02 +02:00
Jonathan 7a3e894bb0 Menu fix follow reports 2023-03-28 11:06:03 +02:00
Jonathan 53194f7c3d Reports visual changes 2023-03-28 11:04:52 +02:00
Daniel Maya 490e547202 #10699 Fixed central node 2023-03-28 11:03:59 +02:00
Daniel Maya 712da9070f #10699 Fixed maps 2023-03-28 10:45:41 +02:00
Jonathan 87946161f3 Solution conflict 2023-03-28 09:30:18 +02:00
Jonathan 81be0da7fd Module manager editor relations visual change 2023-03-28 09:17:47 +02:00
daniel 3d815d56c8 fixed styles 2023-03-28 08:45:40 +02:00
daniel 4e01838238 fixed styles 2023-03-28 08:43:46 +02:00
daniel 19ddbdc30a fixed styles 2023-03-28 08:34:05 +02:00
artica 061c9f8750 Auto-updated build strings. 2023-03-28 01:00:16 +02:00
daniel 8f77ecc064 Merge branch 'ent-9662-second-round' into 'develop' 
Ent 9662 second round

See merge request artica/pandorafms!5629
 2023-03-27 19:25:20 +00:00
daniel ebffb004e9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-27 21:22:06 +02:00
daniel 0461881420 fixed styles 2023-03-27 17:13:23 +02:00
Pablo Aragon 98f812b757 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-27 17:03:45 +02:00
Pablo Aragon 55ff0e0597 wux and wmi 2023-03-27 17:03:38 +02:00
Jonathan 52076a56c2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-27 16:26:28 +02:00
Jonathan e06fc2f115 Collection visual fix 2023-03-27 16:26:12 +02:00
Jimmy Olano a532b169a4 Merge branch 'ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500' into 'develop', JJOS. 
Draft: Ent 10665 version open edicion del propio usuario y gestion de usuarios devuelve error 500

See merge request artica/pandorafms!5597
 2023-03-27 13:07:07 +00:00
daniel 48a254c4b2 fixed styles 2023-03-27 14:34:05 +02:00
Jonathan ea6aa8629b Module check force 2023-03-27 14:07:36 +02:00
Daniel Cebrian fd9dfcf08f Merge branch 'develop' into 'ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500' 
# Conflicts:
#   pandora_console/install.php
 2023-03-27 11:01:24 +00:00
Diego Muñoz-Reja 6bdecc43e7 Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop' 
Ent 8642 nuevo widget heatmap

See merge request artica/pandorafms!5557
 2023-03-27 10:43:48 +00:00
Daniel Cebrian aeab39737b Merge branch 'develop' into ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500 2023-03-27 12:11:59 +02:00
Jonathan 3057e67d1f Merge conflict solution 2023-03-27 12:11:53 +02:00
daniel 3beec9bfab fixed styles 2023-03-27 11:47:08 +02:00
daniel af5f65a66d fixed styles 2023-03-27 11:14:58 +02:00
Jonathan 665976e011 Bulks masive visual action buttons 2023-03-27 11:10:51 +02:00
Matias Didier 2daea0e5c4 Merge branch 'ent-10764-favoritos-y-nuevos-menus' into 'develop' 
Ent 10764 favoritos y nuevos menus

See merge request artica/pandorafms!5618
 2023-03-27 09:01:48 +00:00
artica 78bc8e4f50 Updated version and build strings. 2023-03-27 09:41:48 +02:00
Jonathan 0ae7630714 Gis map fix view 2023-03-27 08:44:45 +02:00
Jonathan f8aefa6e34 Merge conflict solution 2023-03-27 08:31:00 +02:00
artica 75af4a2ca9 Auto-updated build strings. 2023-03-27 01:00:39 +02:00
artica 9528f59af9 Auto-updated build strings. 2023-03-26 01:00:17 +01:00
artica bcf3f1ba1f Auto-updated build strings. 2023-03-25 01:00:19 +01:00
daniel d95aef3778 Merge branch 'ent-9662-second-round' into 'develop' 
Ent 9662 second round

See merge request artica/pandorafms!5628
 2023-03-24 13:11:35 +00:00