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

808 Commits

Author SHA1 Message Date
Arturo Gonzalez 277a3b656d Fixed mr and um mix in um online open 2017-03-24 11:22:30 +01:00
Arturo Gonzalez 6731eb7da4 Fixed async error 2017-03-21 15:13:04 +01:00
Arturo Gonzalez 8ae921402c Added mr folder cleaner 2017-03-21 14:48:12 +01:00
Arturo Gonzalez b64afb7d6f Added a few changes to um and rr 2017-03-21 10:39:39 +01:00
Arturo Gonzalez c9fd56df75 Fixed errors in um online open 2017-03-17 14:22:04 +01:00
Arturo Gonzalez 8fc433f2a8 Added code to control the ocassional errors 2017-03-17 14:13:45 +01:00
Arturo Gonzalez 750203033f Added minor fixes to um open 2017-03-17 14:05:53 +01:00
Arturo Gonzalez 89727824a4 Fixed error in um online open 2017-03-17 13:56:38 +01:00
Arturo Gonzalez aebbc783df Added changes to um online open to integrate mr 2017-03-17 13:27:06 +01:00
Arturo Gonzalez 011517f61d Fixed "cancel" text in offline um dialogs 2017-03-17 11:29:31 +01:00
daniel 060e8f1ddc merge develop 2017-03-17 10:12:53 +01:00
Arturo Gonzalez 25fb6bd894 Added minor fixes to rr 2017-03-17 09:57:10 +01:00
Arturo Gonzalez 5a1192c412 Added more changes to um online open with mr 2017-03-17 09:19:55 +01:00
Arturo Gonzalez ff596fa797 Added a lot of changes in update manager online open to integrate with mr 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 5f72dbafcc Debug UM and RR system 2017-03-17 09:19:55 +01:00
Arturo Gonzalez e7b811c39d Fixed error in um offline oum path to get mrs. 2017-03-17 09:02:40 +01:00
Arturo Gonzalez e713b843dc Added a message whe system have a mr pending 2017-03-16 19:18:42 +01:00
Arturo Gonzalez 831b5e2c7d Added a lot of modifications to integrate mr with um 2017-03-16 19:14:33 +01:00
Arturo Gonzalez 01b9572edc Added more changes to um online open with mr 2017-03-16 18:23:07 +01:00
Arturo Gonzalez b9702a5b00 Added a lot of changes in update manager online open to integrate with mr 2017-03-16 18:07:19 +01:00
Arturo Gonzalez 51cd53b3b3 Debug UM and RR system 2017-03-16 10:46:41 +01:00
daniel e252135979 merge develop 2017-03-15 17:09:40 +01:00
Arturo Gonzalez d9d01a453a Added a last modifications to um offline and online open 2017-03-15 13:53:44 +01:00
Arturo Gonzalez 0db1dc50c7 Added a lot of code to um offline and online open. 2017-03-15 13:20:05 +01:00
daniel a87839bd07 login page 2017-03-15 10:12:18 +01:00
Daniel Maya f4350aed6b Ticket 477. Fixed some bug in the visual console 2017-03-14 15:54:46 +01:00
Arturo Gonzalez 6aa97917f2 Added new verification when mr filename is wrong. Ticket #510 2017-03-14 15:20:22 +01:00
Arturo Gonzalez be6cc9ea79 Added the last dialog to um. Ticket #486 2017-03-14 13:52:29 +01:00
Arturo Gonzalez 36fda7a23d Added interface modules to db (to next relations with this interfaces) 2017-03-14 12:24:37 +01:00
Arturo Gonzalez cb84e69ada Added warning img to mr advice. Ticket #486 2017-03-14 10:48:29 +01:00
Arturo Gonzalez 73c31012d9 Added new visual styles to um and rr systems. Ticket #486 2017-03-14 10:36:10 +01:00
artu30 7bca59dee1 Merge branch 'move_mr_to_um' into 'develop' 
Move mr to um

See merge request !249
 2017-03-13 16:45:54 +01:00
Arturo Gonzalez 6a39147940 Added rr to um offline. Ticket #510 2017-03-13 16:30:04 +01:00
Arturo Gonzalez 44ac96ae5e Added mr to um menu (online open and enterprise). Ticket #510 2017-03-13 15:52:30 +01:00
enriquecd 0094cfa9bf Center alert modal window when is opened - #93 2017-03-13 13:25:16 +01:00
Arturo Gonzalez 46b008708c Move mr to um section 2017-03-10 14:01:24 +01:00
m-lopez-f 8de4984faf Fixed dialog of system warning alerts. Gitlab: #506 2017-03-09 15:40:59 +01:00
m-lopez-f baf16db154 Fixed problems with bulk delete alerts opertation. Gitlab: #492 2017-03-09 11:40:32 +01:00
Arturo Gonzalez 1b1ab69edc Fixed holding area checking 2017-03-08 13:25:13 +01:00
Arturo Gonzalez 8bae65b4a2 Fixed gis map agents name when refresh map. Ticket #395 2017-03-01 09:20:28 +01:00
Arturo Gonzalez 2d3d82001e Fixed some things to networkmaps. Ticket #406 2017-02-28 12:51:24 +01:00
Daniel Maya 742f487d72 Change to alias in treeview 2017-02-27 15:06:24 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
Arturo Gonzalez 03f2250ffa Removed weird alerts in networkmap. 2017-02-20 16:35:32 +01:00
Daniel Maya 3051ce4e23 Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-02-17 10:11:59 +01:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
 2017-02-16 16:05:21 +01:00
Arturo Gonzalez 928689ef3b Added some modifications in networkmaps fonts. Ticket #270 2017-02-16 15:05:44 +01:00
Arturo Gonzalez 5cce7ac2d0 Fixed interface links editor in networkmaps. Ticket #260 2017-02-15 10:29:45 +01:00
Arturo Gonzalez c6dbf7c3b5 Added some modifications to node links. Ticket #260 2017-02-14 12:40:57 +01:00
Arturo Gonzalez 0c4f90d252 Node details improvements. Ticket #78 References ticket(s): #78 2017-02-14 09:52:11 +01:00