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

1221 Commits

Author SHA1 Message Date
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 823291171347bf74d93e74a99a3c958660a39fe2, reversing
changes made to f5da86ac0aa968789fdcfa3a14dc714886c26cfb.
 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 16b0da1515fe327b56d89d1e041030ce5b9a78da.
 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
enriquecd
f91d59b236 Change Map quest tile server url to free version - #703 2017-04-25 16:33:28 +02:00
Arturo Gonzalez
97abef62c4 Added db field to mr 2017-04-18 11:39:46 +02:00
vgilc
991bca7f6c Merge branch 'ent-402-plantilla-de-modulo-local-linux-zombie-processes-fallo' into 'develop' 
Modified Zombie processes local_component

See merge request !267
 2017-04-07 12:47:24 +02:00
Ramon Novoa
895ec34a4f Remove the layer 2 recon script from the DB (not from the disk yet, for 
upgrades).
 2017-03-23 16:15:57 +01:00
fermin831
d7dcd7f339 Modified Zombie processes local_component 2017-03-16 12:23:43 +01:00
daniel
43aaee9ae3 add templates for email in templates alerts and mail to admin command 2017-03-13 11:16:35 +01:00
daniel
7605de5794 Revert "add new templates for email in mail to admin and templates field3 and recovery" 
This reverts commit c347164f735f061f182333fcff7da84e23394931.
 2017-03-13 08:40:20 +01:00
daniel
c347164f73 add new templates for email in mail to admin and templates field3 and recovery 2017-03-10 15:30:56 +01:00
Arturo Gonzalez
46c9709256 Fixed db problem. Ticket #444 2017-03-03 11:02:57 +01:00
Arturo Gonzalez
bcf1fc2e1b Merge db system. Ticket #444 2017-03-03 10:27:52 +01:00
Arturo Gonzalez
217cffbf05 Merge um packages system. Ticket #439 2017-03-02 15:45:27 +01:00
daniel
45ea30e5b3 fixed nome agent for alias agent 2017-02-24 13:59:03 +01:00
Arturo Gonzalez
584427de06 Added changes to finish rr feature. Ticket #169 2017-02-14 09:36:11 +01:00
Arturo Gonzalez
de1291a378 Fixed db 2017-02-13 14:59:39 +01:00
Arturo Gonzalez
5b7f4a5139 Merge branch 'develop' into feature/rolling_release 
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/functions.php
	pandora_console/index.php
	pandora_console/pandoradb_data.sql
 2017-02-13 14:19:25 +01:00
Ramon Novoa
eadb6b2360 Create the eHorusID custom field by default. 2016-12-12 12:07:58 +01:00