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

1206 Commits

Author SHA1 Message Date
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
Alejandro Fraguas 10b337f713 Merge branch 'ent-4001-se-pueden-crear-reportes-de-tipo-general-sin-nombre' into 'develop' 
Add javascript for insert name to reports

See merge request artica/pandorafms!2424
 2019-06-18 13:53:52 +02:00
Daniel Rodriguez 4362bf3131 Merge branch 'ent-3429-event-report-options-saving' into 'develop' 
Added missing options parameters

See merge request artica/pandorafms!2173
 2019-06-14 13:19:43 +02:00
Daniel Rodriguez 5c7b45173b Merge branch 'ent-4185-Problema-editar-item-availability-en-report-metaconsole' into 'develop' 
fix bug in item edition in metaconsole

See merge request artica/pandorafms!2500
 2019-06-14 13:05:27 +02:00
alejandro-campos 8554baef20 fix bug in item edition in metaconsole 2019-06-13 11:11:39 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
marcos.alconada c1d1c23a4f Merge remote-tracking branch 'origin/develop' into ent-3644-bug-redireccion-de-static-graph 2019-06-12 12:37:52 +02:00
marcos.alconada 608f079ca0 now you need put an agent or visual console, else you cant create or update a Static Grap 2019-06-12 12:36:56 +02:00
Alejandro Campos cc9a7553bc Merge branch 'develop' into 'ent-3300-Error-borrado-masivo-de-informes' 
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.php
 2019-06-11 16:18:29 +02:00
Luis Calvo c6d1bb6533 Fixed fields not saving in event reports 2019-06-06 10:33:46 +02:00
Luis Calvo 3475684cdc Merge remote-tracking branch 'origin/develop' into ent-3429-event-report-options-saving 2019-06-05 09:36:57 +02:00
fbsanchez c741020538 styles review 2019-06-04 13:57:55 +02:00
fbsanchez 7a09a80ace style review 2019-06-03 14:30:23 +02:00
fbsanchez b4dcf4a6f1 style review 2019-06-03 11:55:56 +02:00
fbsanchez 88b0802472 style review 2019-06-03 10:46:52 +02:00
fbsanchez 40cca5e1e3 BIG style change, erased all important flags 2019-05-30 18:21:13 +02:00
Alejandro Fraguas bc279e99b0 Merge branch 'fix/styles' into 'develop' 
Fix/styles

See merge request artica/pandorafms!2461
 2019-05-29 18:31:43 +02:00
fbsanchez 8c0bfd72a8 avoid icon overlap report view lsit 2019-05-29 16:52:38 +02:00
fbsanchez e9198af17c multiple changes 2019-05-29 16:45:53 +02:00
fbsanchez 4a42756ec6 group_management styles profiles 2019-05-29 15:44:51 +02:00
Alejandro Gallardo Escobar f5d5cbf5b8 VC item cache improvements. 
-Added a default value to the configuration.
-Changed the control to edit the cache expiration.
- Added the cache to more items.
 2019-05-28 18:34:07 +02:00
Alejandro Gallardo Escobar ce8ba54e09 Merge remote-tracking branch 'origin/develop' into ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual 2019-05-27 11:31:24 +02:00
manuel 0319e4d4e6 Removed empty help icons 2019-05-24 11:11:30 +02:00
Alejandro Fraguas f5586d7b70 Merge branch 'ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas' into 'develop' 
fixed label reports and more fixed

See merge request artica/pandorafms!2413
 2019-05-24 10:47:15 +02:00
Daniel Barbero Martin 1386a44e07 fixed errors label report 2019-05-23 17:52:28 +02:00
Daniel Rodriguez 7c236149b0 Merge branch 'ent-3592-Se-eliminan-items-de-informes-aunque-se-cancele' into 'develop' 
Fixed bug in items reports deleted

See merge request artica/pandorafms!2208
 2019-05-23 17:18:00 +02:00
Daniel Maya 4c874e152c Merge 2019-05-23 10:43:32 +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 5c0a197b6b Added cache 2019-05-20 15:15:54 +02:00
Daniel Maya f1705af9f6 Fixed error window in visual console 
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
 2019-05-16 16:04:38 +02:00
Daniel Rodriguez 0173c856af Merge branch 'ent-4036-8031-no-funcionan-las-custom-graph-cuando-el-idioma-es-frances' into 'develop' 
Changed simple quote in alerts

See merge request artica/pandorafms!2419

Former-commit-id: 9cab37f3ab87dd3c056f2750a1be9e5204f73e51
 2019-05-16 12:17:22 +02:00
marcos.alconada 8f2dce439b Add javascript for insert name to reports 
Former-commit-id: 75e51a652c0e713379093196ad04a10505c38447
 2019-05-16 12:13:58 +02:00
marcos.alconada 0e99b750b4 New branch without trash files 
Former-commit-id: fd64df2d8fb7d69ad871d870cbe11e4e69ae677d
 2019-05-14 18:15:23 +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
Daniel Barbero Martin e981edfa89 fixed label reports and more fixed 
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
 2019-05-09 16:26:38 +02:00
Daniel Maya dab12ecdc5 Fixed error window in visual console 
Former-commit-id: 97def5509195b687a1607810043076e58dd72fe0
 2019-05-09 15:06:03 +02:00
manuel 143def5d87 Added helps 2019-05-09 13:43:53 +02:00
Daniel Maya c2b8ad22d3 Added cache_expiration in builder items 2019-05-09 12:44:58 +02:00
manuel f5759abcad Merge branch 'develop' into ent-3468-Ayudas_online 2019-05-08 09:35:32 +02:00
Daniel Barbero eb64dbae86 add new checkbox current date for SLA Weekly, Montly and Hourly for item and template item 
Former-commit-id: c9f8c2d93cea8ecc398fe4d89e7a7b7804640cdc
 2019-05-03 14:16:26 +02:00
Daniel Barbero db4cfaf1b7 fixed errors reporting_builder.php 
Former-commit-id: 387262b9ce2735ca60c6a1560c7a55eda9cb5237
 2019-05-03 12:11:20 +02:00
Daniel Barbero 9b9d2a3647 fixed errors reporting_builder.item_editor.php 
Former-commit-id: bef20169ce65e7d78aece4d390bc76f8098864d7
 2019-05-03 10:39:29 +02:00
Alejandro Gallardo Escobar c1272035cc Merge remote-tracking branch 'origin/develop' into visual-console-refactor 
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
 2019-04-24 17:05:20 +02:00
Daniel Barbero Martin ac41e9255f helpers 
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
 2019-04-24 13:53:18 +02:00
Alejandro Gallardo Escobar d5b83b867b Visual Console Refactor: bugfix 
Former-commit-id: 8ea3faa88a1fd46d4f992e174e7916b91d9e9160
 2019-04-16 17:44:39 +02:00
Tatiana Llorente c33a2cfaf6 Change arrow images to sort the table in custom reports - #3707 
Former-commit-id: 62613d1c4e41fff93217ddb111c3b8c7ddc08ff4
 2019-04-11 10:26:26 +02:00
Tatiana Llorente 187bdb1701 New design for the tables - #3707 
Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a
 2019-04-11 09:57:07 +02:00
Tatiana Llorente aa640efc44 Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas 
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
 2019-04-05 13:19:42 +02:00
manuel 49c913c6de Added custom fields to report templates 
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
 2019-04-04 17:31:11 +02:00