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

458 Commits

Author SHA1 Message Date
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
marcos a2ee59e5b0 duplicated enable/disable message 2020-03-31 17:35:01 +02:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez 72b1fb2b16 Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF 
Conflicts:
	pandora_console/include/javascript/pandora.js

	modified:   pandora_console/general/register.php
	modified:   pandora_console/godmode/agentes/configurar_agente.php
	modified:   pandora_console/godmode/agentes/module_manager_editor.php
	new file:   pandora_console/include/ajax/welcome_window.php
	new file:   pandora_console/include/class/WelcomeWindow.class.php
	modified:   pandora_console/include/constants.php
	modified:   pandora_console/include/functions_config.php
	modified:   pandora_console/include/javascript/pandora.js
	new file:   pandora_console/include/styles/new_installation_welcome_window.css
 2019-10-30 16:56:44 +01:00
marcos 57bfc364ae add modal confirmation window 2019-10-28 18:57:10 +01:00
marcos b35c9dd96d ajust changes 2019-10-22 16:42:13 +02:00
marcos ca49cefb0d fixed 2019-10-22 12:19:25 +02:00
marcos ee97ed8a5e segunda ronda 2019-10-21 18:36:02 +02:00
Daniel Barbero 40076b0a55 remove debug 2019-10-09 17:33:06 +02:00
Daniel Barbero 8af72c1c9d add Remote CMD 2019-10-09 17:26:06 +02:00
Luis Calvo 941362776e Fixed keepcounters ckbox bug 2019-10-08 14:06:30 +02:00
Luis Calvo 1eb0b27da3 Fixed module update bug 2019-09-27 16:09:11 +02:00
Alejandro Fraguas 3eadb07058 Merge branch 'ent-4166-No-se-añade-module_unit-personalizado' into 'develop' 
Fixed bug in custom unit #4166

See merge request artica/pandorafms!2675
 2019-09-11 16:47:40 +02:00
Daniel Rodriguez d02f3621f3 Merge branch 'ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module' into 'develop' 
Removed autofill proxi in auth server

See merge request artica/pandorafms!2361
 2019-09-05 18:29:43 +02:00
manuel 94e377c3c3 Merge branch 'develop' into ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module 
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
 2019-08-30 09:46:27 +02:00
Tatiana Llorente b444be87b4 Fixed bug in custom unit #4166 2019-08-21 14:46:58 +02:00
Tatiana Llorente d515e510f3 Fixed bug in custom unit #4166 2019-08-21 13:38:53 +02:00
Luis Calvo db349a4783 Fixed empty http_auth_user and pass 2019-08-12 12:26:00 +02:00
Daniel Barbero 127f67f2ac fixed error in network component 2019-07-08 19:33:54 +02:00
Jose Gonzalez afd72eff42 Changed variable that modify min values 2019-06-25 13:37:44 +02:00
fbsanchez 94153b823f Help links 2019-05-30 11:25:09 +02:00
fbsanchez 3c730fbedf BC updated 2019-05-29 17:10:21 +02:00
fbsanchez c8649a8dc4 Styles 2019-05-29 11:21:57 +02:00
fbsanchez 32424ddae1 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 10:50:38 +02:00
Daniel Rodriguez 9096444f8f Merge branch 'ent-1480-4731-deshabilitado-de-modulos-agencia_aadcm' into 'develop' 
Do not add disabled modules to the execution queue.

See merge request artica/pandorafms!2456
 2019-05-29 09:53:38 +02:00
Daniel Barbero Martin c35cb56699 fixed errors 2019-05-29 08:50:46 +02:00
Daniel Barbero Martin 3b943ae902 fixed errors disabled/enabled module from list agents because not write in conf 2019-05-28 17:11:14 +02:00
fbsanchez 9a12b34847 Updates styling 2019-05-28 12:13:29 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00
fbsanchez 556c07ad99 Minor changes in configurar_agente 2019-05-27 17:12:35 +02:00
Daniel Barbero Martin bc64589046 fixed error create modules 2019-05-27 15:27:46 +02:00
fbsanchez 9eecc414dd cps changes - switch core touched - test this commit carefully 2019-05-27 14:12:53 +02:00
alejandro-campos 0728c73844 fixed bug in macros of plugin modules 2019-05-22 19:14:01 +02:00
manuel 20dace7de8 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/agentes/agent_manager.php


Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
 2019-05-13 16:20:12 +02:00
Daniel Rodriguez 247605f308 Merge branch 'ent-3664-Al_aplicar_un_cambio_en_un_agente_se_muestra_que_se_ha_realizado_con_exito_pero_no_actualiza_campos_a_primera_vista' into 'develop' 
Eliminated the cache when update agents

See merge request artica/pandorafms!2242
 2019-05-08 12:50:40 +02:00
manuel f5759abcad Merge branch 'develop' into ent-3468-Ayudas_online 2019-05-08 09:35:32 +02:00
manuel b2b4372c9d Added helps 
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
 2019-05-07 11:34:09 +02:00
Daniel Rodriguez 16f687574e Merge branch 'ent-3847-Bug-en-edicion-de-modulos-locales-posible-condicion-especial' into 'develop' 
Fixed bug in unlinked modules

See merge request artica/pandorafms!2347

Former-commit-id: 32bea7e188131ae6115f6c45012dafe648f811cd
 2019-05-03 12:41:01 +02:00
manuel e424a2a684 Fixed bug in unlinked modules edition 
Former-commit-id: ec9ee4ecbc53a5c617aaf2cee52f7cbbf8f94da8
 2019-05-03 12:14:23 +02:00
manuel b1dd6edc64 Added changes in helps 
Former-commit-id: e63717665df7be9e2f00b5492ef77c8e93a4e9a4
 2019-04-30 12:28:11 +02:00
manuel 6bd8221bc0 changed helps 
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
 2019-04-29 14:36:02 +02:00
Daniel Barbero Martin ac41e9255f helpers 
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
 2019-04-24 13:53:18 +02:00
manuel bac1e44608 Removed autofill proxi in auth server 
Former-commit-id: 448622c39e6697ead1a3a515da3e573abfc0384d
 2019-04-16 12:37:06 +02:00
manuel 021fc1dbfd Fixed bug in unlinked modules 
Former-commit-id: 08279c7f8605b54ae7ecaba32cc7d3c501b3ad5f
 2019-04-09 10:46:37 +02:00
daniel 431c807f61 Merge branch 'develop' into 'ent-3445-Solucionar_problematica_flip_flop' 
# Conflicts:
#   pandora_console/extras/mr/27.sql

Former-commit-id: 4fcd03764bf959fb6b126df48e20bc29327105b2
 2019-04-02 10:21:04 +02:00
Luis Calvo 343c6a6edf Fix agent name input to allow '-' 
Former-commit-id: 8b69d89daa3baeca5126c88c53dbe8323860f95d
 2019-04-01 15:18:56 +02:00
Daniel Barbero Martin a3865a3181 flip flop keep counters 
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
 2019-03-27 18:16:53 +01:00
samucarc 9db9d1644c Eliminated the cache when update agents 
Former-commit-id: 4e52c0f85ae68a5658c8cd40e72064b48c644934
 2019-03-06 11:25:47 +01:00
fbsanchez b1aa0fe2f2 Merge from develop 
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
 2019-02-22 12:30:27 +01:00