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

104 Commits

Author SHA1 Message Date
edu.corral b3054b6ab2 ent 9154 mysql ssl console connection 2022-09-15 12:58:33 +02:00
edu.corral 544f337181 ent 9154 SSL MySQL console connection 2022-09-14 14:19:47 +02:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/include/class/HTML.class.php
 2022-01-25 14:16:47 +01:00
fbsanchez 35184c4eb6 ws php8 2022-01-21 17:39:11 +01:00
alejandro.campos@artica.es 5749eda8c3 include historic db data in report 2022-01-11 09:13:25 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
fbsanchez 6d469912fa some fixes 2021-12-03 14:24:00 +01:00
fbsanchez a94f6be37e force db_process_sql 2021-12-03 12:59:50 +01:00
fbsanchez cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-02 10:43:30 +01:00
fbsanchez 19643cd685 report for ncm simple 2021-11-29 15:26:19 +01:00
Daniel Rodriguez 198959f6cb Merge branch 'ent-7995-unificar-criterios-de-busqueda-que-no-sean-case-sensitive' into 'develop' 
Unify search criteria case insensitive

See merge request artica/pandorafms!4496
 2021-11-29 11:08:00 +00:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Calvo c6921efdce Unify search criteria case insensitive 2021-10-22 14:43:14 +02:00
fbsanchez 81e696a045 fix in not null matching rule 2021-10-08 15:30:32 +02:00
fbsanchez dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +02:00
alejandro.campos@artica.es c08806374e removed deprecated get_magic_quotes_gpc function and dependent code 2021-10-04 17:37:06 +02:00
fbsanchez 9dff230b65 Allow enable or disable cache in Entity and some minor fixes 2021-09-30 12:23:37 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
fbsanchez 4e1110a052 MQ up to down connections (MC => NODES) 2021-06-28 21:21:31 +02:00
fbsanchez 760522aeff Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 11:03:09 +02:00
fbsanchez eec373e896 Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url 2021-06-24 19:48:07 +02:00
fbsanchez 107c934371 Fixed not conditional in where_clause builder (mysql) 2021-06-22 19:31:04 +02:00
Daniel Barbero Martin 3a85c69043 Wip command center 2021-05-31 14:58:36 +02:00
Daniel Barbero Martin 03e857ffc8 Wip command center 2021-05-20 17:36:01 +02:00
fbsanchez 78e4d64658 avoid using cache while getting/releasing a lock from DB 2021-04-28 14:16:28 +02:00
Daniel Barbero Martin 846b601a3c WIP command center 2021-04-05 17:32:19 +02:00
Daniel Barbero Martin cc222faddc Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/include/functions_api.php
 2021-03-25 17:00:27 +01:00
fbsanchez 7b7ef3a757 minor improvement (err. messages) 2021-03-25 14:25:09 +01:00
Daniel Barbero Martin 23268a4559 WIP Command center 2021-03-05 13:17:12 +01:00
Daniel Barbero Martin da263b23d2 WIP Command center 2021-03-02 11:09:55 +01:00
Daniel Barbero Martin 2ea6c9dbda WIP Command center 2021-03-02 08:32:59 +01:00
Daniel Barbero Martin 85ec17f3e1 WIP Command center 2021-02-26 08:36:48 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
samucarc 9db9d1644c Eliminated the cache when update agents 
Former-commit-id: 4e52c0f85ae68a5658c8cd40e72064b48c644934
 2019-03-06 11:25:47 +01:00
samucarc 7e53461b94 Added new alert when failed database 
Former-commit-id: ee0e8efaf3f32b4c5a86d421873555969274ca43
 2019-02-28 17:40:11 +01:00
fbsanchez 37f6da9aa8 recovered. changes from 0b72571c7c [formerly f3a8cdd6923834443ed7223d1e6ad7776b861184] 
Former-commit-id: 591e002043d2bae2382c8a91c437057fd2b809c7
 2019-02-18 15:36:51 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
daniel 2c208b5e29 fixed errors php7 mysqli and warning include 
Former-commit-id: 68bdf4c26530de45efe2dd8fab360fb88c8976bc
 2019-01-22 08:57:48 +01:00
fbsanchez a20d541fb4 removed default charset, set to auto 2018-11-14 12:31:35 +01:00
fbsanchez 7766881da6 Added option charset to db_connect 
Removed unused function db_get_table_count
 2018-10-04 17:07:34 +02:00
daniel 06c1c4f243 fixed errors in fullscale graph and normal graph 2017-12-05 13:44:42 +01:00
vgilc 68a10343fb Revert "Merge branch…" 
This reverts merge request !1025
 2017-11-10 12:24:33 +01:00
daniel c780cb5285 fixed errors in fullscale graph and normal graph 2017-11-07 09:46:37 +01:00
daniel 48e68b1264 fixed error in function check mr 2017-10-13 14:08:50 +02:00
fbsanchez 8a2bd0f087 Fixed mysqli availability checker 2017-02-16 10:18:08 +01:00
Arturo Gonzalez 584427de06 Added changes to finish rr feature. Ticket #169 2017-02-14 09:36:11 +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
daniel 8c40b6a1d0 fixed error Function does not exist 2016-12-16 12:26:35 +01:00
Junichi Satoh 6edc5e1439 Fixed warnings. 2016-12-07 17:29:04 +09:00