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

16173 Commits

Author SHA1 Message Date
artica 774d2a6777 Auto-updated build strings. 2022-04-03 01:00:26 +02:00
artica 8502bf3ae1 Auto-updated build strings. 2022-04-02 01:00:39 +02:00
alejandro.campos@artica.es 3042755e70 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' of brutus.artica.es:artica/pandorafms into ent-8340-POST-Custom-data-en-vista-de-eventos 2022-04-01 14:07:31 +02:00
alejandro.campos@artica.es b7aca968a3 minor change 2022-04-01 14:06:51 +02:00
Daniel Barbero Martin 597e527f38 add new report custom render pandora_enterprise#8540 2022-04-01 13:55:18 +02:00
Daniel Rodriguez 99b8fa0cf6 Merge branch 'ent-8458-heatmap-view' into 'develop' 
Ent 8458 heatmap view

See merge request artica/pandorafms!4695
 2022-04-01 07:46:25 +00:00
Daniel Barbero Martin bfa137aa67 Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-01 09:02:30 +02:00
artica 4218413b82 Auto-updated build strings. 2022-04-01 01:00:40 +02:00
Daniel Barbero Martin 318ac668e9 add new report custom render pandora_enterprise#8540 2022-03-31 20:11:52 +02:00
Daniel Maya 55e847a5c9 #8541 Added file customer_key 2022-03-31 16:52:50 +02:00
Daniel Rodriguez 9da8be71bc Merge branch 'ent-8533-Mostrar-valores-en-elementos-Agents-modules' into 'develop' 
Ent 8533 mostrar valores en elementos agents modules

See merge request artica/pandorafms!4764
 2022-03-31 14:26:51 +00:00
Daniel Rodriguez 45ca5850f7 Merge branch 'ent-8777-notificar-en-el-resumen-de-la-tarea-de-discovery-cuando-falle-por-falta-de-algun-componente' into 'develop' 
Notify in details popup when critical issues happened in discovery task scan

See merge request artica/pandorafms!4791
 2022-03-31 14:12:30 +00:00
Daniel Rodriguez 2cc019ea29 Merge branch 'ent-7225-monitorizacion-global-de-discovery-vmware-mediante-tokens' into 'develop' 
remove extra margin from grid forms in discovery

See merge request artica/pandorafms!4777
 2022-03-31 13:43:42 +00:00
fbsanchez 62172c19a2 Notify in details popup when critical issues happened in discovery task scan 2022-03-31 14:34:16 +02:00
Ramon Novoa a94f729237 Write the customer key to disk. 
Writing the customer key to disk allows other components without access
to the database to download it. Ref. pandora_enterprise#8541.
 2022-03-31 13:21:22 +02:00
Daniel Maya e796dc52bb #8458 Change in refresh value 2022-03-31 09:46:30 +02:00
Daniel Maya 5e37c264c1 #8533 change of default value 2022-03-31 09:38:07 +02:00
artica 35bcec046a Auto-updated build strings. 2022-03-31 01:00:46 +02:00
Daniel Rodriguez 6ec51c0e97 Merge branch 'ent-8687-bugs-en-horario-de-alertas' into 'develop' 
fixed calendar templates alerts pandora_enterprise#8687

See merge request artica/pandorafms!4788
 2022-03-30 14:07:51 +00:00
Daniel Maya c5d0237c23 #8533 Fixed order 2022-03-30 15:12:53 +02:00
fbsanchez e70c85fc65 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor 2022-03-30 15:05:04 +02:00
fbsanchez 2d334f7860 Historical view for update manager 2022-03-30 14:41:47 +02:00
Daniel Rodriguez 134ee890eb Merge branch 'ent-8300-gestion-ejecucion-console-tasks' into 'develop' 
Added enable console task feature

See merge request artica/pandorafms!4776
 2022-03-30 09:29:22 +00:00
Daniel Maya cab85cbfbd #8458 Fixed errors 2022-03-30 10:21:30 +02:00
Alejandro Campos 3e5865b539 Merge branch 'develop' into 'ent-8340-POST-Custom-data-en-vista-de-eventos' 
# Conflicts:
#   pandora_console/extras/mr/53.sql
 2022-03-30 08:03:08 +00:00
alejandro.campos@artica.es 7bfa78a3d5 minor fix 2022-03-30 10:01:37 +02:00
Daniel Rodriguez 7f1e8aab8d Merge branch 'ent-8703-file-repository-tamano-de-descarga-excedido' into 'develop' 
Fix files repo download file hash error

See merge request artica/pandorafms!4760
 2022-03-30 07:45:46 +00:00
Daniel Rodriguez 74e4461d8a Merge branch 'ent-8697-13244-no-funcionan-acciones-de-eventos-a-traves-de-un-dashboard' into 'develop' 
Fix dashboard events responses

See merge request artica/pandorafms!4759
 2022-03-30 07:45:07 +00:00
Daniel Rodriguez 6b4c2a46e1 Merge branch 'ent-8573-conteo-erroneo-vista-tactica-metaconsola' into 'develop' 
Subquery needed for avoid duplicates

See merge request artica/pandorafms!4785
 2022-03-30 07:43:25 +00:00
Daniel Rodriguez 2ab122405d Merge branch 'ent-8727-Error_autenticacion_AWS_View' into 'develop' 
Fix credential storing with spaces

See merge request artica/pandorafms!4767
 2022-03-30 07:42:39 +00:00
José González 1e3355730b Fix typo 2022-03-30 09:19:04 +02:00
artica 01c2fd5da4 Auto-updated build strings. 2022-03-30 01:00:52 +02:00
fbsanchez dc2d577def WIP historical updates registry 2022-03-29 20:58:18 +02:00
Luis eceb60e12c Update mysql.php 2022-03-29 17:03:05 +00:00
Calvo 7f0dbb0476 Added secondary ldap server 2022-03-29 18:59:27 +02:00
alejandro.campos@artica.es d137e0d798 implemented custom data filter in event view 2022-03-29 18:09:19 +02:00
José González 18927108ef Added in meta console task enable/disable feature 2022-03-29 14:44:12 +02:00
Daniel Maya 59db8f3daf #8533 style changes 2022-03-29 10:46:44 +02:00
artica a54344348c Auto-updated build strings. 2022-03-29 01:00:47 +02:00
José González 6bf82accad Subquery needed for avoid duplicates 2022-03-28 17:19:36 +02:00
fbsanchez b832fd17e4 update_manager_client => vendor 2022-03-28 12:20:36 +02:00
Calvo b7923fe494 Added files repo error information for post_max_size and upload_max_filesize 2022-03-28 11:18:08 +02:00
artica 775942e0b6 Auto-updated build strings. 2022-03-28 01:00:39 +02:00
artica 859f689ade Auto-updated build strings. 2022-03-27 01:00:30 +01:00
artica 5f1b81b089 Auto-updated build strings. 2022-03-26 01:00:50 +01:00
Calvo 4109d94853 Fix events dashboard user owner entities 2022-03-25 14:07:44 +01:00
Calvo 5e6bdaeb15 Fix events dashboard user owner entities 2022-03-25 14:05:38 +01:00
Daniel Rodriguez e9fcc89eac Merge branch 'ent-8677-app-android-consolas-visuales' into 'develop' 
Ent 8677 app android consolas visuales

See merge request artica/pandorafms!4748
 2022-03-25 11:52:26 +00:00
Daniel Rodriguez 906e9ecd7a Merge branch 'ent-8734-deshacer-cambios-de-autenticacion-de-global-admin' into 'develop' 
reverted changes

See merge request artica/pandorafms!4772
 2022-03-25 11:34:07 +00:00
Daniel Rodriguez c2b2ab3394 Merge branch 'ent-8674-job-failed-244975' into 'develop' 
Missing network components

See merge request artica/pandorafms!4758
 2022-03-25 11:02:30 +00:00
Daniel Rodriguez c6a3a7df10 Merge branch 'ent-8569-item-icon-cv-cambiar-token-link-enabled-a-habilitado-por-defecto' into 'develop' 
enable link item icon for default CV pandora_enterprise#8569

See merge request artica/pandorafms!4771
 2022-03-25 10:44:07 +00:00
Daniel Rodriguez 42b561ab2b Merge branch 'ent-8612-Bugs-varios-relacionados-con-Netflow' into 'develop' 
Ent 8612 bugs varios relacionados con netflow

See merge request artica/pandorafms!4768
 2022-03-25 10:42:25 +00:00
Daniel Rodriguez ecd2f7e35e Merge branch 'ent-8651-fallos-menores-de-usabilidad-en-setup' into 'develop' 
Fix console setup visual issues

See merge request artica/pandorafms!4756
 2022-03-25 10:39:05 +00:00
Daniel Rodriguez c33cb143bf Merge branch 'ent-8645-estilos-dashboard-no-ajusta-bien-a-los-lados' into 'develop' 
fixed  visual dashboard pandora_enterprise#8645

See merge request artica/pandorafms!4770
 2022-03-25 10:29:16 +00:00
Daniel Maya 26d598529c Fixed margin 2022-03-25 10:53:30 +01:00
artica 0bf8c75d2f Auto-updated build strings. 2022-03-25 01:00:41 +01:00
Calvo 6ed8851188 Fix event list widget actions on dashboard 2022-03-24 18:52:06 +01:00
Daniel Rodriguez 64947b75cd Merge branch 'ent-8338-POST-Dejar-de-codificar-los-custom-data-en-base64-eventos' into 'develop' 
change storage format of custom data field in DB

See merge request artica/pandorafms!4766
 2022-03-24 16:19:39 +00:00
Daniel Maya 4c9bdca3f8 #8533 Fixed label 2022-03-24 15:15:08 +01:00
José González 61713b453a Added control for ascii characters 2022-03-24 13:53:22 +01:00
artica f190a85560 Auto-updated build strings. 2022-03-24 01:00:42 +01:00
Calvo 8cae675841 Hide menu title when screen is too small 2022-03-23 17:55:52 +01:00
Daniel Maya 98aebc4587 #8533 added show module data (report) 2022-03-23 16:59:15 +01:00
Daniel Barbero Martin 4e444a9d20 Merge remote-tracking branch 'origin/develop' into ent-8677-app-android-consolas-visuales 2022-03-23 16:16:10 +01:00
fbsanchez da668a3a93 some style updates 2022-03-23 15:17:43 +01:00
fbsanchez d938d59263 remove extra margin from grid forms in discovery 2022-03-23 15:02:36 +01:00
alejandro.campos@artica.es 5757d4a933 implement csv export of events in meta and minor fixes 2022-03-23 14:24:39 +01:00
Daniel Maya ff60967bdf Merge branch 'develop' into ent-8533-Mostrar-valores-en-elementos-Agents-modules 2022-03-23 12:12:52 +01:00
Daniel Rodriguez 1e6d92f7fe Merge branch 'ent-8399-borrado-contenido-cache' into 'develop' 
phantomjs cache auto-clean

See merge request artica/pandorafms!4726
 2022-03-23 10:53:22 +00:00
Daniel Rodriguez 38b71b3de7 Merge branch 'ent-7063-Informes-de-servicio-en-Meta' into 'develop' 
report SLA services to metaconsole pandora_enterprise#7063

See merge request artica/pandorafms!4678
 2022-03-23 10:44:01 +00:00
Calvo 24b6394c83 Merge remote-tracking branch 'origin/develop' into ent-8651-fallos-menores-de-usabilidad-en-setup 2022-03-23 09:25:17 +01:00
artica 3dcdd13fe4 Auto-updated build strings. 2022-03-23 01:00:43 +01:00
Calvo 174f6dce51 Fix dashboard event list, Removed missing debugger in code 2022-03-22 18:02:53 +01:00
Daniel Barbero Martin 0a5a07537d fixed CV in console mobile metaconsole pandora_enterprise#8676 2022-03-22 12:31:30 +01:00
Daniel Barbero Martin 2e083c06d7 add report services sla to wizard metaconsole pandora_enterprise#7063 2022-03-22 11:32:44 +01:00
Daniel Barbero Martin cc4f325e3f Merge remote-tracking branch 'origin/develop' into ent-7063-Informes-de-servicio-en-Meta 2022-03-22 09:32:07 +01:00
Daniel Barbero Martin 927b3360d0 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-22 08:59:51 +01:00
artica 79162a787b Auto-updated build strings. 2022-03-22 01:00:46 +01:00
Luis ba6a56b9fc WIP: event dashboard responses 2022-03-21 18:15:58 +01:00
alejandro.campos@artica.es 709f17ee7f reverted changes 2022-03-21 17:47:08 +01:00
Daniel Barbero Martin b65e161ce7 fixed CV in console mobile metaconsole pandora_enterprise#8676 2022-03-21 16:37:27 +01:00
Daniel Barbero Martin 28232f7c49 enable link item icon for default CV pandora_enterprise#8569 2022-03-21 15:43:25 +01:00
Daniel Barbero Martin 93e0a261f9 fixed visual dashboard pandora_enterprise#8645 2022-03-21 14:52:32 +01:00
Daniel Barbero Martin aec87c8839 fixed calendar templates alerts pandora_enterprise#8687 2022-03-21 13:28:53 +01:00
alejandro.campos@artica.es 065617a67a fixed several netflow bugs 2022-03-21 13:24:23 +01:00
alejandro.campos@artica.es 1a030bcd42 fixed several netflow bugs 2022-03-21 12:21:47 +01:00
fbsanchez 2796d3c4e2 Merge remote-tracking branch 'origin/develop' into ent-8399-borrado-contenido-cache 2022-03-21 11:30:32 +01:00
Daniel Barbero Martin 76d8918a4e fixed CV in console mobile metaconsole #8676 2022-03-21 10:04:11 +01:00
Daniel Barbero Martin 0342f2a908 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-21 09:06:44 +01:00
artica c736fbe726 Auto-updated build strings. 2022-03-21 01:00:36 +01:00
artica 95057697d8 Auto-updated build strings. 2022-03-20 01:00:36 +01:00
artica db28f5fbbe Auto-updated build strings. 2022-03-19 01:00:42 +01:00
Daniel Rodriguez 82474264a7 Merge branch 'ent-8339-POST-Macros-para-custom-data-de-eventos' into 'develop' 
Ent 8339 post macros para custom data de eventos

See merge request artica/pandorafms!4749
 2022-03-18 13:56:49 +00:00
José González a90e31be4f Fix credential storing with spaces 2022-03-18 14:03:36 +01:00
Daniel Barbero Martin e5f8e32a9e fixed CV in console mobile metaconsole #8676 2022-03-18 13:07:29 +01:00
Daniel Rodriguez 4c418f5979 Merge branch 'ent-8596-Mal-funcionamiento-en-el-cálculo-de-estado-por-elementos-críticos-en-Consolas-Visuales' into 'develop' 
Ent 8596 mal funcionamiento en el cálculo de estado por elementos críticos en consolas visuales

See merge request artica/pandorafms!4745
 2022-03-18 10:57:37 +00:00
alejandro.campos@artica.es e1ec4ce40e change storage format of custom data field in DB 2022-03-18 11:23:29 +01:00
Daniel Barbero Martin 8ef56aa076 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-18 09:05:38 +01:00
artica e088c0e564 Auto-updated build strings. 2022-03-18 01:00:41 +01:00
Daniel Maya c2d60fafa9 #8596 Fixed image-item 2022-03-17 16:37:43 +01:00
Daniel Maya e83d63430c #8533 added show module data 2022-03-17 14:48:01 +01:00
Daniel Rodriguez 8ff3b4f0ee Merge branch 'ent-8243-Netflow-nuevo-informe-top-n-connections' into 'develop' 
Ent 8243 netflow nuevo informe top n connections

See merge request artica/pandorafms!4709
 2022-03-17 08:56:07 +00:00
Daniel Rodriguez 59b51ea606 Merge branch 'ent-8624-command-snapshow-view-debe-mostrar-fuentes-monoespacio' into 'develop' 
Command snapshot monospaced font

See merge request artica/pandorafms!4762
 2022-03-17 08:55:29 +00:00
Daniel Barbero Martin 51998d5e71 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-17 08:57:17 +01:00
artica 1bc96bb92d Auto-updated build strings. 2022-03-17 01:00:40 +01:00
Daniel Barbero Martin eca1ba3917 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-16 08:54:55 +01:00
artica f04a5be8e4 Auto-updated build strings. 2022-03-16 01:00:48 +01:00
Daniel Barbero Martin 6c4d2f2b31 fixed CV in console mobile metaconsole #8676 2022-03-15 18:12:01 +01:00
alejandro.campos@artica.es 7d38617278 Merge remote-tracking branch 'origin/develop' into ent-8243-Netflow-nuevo-informe-top-n-connections 2022-03-15 17:09:19 +01:00
Daniel Barbero Martin a310194f5d Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-15 11:47:55 +01:00
Daniel Barbero Martin 9e07afdab2 fixed CV in console mobile metaconsole #8676 2022-03-15 11:39:57 +01:00
Daniel Rodriguez b582fff47e Merge branch 'ent-8679-Vulnerabilidad-File-Manager' into 'develop' 
Fix upload of not wanted files in File Manager

See merge request artica/pandorafms!4754
 2022-03-15 10:08:48 +00:00
Daniel Rodriguez 7af03dfeef Merge branch 'ent-8566-multiples-bugs-version-movil' into 'develop' 
Ent 8566 multiples bugs version movil

See merge request artica/pandorafms!4716
 2022-03-15 10:08:01 +00:00
Daniel Rodriguez f513a04e75 Merge branch 'ent-8547-POST-Macro-para-nombre-completo-de-usuario-event-responses' into 'develop' 
Ent 8547 post macro para nombre completo de usuario event responses

See merge request artica/pandorafms!4747
 2022-03-15 10:07:28 +00:00
Daniel Rodriguez d7598cefa5 Merge branch 'ent-8662-modulos-modulo-padre-no-se-ven-en-tree-view' into 'develop' 
Clean filtered references for parent modules

See merge request artica/pandorafms!4744
 2022-03-15 10:06:18 +00:00
Calvo 6067f356e9 Command snapshot monospaced font 2022-03-15 09:21:34 +01:00
Luis ae7c81bd8e Update pandora_console/include/functions_ui.php 2022-03-15 07:38:47 +00:00
Daniel Barbero Martin a3d248912a Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-15 07:47:55 +01:00
artica 1ee2387d6c Auto-updated build strings. 2022-03-15 01:00:17 +01:00
Calvo 6dc775649d Fix dashboard events responses 2022-03-14 15:29:40 +01:00
fbsanchez 58a473276f js module fixes 2022-03-14 12:10:30 +01:00
José González 0dd6dc48b7 Solve generated issues 2022-03-14 11:51:49 +01:00
Daniel Barbero Martin 78aa6f5a14 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-14 09:01:27 +01:00
artica 72fce3b9a3 Auto-updated build strings. 2022-03-14 01:00:14 +01:00
artica e7637d2f07 Auto-updated build strings. 2022-03-13 01:00:15 +01:00
artica a232747e01 Auto-updated build strings. 2022-03-12 01:00:15 +01:00
Daniel Rodriguez 601cd1cba4 Merge branch 'ent-8656-post-busqueda-no-funciona-al-cambiar-owner-de-un-evento' into 'develop' 
Fix select2 search on extended events dialog

See merge request artica/pandorafms!4738
 2022-03-11 12:41:22 +00:00
Daniel Rodriguez 185be2ddb8 Merge branch 'ent-8374-12855-giss-agentes-deshabilitados-en-meta' into 'develop' 
Addedd metaconsole tree view filter for disabled agents

See merge request artica/pandorafms!4725
 2022-03-11 11:38:05 +00:00
Daniel Rodriguez a67b6647f7 Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop' 
bulk operation edit agents add secundary groups pandora_enterprise#2152

See merge request artica/pandorafms!4677
 2022-03-11 08:51:33 +00:00
Daniel Barbero Martin e05d741109 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-11 09:44:53 +01:00
artica 36aea89db6 Auto-updated build strings. 2022-03-11 01:00:18 +01:00
Daniel Barbero Martin 7ffca83b29 fixed error massive operation agents #2152 2022-03-10 20:06:45 +01:00
Daniel Barbero Martin e1ab514757 fixed CV in console mobile metaconsole #8676 2022-03-10 16:56:00 +01:00
Daniel Rodriguez edd76aa959 Merge branch 'ent-8591-envio-de-feedback-no-funciona' into 'develop' 
Fix error/success from send feedback dialog

See merge request artica/pandorafms!4713
 2022-03-10 13:53:40 +00:00
Calvo 176a94ce99 Fix tactical view user count when user is in group 2022-03-10 08:26:22 +01:00
Calvo 78ab628c8b Fix tactical view user count when user is in group 2022-03-10 08:22:45 +01:00
Calvo 565cb588ac Merge remote-tracking branch 'origin/develop' into ent-8447-conteo-erroneo-de-usuarios-en-index 2022-03-10 08:07:51 +01:00
artica 047f40a3f0 Auto-updated build strings. 2022-03-10 01:00:17 +01:00
José González 73838ef843 Fix upload of not wanted files in File Manager 2022-03-09 17:27:08 +01:00
Calvo f06c90e692 Fix console setup visual issues 2022-03-09 17:20:24 +01:00
Daniel Barbero Martin 2d2d10c489 fixed server name selector agent in metaconsole #7653 2022-03-09 17:05:03 +01:00
Daniel Barbero Martin 28047f2348 Merge remote-tracking branch 'origin/develop' into ent-7653-Nuevo-informe-de-estados-de-modulos-de-agentes 2022-03-09 16:49:02 +01:00
Daniel Rodriguez ebdc7e4fce Merge branch 'ent-8689-Error-500-en-wizard-de-agente' into 'develop' 
Ent 8689 error 500 en wizard de agente

See merge request artica/pandorafms!4751
 2022-03-09 12:57:20 +00:00
Daniel Rodriguez 671dc5e923 Merge branch 'ent-8610-vulnerabilidad-en-gestion-de-usuarios-perfiles' into 'develop' 
Fix credential store ACL, only accces to PM or UM

See merge request artica/pandorafms!4719
 2022-03-09 12:54:41 +00:00
Daniel Rodriguez c1dd265085 Merge branch 'ent-8381-Bug-interfaces-view' into 'develop' 
Fixed issues with interfaces view and limited to show only agents with ifaces

See merge request artica/pandorafms!4712
 2022-03-09 12:54:04 +00:00
Daniel Rodriguez d73bd92157 Merge branch 'ent-8112-icono-collapse-recortado' into 'develop' 
Fix issue with collapse icon

Closes pandora_enterprise#8112

See merge request artica/pandorafms!4689
 2022-03-09 12:50:17 +00:00
Daniel Rodriguez 09ba16c593 Merge branch 'ent-5886-Vista-para-mostrar-modulos-agentes-en-paradas-planificadas' into 'develop' 
clean file planned_downtime pandora_enterprise#5886

See merge request artica/pandorafms!4688
 2022-03-09 12:48:47 +00:00
Daniel Rodriguez b6ffab0f43 Merge branch 'ent-7933-filtro-de-busqueda-de-modulo-en-alertas-externas' into 'develop' 
external alerts new filters pandora_enterprise#7933

See merge request artica/pandorafms!4687
 2022-03-09 12:48:04 +00:00
Daniel Barbero Martin 640d93045f Merge remote-tracking branch 'origin/develop' into ent-2152-Operaciones-masivas-de-grupos-secundarios 
Conflicts:
	pandora_console/godmode/massive/massive_edit_agents.php
 2022-03-09 09:28:08 +01:00
artica 18e6bd1c22 Auto-updated build strings. 2022-03-09 01:00:14 +01:00