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

546 Commits

Author SHA1 Message Date
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Jose Gonzalez c5888b1d1a Added control for favourites filter in TreeService class 2020-03-11 15:00:35 +01:00
Daniel Maya 363b3e8a80 Changed pandora fms by product name 2020-02-10 16:21:04 +01:00
Luis 56a2970755 Ent 5112 error nodos ficticios widget mapa red 2020-02-06 14:32:43 +01:00
Daniel Rodriguez e6a5d7986f Merge branch 'ent-5376-Inyecciones-SQL-vistas-por-Nokia-USA' into 'develop' 
Fixed % with sprintf

See merge request artica/pandorafms!3039
 2020-02-04 13:14:55 +01:00
Daniel Rodriguez 8b60daa9ba Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop' 
fix module string data with html special chars breaking html in page

See merge request artica/pandorafms!3042
 2020-02-04 10:10:07 +01:00
alejandro-campos 73f3dfac85 fix module string data with html special chars breaking html in page 2020-01-31 11:53:42 +01:00
Daniel Maya 891c517611 Fixed % with sprintf 2020-01-30 13:02:33 +01:00
Daniel Barbero Martin 89e83e38e0 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2020-01-21 08:28:00 +01:00
Daniel Barbero Martin 4a1801bc50 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 08:04:18 +01:00
Alejandro Campos 6dbe75169f Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-15 14:37:00 +01:00
Tatiana Llorente 28b585196b Ent 5099 dobles interfaces en mapas de red no se visualizan 2020-01-15 14:11:36 +01:00
Alejandro Campos dcd2aae3c5 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-14 10:28:55 +01:00
Daniel Barbero Martin 14e4e37c2a Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-10 08:09:13 +01:00
Daniel Rodriguez 1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop' 
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
 2020-01-09 16:46:58 +01:00
Daniel Barbero a933a091ea styles fixed 2020-01-09 12:07:19 +01:00
Daniel Barbero b40f5b17c1 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-09 09:43:57 +01:00
Daniel Rodriguez c30e9eb1fe Merge branch 'ent-4980-No-cambia-el-Shape-de-los-fictional-nodes-de-Circle-a-Square-Rhombus-en-un-mapa-de-red' into 'develop' 
Ent 4980 no cambia el shape de los fictional nodes de circle a square rhombus en un mapa de red

See merge request artica/pandorafms!2896
 2020-01-08 11:33:27 +01:00
Daniel Barbero Martin c4f0305f9b Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-08 08:29:59 +01:00
Alejandro Campos 0468c85a4d Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
 2020-01-07 12:00:27 +01:00
Daniel Rodriguez 1ced09986e Merge branch 'ent-5212-ventana-de-bienvenida-open' into 'develop' 
Minor fix - opensource welcome icon

See merge request artica/pandorafms!2983
 2020-01-07 09:38:20 +01:00
Daniel Barbero Martin 5e008e684d Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-02 17:45:52 +01:00
Alejandro Fraguas ebe6e1109c Merge branch 'ent-4467-barra-de-busqueda-como-interprete-de-ordenes' into 'develop' 
Ent 4467 barra de busqueda como interprete de ordenes

See merge request artica/pandorafms!2934
 2019-12-26 11:10:53 +01:00
marcos 04ed92523a changed token VW to VR 2019-12-26 10:29:26 +01:00
Alejandro Fraguas 935d246a0d Merge branch 'ent-5162-9263-Notificaciones-infinitas' into 'develop' 
removed newsletter notification from messages list

See merge request artica/pandorafms!2978
 2019-12-23 10:49:04 +01:00
fbsanchez 9ee102b365 already used ui_get_full_url 2019-12-19 20:02:29 +01:00
fbsanchez abf4097e63 Minor fix - opensource welcome icon 2019-12-19 19:58:00 +01:00
marcos 43d08f354a Ajustes CSS 2019-12-19 16:53:45 +01:00
marcos 87405ba318 add message no resoult found 2019-12-19 14:20:31 +01:00
marcos e06c974e67 add acl's to order interpreter 2019-12-19 14:10:43 +01:00
alejandro-campos c3daa7e803 removed newsletter notification from messages list 2019-12-19 10:42:41 +01:00
Daniel Barbero 2a92c9d38d Fixed errors VC forms 2019-12-17 10:57:19 +01:00
marcos de161d830c add Traducction 2019-12-13 14:46:47 +01:00
marcos 3008651b65 add < list 2019-12-13 14:43:30 +01:00
marcos 4e712d1a45 fixed error 2019-12-13 14:25:33 +01:00
marcos 90d0be6ff1 fixed error 2019-12-13 14:22:50 +01:00
marcos 480673521c Can select with keyboard list items 2019-12-13 14:08:44 +01:00
marcos 6a5dfb5ec9 refactor code 2019-12-12 17:16:09 +01:00
Daniel Barbero 63dd3c48f8 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2019-12-12 16:32:32 +01:00
marcos 1f3fc1f908 add more pages in order interpreter 2019-12-12 16:27:11 +01:00
fbsanchez ede4cedf62 Fix networkmap module key assignment 2019-12-11 16:42:50 +01:00
Daniel Rodriguez f9c4a826d5 Merge branch 'ent-4982-Tree-View-Module-groups' into 'develop' 
Added Group by in tree view

See merge request artica/pandorafms!2903
 2019-12-10 13:46:27 +01:00
vgilc 7db5f8b9b1 Merge branch 'ent-4887-service-tree-view-no-carga' into 'develop' 
Solved issue with query

See merge request artica/pandorafms!2858
 2019-12-10 11:46:17 +01:00
alejandro-campos 5880bec88a changes in module data formatting when printed across the application and new setup options 2019-12-05 17:41:44 +01:00
marcos 1430e6ee11 Update orderinterpreter class and css 2019-12-05 16:10:31 +01:00
marcos fbb1e53362 update orderinterpreter 2019-12-04 17:28:03 +01:00
marcos 1f97fcef40 update css and preg_match 2019-12-03 18:31:13 +01:00
marcos 7eec91b946 Show result in normal window 2019-12-03 18:19:32 +01:00
marcos 14b8379ccb ajax call, controller, class, match result, return array inputs(example to return) 2019-12-03 15:11:16 +01:00
marcos d4720c2260 add firts changes 2019-12-03 13:59:03 +01:00