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

3059 Commits

Author SHA1 Message Date
fbsanchez 771c51ef5d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 10:13:51 +02:00
artica 6fc94f3fad Auto-updated build strings. 2021-06-28 01:00:29 +02:00
artica 69c1a5fdad Auto-updated build strings. 2021-06-27 01:00:26 +02:00
artica b7d956041d Auto-updated build strings. 2021-06-26 01:01:41 +02:00
fbsanchez c0d56f8563 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-25 09:48:52 +02:00
artica 4438dad309 Auto-updated build strings. 2021-06-25 01:00:39 +02:00
fbsanchez 4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
 2021-06-24 14:37:30 +02:00
artica 86abd75206 Auto-updated build strings. 2021-06-24 01:00:51 +02:00
fbsanchez 2fe6092d37 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-23 20:08:59 +02:00
artica e99183e1f0 Auto-updated build strings. 2021-06-23 01:00:51 +02:00
artica 17bae49b21 Auto-updated build strings. 2021-06-22 01:00:56 +02:00
fbsanchez faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
Daniel Rodriguez 7b7265baa5 Merge branch 'ent-7179-cli-update-agent-duplica-referencias-ip' into 'develop' 
Fixed CLI update_agent adding duplicate agent address references

See merge request artica/pandorafms!4010
 2021-06-21 09:30:17 +00:00
artica 447d463518 Auto-updated build strings. 2021-06-21 01:00:36 +02:00
artica dd5e7e550d Auto-updated build strings. 2021-06-20 01:00:37 +02:00
artica 682a977ef1 Auto-updated build strings. 2021-06-19 01:00:49 +02:00
Daniel Barbero Martin 1e183c2b60 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-18 08:49:57 +02:00
artica 0c1918eb3c Auto-updated build strings. 2021-06-18 01:00:44 +02:00
Daniel Barbero Martin 50c7394e7d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-17 08:23:46 +02:00
artica e5cbcd070b Auto-updated build strings. 2021-06-17 01:00:42 +02:00
Daniel Barbero Martin 841842da59 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb_data.sql
 2021-06-16 08:46:21 +02:00
artica 90905d72f5 Auto-updated build strings. 2021-06-16 01:00:23 +02:00
Daniel Barbero Martin 9e6f3f7b46 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-15 10:35:50 +02:00
artica 2f0cebe979 Auto-updated build strings. 2021-06-15 01:00:51 +02:00
Daniel Barbero Martin a7c1c49636 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-14 08:42:31 +02:00
artica 595fabb232 Auto-updated build strings. 2021-06-14 01:00:18 +02:00
artica e7a204d6d8 Auto-updated build strings. 2021-06-13 01:00:16 +02:00
artica 8272eb4f5b Auto-updated build strings. 2021-06-12 01:00:21 +02:00
Daniel Barbero Martin 75b889875e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-11 08:41:23 +02:00
artica 876e776d29 Auto-updated build strings. 2021-06-11 01:00:09 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
artica ace916bc8e Updated version and build strings. 2021-06-10 17:12:11 +02:00
Daniel Barbero Martin 9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +02:00
artica 5ad364cc4a Auto-updated build strings. 2021-06-10 01:00:20 +02:00
Daniel Barbero Martin e54fde338d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-09 08:22:04 +02:00
artica 2953870e4f Auto-updated build strings. 2021-06-09 01:00:20 +02:00
Daniel Barbero Martin df2f72cce3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-08 08:22:16 +02:00
artica a63a4efb71 Auto-updated build strings. 2021-06-08 01:00:20 +02:00
Daniel Barbero Martin 8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
artica bc6b4acd8b Auto-updated build strings. 2021-06-07 01:00:19 +02:00
artica 656105cdf0 Auto-updated build strings. 2021-06-06 01:00:14 +02:00
artica 2513693ada Auto-updated build strings. 2021-06-05 01:00:19 +02:00
Daniel Barbero Martin ca59034cf3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-04 08:13:20 +02:00
artica 8976ec4b6e Auto-updated build strings. 2021-06-04 01:00:19 +02:00
Daniel Barbero Martin 030a4fed6a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-03 08:15:30 +02:00
artica e1ae9d7908 Auto-updated build strings. 2021-06-03 01:00:17 +02:00
Daniel Barbero Martin 18f414ce5b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 08:09:32 +02:00
artica 2a5b5591a3 Auto-updated build strings. 2021-06-02 01:00:45 +02:00
Daniel Barbero Martin ddc4b47d0b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-01 08:34:32 +02:00
artica b0e3b0aa24 Auto-updated build strings. 2021-06-01 01:00:09 +02:00