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

848 Commits

Author SHA1 Message Date
Arturo Gonzalez 474957249b Added correct button declaration 2017-06-07 10:29:01 +02:00
enriquecd ced8050317 Decode html entities in module plugin selector for edit bulk operation - #959 2017-06-05 12:50:22 +02:00
vgilc 3aa4fc7315 Merge branch '943-header-refresh-no-stops-in-events-view-dev' into 'develop' 
Removed old code that breaks the autorefresh pause

See merge request !538
 2017-06-01 09:32:42 +02:00
vgilc 1d6747c353 Merge branch '807-module-massive-operations-with-tag-filter-dev' into 'develop' 
807 module massive operations with tag filter dev

See merge request !476
 2017-05-31 17:42:09 +02:00
Arturo Gonzalez 4ba94f065e Removed old code that breaks the autorefresh pause 2017-05-31 16:40:10 +02:00
artu30 a78b5cc60d Merge branch 'develop' into '777-translations-dev' 
# Conflicts:
#   pandora_console/godmode/update_manager/update_manager.offline.php
#   pandora_console/include/functions_update_manager.php
 2017-05-22 17:51:21 +02:00
artu30 b5d3893c41 Merge branch 'develop' into '836-fixed-margin-top-images-in-vc-lines-open-dev' 
# Conflicts:
#   pandora_console/include/javascript/pandora_visual_console.js
 2017-05-22 17:38:49 +02:00
Arturo Gonzalez f58a9151f7 Fixed bad merge, thx branches 2017-05-22 17:37:21 +02:00
Arturo Gonzalez 309e9e900e Added margin top value to images when have lines 2017-05-22 17:31:29 +02:00
vgilc 4cee2eaea8 Merge branch '836-bad-parents-line-position-in-visual-console-dev' into 'develop' 
836 bad parents line position in visual console dev

See merge request !448
 2017-05-17 17:48:53 +02:00
Arturo Gonzalez d49f1f9916 Added tags filter to mosule massive operations (agent selection first) 2017-05-17 10:41:30 +02:00
Arturo Gonzalez 0346b49f1e Fixed jquery request 2017-05-16 10:42:41 +02:00
Arturo Gonzalez 6f40069aa9 Added a new system to draw lines in visual console when element have an image 2017-05-09 17:29:17 +02:00
Arturo Gonzalez eb1dafe807 Fixed lines in visual console 2017-05-09 12:40:22 +02:00
Arturo Gonzalez ba312476e3 Changed help section in cascade protection help button and fixed help language. 2017-04-27 15:49:23 +02:00
Arturo Gonzalez 6aab4e60ae Added buttons text to translate them 2017-04-26 09:50:42 +02:00
vgilc 1e5cf2d44e Merge branch '409-change-font-size-of-map-gis' into 'develop' 
Gis Maps Feature: When scrolling in map, change font-size of labels.

See merge request !360
 2017-04-25 16:27:37 +02:00
enriquecd 7f927bfdd3 Change strings in minor release update manager / open / 2 - #486 2017-04-24 13:14:14 +02:00
vgilc 41e30eb39b Merge branch '546-widgets-de-dashboard-open' into 'develop' 
Resolve jquery library bug (holagram dashboard) - #546

See merge request !289
 2017-04-18 16:01:22 +02:00
m-lopez-f f8d3c8804e Gis Maps Feature: When scrolling in map, change font-size of labels. 2017-04-10 17:46:32 +02:00
Arturo Gonzalez 640fee4b82 Added lost url to um open online 2017-04-05 16:23:30 +02:00
Arturo Gonzalez 629439f271 Added some modifications to adapt um and rr in meta 2017-04-05 10:26:12 +02:00
vgilc 3f27e0a306 Revert "Merge branch 'remove-traces-debug' into 'develop'" 
This reverts merge request !266
 2017-04-04 13:48:11 +02:00
vgilc 6b2cdb9784 Merge branch 'remove-traces-debug' into 'develop' 
remove debug console.log traces.

See merge request !266
 2017-04-04 13:47:41 +02:00
Arturo Gonzalez 12203f9c2b Added time improvements to networkmaps 2017-04-03 14:20:11 +02:00
vgilc 6fbd8b9978 Merge branch '673-674-networkmap_visual_changes' into 'develop' 
Added visual changes to module nodes in networkmap and added a new option to change the node name

See merge request !334
 2017-04-03 13:53:17 +02:00
enriquecd 3d89007adb Reposition of footer after load ajax elements in networkmap dialog - #112 2017-03-31 14:16:52 +02:00
Arturo Gonzalez 5f29a8f831 Added visual changes to module nodes in networkmap and added a new option to change the node name 2017-03-31 13:18:28 +02:00
Arturo Gonzalez a67d40a447 Added a few modifications to move the footer when nodes table is too long and recolocate interface text with every movement to see it well 2017-03-30 15:56:00 +02:00
Arturo Gonzalez a8b7f055f4 Added a lot of changes to networkmaps 2017-03-28 14:37:40 +02:00
Arturo Gonzalez bcb8968bec Added a few modifications to networkmaps 2017-03-28 11:32:58 +02:00
Arturo Gonzalez a0d9ddd8e6 Added some changes to networkmap 2017-03-27 17:55:17 +02:00
Arturo Gonzalez 27e8ddcdaf Added AMA edges to list of links with the same parent and children 2017-03-27 16:37:26 +02:00
Arturo Gonzalez 311143067a Fixed identical text to multiple links delimiter 2017-03-27 16:28:24 +02:00
Arturo Gonzalez 9512d61e16 Added interface text to add i.link or u.link 2017-03-27 16:03:25 +02:00
Arturo Gonzalez 949fbc3660 Added the second interface text 2017-03-27 15:33:27 +02:00
Arturo Gonzalez fc7afffb2c Added curved lines to networkmap to support more than 1 MM edges between the same node 2017-03-27 14:28:11 +02:00
Arturo Gonzalez 2c3412a8a2 Init to show all mm links (between the same agent) 2017-03-24 12:47:28 +01:00
Arturo Gonzalez 277a3b656d Fixed mr and um mix in um online open 2017-03-24 11:22:30 +01:00
enriquecd e2567f7b6a Resolve jquery library bug (holagram dashboard) - #546 2017-03-22 12:06:29 +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