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

14467 Commits

Author SHA1 Message Date
Daniel Maya f72f61c49e Added new functionality to create alerts on modules without alerts 2017-06-01 16:54:51 +02:00
vgilc bad1a72c69 Merge branch 'update-japanese-help' into 'develop' 
japanese help for cascade protection.

See merge request !474
 2017-05-31 11:30:30 +02:00
vgilc 55d94f386e Merge branch 'update-japanese-help-alert_macros' into 'develop' 
Update japanese help for alert macros.

See merge request !483
 2017-05-31 11:30:19 +02:00
vgilc d4a448e2db Merge branch 'update-japanese-translation' into 'develop' 
Update Japanese translations.

See merge request !515
 2017-05-31 11:29:41 +02:00
artica 619014733b Auto-updated build strings. 2017-05-31 00:01:19 +02:00
vgilc 854b3ea0b7 Merge branch '940-visual-changes-from-MR-in-meta-and-node-dev' into 'develop' 
Changed text in header when mr file is available

See merge request !532
 2017-05-30 17:18:26 +02:00
vgilc 8cc7489650 Merge branch '941-Added-lost-querys-to-migrate-dev' into 'develop' 
Added los querys to migrate

See merge request !533
 2017-05-30 15:41:59 +02:00
Arturo Gonzalez 47862600a4 Added los querys to migrate 2017-05-30 15:33:16 +02:00
Arturo Gonzalez fe7b4257f0 Changed text in header when mr file is available 2017-05-30 13:59:47 +02:00
artica 3b481af7d6 Updated version and build strings. 2017-05-30 11:22:26 +02:00
vgilc a66cfdf9b0 Merge branch '931-spanish-translations-dev' into 'develop' 
Changes spanish translations

See merge request !530
 2017-05-30 11:02:17 +02:00
Arturo Gonzalez ab86e62cd9 Changes spanish translations 2017-05-30 10:43:24 +02:00
artica 05c9b7c4da Auto-updated build strings. 2017-05-30 00:01:17 +02:00
vgilc f78288d556 Merge branch '930-reset-pass-translations-dev' into 'develop' 
Translations changed

See merge request !522
 2017-05-29 13:27:23 +02:00
Arturo Gonzalez a1063e9b50 Translations changed 2017-05-29 12:35:31 +02:00
vgilc 2664067813 Merge branch '635-moved-reset-password-token-in-setup-dev' into 'develop' 
Moved from ent to password

See merge request !521
 2017-05-29 12:31:24 +02:00
Arturo Gonzalez 9133f2edca Moved from ent to password 2017-05-29 12:20:07 +02:00
artica 0fe95248c1 Auto-updated build strings. 2017-05-29 00:01:13 +02:00
artica 63d3cefe0b Auto-updated build strings. 2017-05-28 00:01:12 +02:00
artica 5ca2065013 Auto-updated build strings. 2017-05-27 00:01:14 +02:00
Junichi Satoh b42bfb7793 Updated Japanese translations. 2017-05-26 18:03:05 +09:00
vgilc cca5f7d2ef Merge branch '922-fallo-en-menú-con-perfil-Operator-Read' into 'develop' 
Hide admin tools empty link in left menu bar for operator read users without permissions - #922

See merge request !514
 2017-05-26 10:03:24 +02:00
artica 474d22ed30 Auto-updated build strings. 2017-05-26 00:01:14 +02:00
enriquecd d413b7d22d Hide admin tools empty link in left menu bar for operator read users without permissions - #922 2017-05-25 18:37:26 +02:00
vgilc 8a1136d99e Merge branch '704-Agrupar-gráficas-dev' into 'develop' 
Fixed problem without graphics

See merge request !512
 2017-05-25 17:30:09 +02:00
vgilc 1ba43f4661 Merge branch '696-wrong-id-in-export-server-id-in-module-massive-operations-dev' into 'develop' 
Fixed wrong ids

See merge request !507
 2017-05-25 16:56:52 +02:00
Daniel Maya b3e530658a Fixed problem without graphics 2017-05-25 16:54:07 +02:00
vgilc 42c7474ceb Merge branch '903-No-funciona-agent-daemon-start-en-AIX' into 'develop' 
Load agent daemon for AIX in UNIX Daemon - #903

See merge request !510
 2017-05-25 12:57:34 +02:00
enriquecd 37d6d4aca0 Load agent daemon for AIX in UNIX Daemon - #903 2017-05-25 11:31:05 +02:00
vgilc d4c635d5f1 Merge branch '537-Removed-menu-options-in-dashboard-but-keep-cancel-zoom-dev' into 'develop' 
Works in good dashboards module graphs

See merge request !509
 2017-05-25 10:54:58 +02:00
Arturo Gonzalez 09b90be1ca Works in good dashboards module graphs 2017-05-25 10:08:30 +02:00
artica faa96927dd Auto-updated build strings. 2017-05-25 00:01:12 +02:00
Arturo Gonzalez 71b809ac25 Fixed wrong ids 2017-05-24 18:01:58 +02:00
vgilc 44dc9128b2 Merge branch '537-Module-graphs-dev' into 'develop' 
537 module graphs dev

See merge request !503
 2017-05-24 14:14:16 +02:00
Arturo Gonzalez 20c205fbc9 Added good styles to graphs 2017-05-24 13:12:47 +02:00
Arturo Gonzalez 4a03298b69 Added unit to module name and recolocate yaxis label 2017-05-24 12:18:43 +02:00
vgilc 20599871a1 Merge branch '711-agent-name-en-lugar-de-alias' into 'develop' 
Remove quotation marks in agent deletion

See merge request !501
 2017-05-24 09:26:18 +02:00
vgilc af898c8b3d Merge branch '704-agrupar-gráficas-combinadas' into 'develop' 
704 agrupar gráficas combinadas

See merge request !500
 2017-05-24 09:25:11 +02:00
artica 42704e5981 Auto-updated build strings. 2017-05-24 00:01:10 +02:00
Daniel Maya e1b867069b Remove quotation marks in agent deletion 2017-05-23 17:50:37 +02:00
Daniel Maya 0f9a2cf2f8 New feature: Graphic grouping. added mr 2017-05-23 17:17:40 +02:00
Daniel Maya e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +02:00
vgilc 6f6eac640b Merge branch '913-fixed-blank-page-in-user-creation-(metaconsole)-dev' into 'develop' 
Ficed bad include call

See merge request !498
 2017-05-23 15:50:04 +02:00
Arturo Gonzalez 8692a17567 Ficed bad include call 2017-05-23 15:36:35 +02:00
vgilc c8251d62e0 Merge branch '788_Añadir_macros_para_varias_ips' into 'develop' 
add new macros all_address and address_n

See merge request !497
 2017-05-23 10:25:56 +02:00
vgilc b21e09deef Merge branch '635-reset-or-recover-password-in-pandora-node-and-meta-dev' into 'develop' 
635 reset or recover password in pandora node and meta dev

See merge request !389
 2017-05-23 10:14:43 +02:00
daniel 37d3d895b0 add new macros all_address and address_n 2017-05-23 10:09:32 +02:00
vgilc 3abb9710b1 Merge branch '596-default_event_filter_by_user' into 'develop' 
596 default event filter by user

See merge request !354
 2017-05-23 10:05:49 +02:00
artu30 faa353bc5c Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev' 
# Conflicts:
#   pandora_console/include/help/clippy/extension_cron_send_email.php
 2017-05-23 09:50:22 +02:00
artu30 37757f7ace Merge branch 'develop' into '596-default_event_filter_by_user' 
# Conflicts:
#   pandora_console/godmode/users/configure_user.php
 2017-05-23 09:48:37 +02:00