tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-19 08:48:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
35,333 Commits 34 Branches 30 Tags
Commit Graph

1463 Commits

Author SHA1 Message Date
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
Daniel Barbero Martin
e6afe84940 Fixed pdf 2019-11-27 15:22:39 +01:00
daniel
960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
Daniel Maya
791454ee87 Added Group by in tree view 2019-11-21 10:22:51 +01:00
Tatiana Llorente
5dc9843e89 Fixed bug with shape in fictional nodes in network maps 2019-11-19 16:53:12 +01:00
Alejandro Fraguas
27bdf04735 Merge branch 'ent-4774-welcome-to-pandorafms' into 'develop' 
first changed to welcome window

See merge request artica/pandorafms!2822
 2019-11-14 16:05:22 +01:00
Alejandro Fraguas
0199c6312a Merge branch 'ent-4752-Herramientas-de-diagnostico' into 'develop' 
refactoriced diagnostics pandoraFMS

See merge request artica/pandorafms!2809
 2019-11-14 11:49:23 +01:00
Daniel Barbero Martin
750e6e789c fixed minor error 2019-11-14 09:58:10 +01:00
Daniel Barbero Martin
879884e6c3 fixed errors 2019-11-14 09:52:56 +01:00
Daniel Barbero Martin
86162b4c66 fixed errors 2019-11-14 08:53:45 +01:00
Daniel Barbero Martin
42fc81a408 fixed errors 2019-11-13 17:50:22 +01:00
fbsanchez
65d02d4529 Merge remote-tracking branch 'origin/ent-EDF' into ent-4774-welcome-to-pandorafms 2019-11-13 17:40:45 +01:00
fbsanchez
345eb48fd7 save the green lines 2019-11-13 17:38:48 +01:00
fbsanchez
83590146b1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 2019-11-13 17:38:24 +01:00
Daniel Barbero Martin
8645b01828 fixed errors 2019-11-13 16:43:32 +01:00
Daniel Barbero Martin
a0db941b1e fixed errors 2019-11-13 15:52:09 +01:00
fbsanchez
6677b6a5ab hide report in welcomewindow if not enterprise customer 2019-11-13 14:32:34 +01:00
Daniel Rodriguez
f844c660af Merge branch 'ent-4766-feedback-de-ayudas' into 'develop' 
add feedback

See merge request artica/pandorafms!2813
 2019-11-13 13:43:08 +01:00
fbsanchez
b11dbc639f Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 
Conflicts:
	pandora_console/general/header.php
 2019-11-13 12:20:29 +01:00
Daniel Barbero Martin
7103317bc2 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/styles/pandora.css
 2019-11-13 12:12:17 +01:00
Daniel Barbero Martin
fa6bc254a1 Fixed errors 2019-11-12 16:22:58 +01:00
fbsanchez
b9633933e1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/general/header.php
 2019-11-12 14:17:45 +01:00
fbsanchez
53954ec853 Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 14:26:23 +01:00
fbsanchez
0c5af7ea24 minor fixes 2019-11-11 13:46:42 +01:00
fbsanchez
0b610cd8ba Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-11 13:39:08 +01:00
fbsanchez
430af38fa6 minor fixes in flow control 2019-11-11 13:38:27 +01:00
fbsanchez
cf0a06f216 Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF 2019-11-07 19:41:36 +01:00
fbsanchez
36ae77a33c minor fix 2019-11-07 19:41:23 +01:00
fbsanchez
a8bdb68cac Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF 2019-11-07 19:40:23 +01:00
fbsanchez
4905b18888 Fulfill help path and mail check 2019-11-07 19:39:50 +01:00
fbsanchez
c4779f6f91 Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF 2019-11-07 18:33:51 +01:00
fbsanchez
cb131c7895 Some CDE and styling in help feedback 2019-11-07 18:33:03 +01:00
fbsanchez
763ec6772c Help feedback style improved 2019-11-07 17:26:32 +01:00
fbsanchez
ef14de075e Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF 2019-11-07 14:06:07 +01:00