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

61 Commits

Author SHA1 Message Date
daniel
00f9098f56 Merge remote-tracking branch 'origin/develop' into ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-01-25 15:57:20 +01:00
daniel
868700f9f1 add sliced mode simple graph reports and CV pandora_enterprise#9640 2023-10-25 15:55:54 +02:00
miguel angel rasteu
db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu
1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu
64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu
933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Jonathan
13f0e3db23 #10362 recursive group visual console 2023-05-09 16:45:44 +02:00
Jonathan
000ab68327 #10490 TinyMCE Upgrade V6 2023-04-04 11:24:49 +02:00
Jose Gonzalez
edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
alejandro.campos@artica.es
8b9803c1c5 fixed tinyMCE converting URLs to relative ones 2023-02-08 17:04:24 +01:00
daniel
c32483a38a phpchartjs pandora_enterprise#9554 2022-12-23 11:34:35 +01:00
fbsanchez
4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
Jose Gonzalez
3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
fbsanchez
a1546ba080 vc php8 review 2022-01-13 10:47:53 +01:00
fbsanchez
a58c6862e1 php8 visualconsoles review, warning! class and object missunderstanding here... 2022-01-12 20:46:19 +01: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
6deaee84ac Merge 2021-10-04 10:00:15 +02:00
Jose Gonzalez
8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Daniel Maya
8fa834fb9b resolved conflict 2021-09-22 17:27:18 +02:00
Daniel Rodriguez
089b981f7f Merge branch 'ent-7397-Bug-en-item-module-graph-de-cv' into 'develop' 
fixed several issues in item module graph of visual consoles

See merge request artica/pandorafms!4279
 2021-08-11 07:16:19 +00:00
Daniel Maya
318edda041 Added basic chart 3 2021-08-03 15:46:01 +02:00
Daniel Maya
71767a3f11 Added basic chart 2021-07-16 14:16:45 +02:00
Daniel Maya
a4203aaee2 Ent 7272 nuevos elementos consola visual odómetro 2021-07-12 10:27:10 +00:00
alejandro.campos@artica.es
a484fb2408 fixed several issues in item module graph of visual consoles 2021-07-08 10:03:57 +02:00
Daniel Maya
b73924052c Ent 7144 consola visual poder cambiar color de leyenda de event histogram 2021-06-29 10:03:49 +00:00
Marcos Alconada
d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
fbsanchez
d2b166c295 fixes MC graphs in network link + vc links between mc and nodes 2021-02-03 12:53:05 +01:00
fbsanchez
380c77be02 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 
Conflicts:
	pandora_console/include/lib/Module.php
	pandora_console/include/visual-console-client/vc.main.css.map
 2021-02-02 12:15:24 +01:00
Jose Gonzalez
649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
fbsanchez
e3b26011a8 Updates 2020-11-17 16:54:40 +01:00
fbsanchez
4e73d8045a Minor fixes 2020-11-17 11:07:59 +01:00
fbsanchez
c59042c034 WIP 2020-11-03 18:01:24 +01:00
fbsanchez
d85c1ace3c WIP network links VC 2020-11-03 16:35:11 +01:00
fbsanchez
8e09a30a05 WIP Networklink POC 2020-10-29 17:20:16 +01:00
Daniel Barbero Martin
68dd01ba09 fixed errors VC 2020-02-05 18:56:28 +01:00
Daniel Barbero Martin
5906273271 fixed errors VC 2020-01-28 17:52:40 +01:00
Daniel Barbero Martin
73dcabc48d fixed errors VC 2020-01-28 12:44:37 +01:00
Daniel Barbero Martin
fe697a98ec fixed errors VC 2020-01-23 19:54:47 +01:00
Daniel Barbero Martin
cd3691ecc3 fixed errors VC 2020-01-23 17:52:59 +01:00
Daniel Barbero Martin
481f08bd5f fixed errors VC 2020-01-23 16:21:31 +01:00
Daniel Barbero
203a91f065 fixed errors 2020-01-22 17:47:47 +01:00
Daniel Barbero
69e750da13 Fixed error Color cloud VC 2020-01-22 12:48:31 +01:00
Daniel Barbero Martin
ac4c091c9e Fixed errors VC 2020-01-21 17:43:41 +01:00
Daniel Barbero Martin
98ddf3c6ee Fixed errors VC 2020-01-20 17:46:52 +01:00
Daniel Barbero Martin
02199b19b5 fixed errors VC 2020-01-16 16:55:48 +01:00
Daniel Barbero Martin
5900e7ba4a fixed errors VC 2020-01-16 14:07:35 +01:00
Daniel Barbero Martin
d8a09bf359 Fixed errors VC 2020-01-15 17:37:24 +01:00
Daniel Barbero Martin
c3ae3f08a7 Fixed errors VC 2020-01-15 14:28:43 +01:00
Daniel Barbero Martin
4f6ed7c39f Fix tinyMCE background grey 2020-01-13 10:14:51 +01:00
Daniel Barbero Martin
d4b92a6913 Fixed errors in VC 2020-01-10 13:48:07 +01:00