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

937 Commits

Author SHA1 Message Date
artica 418d8b12b7 Updated version and build strings. 2018-04-19 16:05:39 +02:00
fermin831 9c82e3651a Avoid cache tree view 2018-04-10 17:59:34 +02:00
artica a67a4288a1 Updated version and build strings. 2018-04-10 10:18:25 +02:00
enriquecd 43e374f454 Fix id_os 100 cluster - #1748 2018-03-19 19:09:45 +01:00
artica af5d70bd7d Updated version and build strings. 2018-03-13 11:06:33 +01:00
artica f3f0d7771c Updated version and build strings. 2018-03-08 12:26:57 +01:00
danielmaya 610c5a5147 Updated MR and current_package_enterprise 2018-02-28 15:45:58 +01:00
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
danielmaya fb39c1e39b Updated current_package_enterprise 719 and MR12 2018-02-06 10:27:07 +01:00
enriquecd 2b446a681d Popup when click modules in cluster view, new images, filter modules - #1748 2018-01-30 17:38:29 +01:00
enriquecd 2b07a7a8a9 Change po,mo,mr and package - #1257 2018-01-25 15:49:21 +01:00
enriquecd 4358f37e07 Delete clusters, agents and modules - #1748 2018-01-24 16:15:53 +01:00
artica cd2c000cbf Updated version and build strings. 2018-01-24 14:27:02 +01:00
enriquecd a149b3119e Final Wizard without js, view list, cluster creation - #1748 2018-01-23 15:34:44 +01:00
enriquecd 5ab43d8106 Add menu section, new db tables and two new module types in pandoradb 2018-01-16 15:41:35 +01:00
artica e895d06016 Updated version and build strings. 2017-12-18 13:26:41 +01:00
danielmaya 66547d28b0 Updated to MR 9 2017-11-15 11:15:12 +01:00
danielmaya e6d5adbf22 Changed MR 2017-11-14 10:38:50 +01:00
artica ef8b69841c Updated version and build strings. 2017-11-08 15:30:28 +01:00
daniel 29c69b1dbc add send mail plain/text 2017-11-07 11:43:46 +01:00
artica 906201a34c Updated version and build strings. 2017-10-23 17:45:29 +02:00
vgilc 27746eedc0 Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'" 
This reverts merge request !862
 2017-10-16 16:44:44 +02:00
vgilc f8023bf44a Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop' 
add send mail plain/text

See merge request !862
 2017-10-09 10:11:27 +02:00
Arturo Gonzalez 08ff3798c5 Changed mr token 2017-10-04 15:59:56 +02:00
artica 3188bf1b0b Updated version and build strings. 2017-10-02 11:57:37 +02:00
daniel 9a66aa52f2 add send mail plain/text 2017-09-27 13:42:02 +02:00
artica c4a709acf1 Updated version and build strings. 2017-09-06 17:22:32 +02:00
fbsanchez 629f5aa237 Merge branch 'develop' into 1256-cargarse-todo-rastro-de-ssh-gateway-y-vnc 2017-09-04 16:20:20 +02:00
fbsanchez 6995a81509 Removed all traces of anytermd from code 2017-09-04 16:19:56 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
fbsanchez 2b18b1589c Added new module type: web_analysis 2017-08-28 19:05:08 +02:00
Arturo Gonzalez 0e7b00f26e Added correct user and fixed db error 2017-08-28 16:38:30 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
artica f7ea07d559 Updated version and build strings. 2017-08-16 13:09:03 +02:00
artica 8309e4fffb Updated version and build strings. 2017-08-10 10:37:06 +02:00
artica 408efec325 Updated version and build strings. 2017-08-02 10:12:45 +02:00
Arturo Gonzalez 1ea465b7d4 Added db changes to package 708 2017-07-17 10:46:26 +02:00
artica ede763cecf Updated version and build strings. 2017-07-10 15:11:14 +02:00
Ramon Novoa d2d56b4b89 Add a missing MR. 2017-06-15 13:47:20 +02:00
Ramon Novoa 7c3ef317b0 Revert "Add a missing MR." 
This reverts commit 16b0da1515.
 2017-06-15 10:50:31 +02:00
Ramon Novoa 16b0da1515 Add a missing MR. 2017-06-15 10:33:30 +02:00
vgilc c78711ba6f Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop' 
539 encrypt agent custom fields in pandora console dev

See merge request !520
 2017-06-14 11:42:51 +02:00
artica d3df682528 Updated version and build strings. 2017-06-12 16:05:06 +02:00
artica 3b481af7d6 Updated version and build strings. 2017-05-30 11:22:26 +02:00
Arturo Gonzalez 9e99bc4485 Added new field to pandoradb_data 2017-05-29 12:04:38 +02:00
Arturo Gonzalez a4636f3435 Added changes in db 2017-05-29 11:55:04 +02:00
Daniel Maya e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +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
vgilc d78058df44 Merge branch '703-MapQuest-Open-no-funciona' into 'develop' 
Change Map quest tile server url to free version - #703

See merge request !409
 2017-05-17 17:13:33 +02:00
artica 24915e47cb Updated version and build strings. 2017-05-17 12:08:40 +02:00