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

1287 Commits

Author SHA1 Message Date
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 348f0c2a65 agent view styling 2019-05-28 13:27:17 +02:00
fbsanchez 9a12b34847 Updates styling 2019-05-28 12:13:29 +02:00
fbsanchez e338d5ba95 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-27 22:40:11 +02:00
fbsanchez f1499082fa agent view rebuilt 2019-05-27 21:30:46 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00
fbsanchez f0fb6d7fd9 wip styles 2019-05-27 18:03:56 +02:00
fbsanchez 556c07ad99 Minor changes in configurar_agente 2019-05-27 17:12:35 +02:00
fbsanchez 0280547465 some changes 2019-05-27 15:41:23 +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
manuel bf3ac73feb Removed empty help icons 2019-05-24 14:26:28 +02:00
manuel 0ee2ed6f5e Removed empty help icons in modules 2019-05-24 12:59:25 +02:00
alejandro-campos 0728c73844 fixed bug in macros of plugin modules 2019-05-22 19:14:01 +02:00
manuel ada49966e0 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
 2019-05-21 10:05:06 +02:00
Daniel Maya b508e40a73 Changed simple quote in alerts 
Former-commit-id: 48f06d79b9f6e93ba2164d8da6240f28cc4f785c
 2019-05-14 11:11:27 +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
Tatiana Llorente b6e8578d1d Fixed a minor sintax error - #3611 
Former-commit-id: 75ba583e8d060887c80eb32fd648157d2c4428bd
 2019-05-13 15:54:06 +02:00
Tatiana Llorente e6fa42ddca Fixed a minor bug in remote config - #3611 
Former-commit-id: 02a786832c8b02a7f5962cf9021cb5a2fe525bcc
 2019-05-13 15:02:13 +02:00
Tatiana Llorente e9082c5d8a Fixed a minor bug in remote config - #3611 
Former-commit-id: 905739bc36ce640de743f4d6cf62031263c698eb
 2019-05-13 14:55:15 +02:00
Tatiana Llorente 5f2bd0bc8d Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente 
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: f04b28c642afe7fe1251ae966b3964c321b34c29
 2019-05-13 13:17:17 +02:00
manuel 43ce4f9883 Added helps 2019-05-09 17:20:27 +02:00
manuel 143def5d87 Added helps 2019-05-09 13:43:53 +02:00
marcos.alconada 23b3d07f37 Merge remote-tracking branch 'origin/develop' into ent-3925-eliminar-custom-response-deprecated 2019-05-09 09:29:27 +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
marcos.alconada fff3a783a1 Se restablece archivo modificado 
Former-commit-id: 1dca6ef8291dbd98951da31fc765130c9c450316
 2019-05-06 18:09:30 +02:00
marcos.alconada e1951c45a4 Se añade al 28 
Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e
 2019-05-06 18:06:59 +02:00
Tatiana Llorente 7da5f518d8 Fixed the form when you try to create an agent without alias - #3611 
Former-commit-id: 48bacfeb69e9df8114f2421b5d6b40596a5c263c
 2019-05-03 14:00:24 +02:00
Tatiana Llorente b3a4d9edf1 New View Create/Update Agent - #3611 
Former-commit-id: fc6de6e82874a71477493eb1e9c93a8a7385e342
 2019-05-03 13:24:15 +02:00
Tatiana Llorente 9f3c586b55 Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente 
Former-commit-id: b60c4d8c438d79f20cc9dcdfac856bbaf0a4ada5
 2019-05-03 13:11:26 +02:00
Tatiana Llorente 7721c0e605 New View Create/Update Agent - #3611 
Former-commit-id: 5bcb4f0d94a05819e82cd636ef1683fbb4047495
 2019-05-03 13:07:58 +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
Tatiana Llorente 274c78f647 Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente 
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: 8beb92aea96f37340434f4a2e5e8012058d52b0a
 2019-04-17 10:49:02 +02:00
Tatiana Llorente ed3155c053 New View Create/Update Agent - #3611 
Former-commit-id: e8c3576ca06561f5979c0151670115b697533843
 2019-04-17 10:35:32 +02:00
Tatiana Llorente cfff9c065d New View Create/Update Agent - #3611 
Former-commit-id: 5a36e41a05341d5afa19917a99f34ac16cfc99e9
 2019-04-17 09:27:15 +02:00
Tatiana Llorente fd7cbf14cd Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas 
Former-commit-id: 91bbd1dac954b151482546b3a75065ab80f19687
 2019-04-10 10:15:15 +02:00
manuel 021fc1dbfd Fixed bug in unlinked modules 
Former-commit-id: 08279c7f8605b54ae7ecaba32cc7d3c501b3ad5f
 2019-04-09 10:46:37 +02:00
Tatiana Llorente d91631e0e1 New design for the tables - #3707 
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
 2019-04-05 13:18:38 +02:00
Tatiana Llorente 9fe8dcdda3 Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas 
Former-commit-id: db7ea3ebe40521488888cf74b6e6ab6563ab6104
 2019-04-02 13:49:51 +02:00
Tatiana Llorente f497d3bd2e Added class to action buttons and moved checkbox to the left side 
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
 2019-04-02 13:42:30 +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