Commit Graph

428 Commits

Author SHA1 Message Date
alejandro-campos 1243968872 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:12:52 +02:00
marcos cc16d80a00 fixed error with dashboard home page 2020-06-11 17:49:28 +02:00
alejandro-campos ab61cf1fc5 changed console and audit log locations 2020-06-08 10:48:48 +02:00
Daniel Rodriguez 3546bbfc73 Merge branch 'ent-5725-Vulnerabilidad' into 'develop'
fix vulnerability in password recovery

See merge request artica/pandorafms!3175
2020-05-20 16:41:42 +02:00
Daniel Barbero Martin 78e5438e54 Fixed error time refresh initial page CV 2020-05-20 12:30:19 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
alejandro-campos 9a66359b3c fix vulnerability in password recovery 2020-04-20 18:00:20 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
alejandro-campos c44b595c8a fixed vulnerability 2020-01-22 17:20:13 +01:00
alejandro-campos 8c046ecdc6 fix bug when accessing certain views as home screen 2019-11-13 11:24:25 +01:00
Tatiana Llorente a15350b7cb deleted calls to a function that does not exist logoff_db() - #4639 2019-09-26 12:36:08 +02:00
marcos.alconada 9310fd8dc1 add deleted condition 2019-08-13 13:58:44 +02:00
fbsanchez 5cfad4587d Revert "Update index.php metaconsole redirection"
This reverts commit 56ef03c27d
2019-07-12 12:17:26 +02:00
fbsanchez 56ef03c27d Update index.php metaconsole redirection 2019-07-12 11:36:37 +02:00
fbsanchez c386a29b80 Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url 2019-07-12 09:38:28 +02:00
Alejandro Fraguas a752cbd2fe Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml-3' into 'develop'
changed condition for saml no access

See merge request artica/pandorafms!2593
2019-07-10 16:32:41 +02:00
Daniel Rodriguez 96fbca35a4 Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop'
Created black theme - #4194

See merge request artica/pandorafms!2564
2019-07-10 11:47:21 +02:00
marcos.alconada 5b6e7d13cd changed condition for saml no access 2019-07-09 18:13:46 +02:00
Alejandro Fraguas 26c606b0d5 Merge branch 'ent-3090-Personalizacion-saml-2' into 'develop'
Added more parameters to SAML configuration

See merge request artica/pandorafms!2506
2019-07-09 13:18:12 +02:00
marcos.alconada 09e5feef05 add message no acces saml without saml.php file 2019-07-08 17:02:28 +02:00
Alejandro Fraguas 8242bf34b8 Revert "Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml' into 'develop'"
This reverts merge request !2562
2019-07-05 14:55:22 +02:00
fbsanchez 84cdbefebd cleanup and fix in location reload 2019-07-02 16:22:23 +02:00
Tatiana Llorente dd8fc659ee Created green theme - #4194 2019-07-02 15:15:19 +02:00
Tatiana Llorente 9163f725ed Created black theme - #4194 2019-07-01 16:57:33 +02:00
marcos.alconada 6349c29eb5 Add message for autenticaition error SAML 2019-07-01 13:45:42 +02:00
alejandro-campos 2a69e3a75e Merge remote-tracking branch 'origin/develop' into ent-3090-Personalizacion-saml-2 2019-06-26 18:06:23 +02:00
alejandro-campos f74b32fe3c Added more parameters to SAML configuration 2019-06-14 10:34:51 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
fbsanchez 40cca5e1e3 BIG style change, erased all important flags 2019-05-30 18:21:13 +02:00
Daniel Rodriguez 2c36631130 Merge branch 'ent-3518-password-recovery-email-bad-message' into 'develop'
Fixed the error message of the password recovery

See merge request artica/pandorafms!2172
2019-05-30 15:35:18 +02:00
fbsanchez d871b599ef General fixes and UM comm updates
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
2019-05-14 23:49:01 +02:00
fbsanchez 53e9113b7e UM notifications MR update
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
2019-05-14 17:15:28 +02:00
fbsanchez ced1b32915 Configuration, Registration and newsletter wizards
Former-commit-id: bbd367a10fd01c229c848b15572c4b1d6ccb75cf
2019-05-13 17:55:41 +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 2a37224653 New design for the tables - #3707
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
fbsanchez fb818064ed minor fix menu
Former-commit-id: 6d0ca2d3d86af083c91a098326dc073d90187ab0
2019-03-27 14:39:02 +01:00
fbsanchez ca5c214472 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 8952ebd872b4030cb8e1bd4ad3f0425afd13fd09
2019-03-26 19:30:55 +01:00
Daniel Rodriguez b7267dfafa Merge branch 'ent-3774-Autorefresh_no_se_deshabilita' into 'develop'
fixed minor error header disabled

See merge request artica/pandorafms!2297

Former-commit-id: ffc6904ecfa47e41ea87b867f8650c237ee1877a
2019-03-26 18:49:27 +01:00
Daniel Barbero Martin 5504741a9d Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php


Former-commit-id: d734637dea22b18b1d30a3d8575cd45500558e29
2019-03-26 18:48:49 +01:00
Daniel Barbero Martin 4cd06539a2 fixed minor error refresh header
Former-commit-id: 5fd75dd4fe634760c37fb06a16cc127c9cbfc71d
2019-03-26 18:37:49 +01:00
Daniel Rodriguez 0982cd61b5 Merge branch 'ent-3568-limitar-acceso-a-la-consola-cuando-se-supere-el-limite-de-agentes' into 'develop'
Ent 3568 limitar acceso a la consola cuando se supere el limite de agentes

See merge request artica/pandorafms!2293

Former-commit-id: caedaf6470c3fbea8d76db4b61a5a8d241dc7830
2019-03-26 18:04:56 +01:00
Ramon Novoa aa0ab53cf3 Clear license errors when logging in.
Former-commit-id: 1f68f190ebc84202b0e39b92c12d065f8b52543c
2019-03-26 15:31:51 +01:00
alejandro-campos 079f578830 fix bad behavior of pandoras side menu on page load
Former-commit-id: b1d4eb3e2464fa441f16190d29b2d57cfaa9e3c5
2019-03-25 19:37:45 +01:00
Daniel Maya 24309e9582 Fixed enterprise acl in extensions(tool)
Former-commit-id: 966614e5214713c94ed40e0df86d6061695667f1
2019-03-25 12:22:18 +01:00
Tatiana Llorente 7be5d3e9e0 new header and menu
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
2019-03-05 12:54:11 +01:00
Tatiana Llorente 36fa0fc41f new header and menu
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
2019-03-04 08:39:56 +01:00
Tatiana Llorente 526311d1c6 new header and menu
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
2019-02-25 11:54:46 +01:00
Alejandro Gallardo Escobar df8042abb1 Fixed the error message of the password recovery
Former-commit-id: 3bc9b4044bbe56ec5a1c1f4cbdb3f56db5680abb
2019-02-12 17:45:25 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
fermin831 9531065dbe Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker
Former-commit-id: da01f6f0f7f223755a6c2a72cadafac075b6a3c0
2018-12-20 18:17:57 +01:00
alejandro-campos dd1fb00e19 Revert "Removed html entities in the audit views"
This reverts commit ad7610d7f1.


Former-commit-id: a2b1fb7e9f6032cc255abb42e8ef0d65efc877b6
2018-12-10 13:40:37 +01:00
vgilc b916bdbe3c Merge branch 'exit-after-location-header-fix' into 'develop'
Added an exit after every declared Location header

See merge request artica/pandorafms!1988
2018-11-30 12:51:59 +01:00
daniel a5346a7ae3 fixed error login double 2018-11-21 17:38:11 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
daniel a089a93477 fixed session bugs 2018-11-20 18:07:43 +01:00
Alejandro Gallardo Escobar 919e94e46a Added an exit after every Location header declared 2018-11-19 11:28:07 +01:00
daniel 6174e622c8 create alert php7 2018-11-14 18:15:48 +01:00
fermin831 06830c9f69 Added profiller to docker 2018-11-13 12:55:25 +01:00
fermin831 6ede68bf8d Fixed delete menu on main page dashboards 2018-11-06 13:10:44 +01:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
2018-10-25 17:43:28 +02:00
fermin831 2af6108b66 Removed dashboard menu if it is displayed from main page 2018-10-23 12:29:23 +02:00
daniel 3c62388f0e fixed errors php and slicebars change version php7 2018-10-16 15:32:31 +02:00
vgilc 4b583c7477 Merge branch '2303_Aparecen_entidades_html_en_las_vistas_de_auditoria' into 'develop'
Removed html entities in the audit views

See merge request artica/pandorafms!1631
2018-10-01 12:37:52 +02:00
alejandro-campos 8e2f4b0eaa Implemented license validation for mobile console 2018-08-23 13:57:41 +02:00
fermin831 d8d18e422e Fixed ACL enterprise in home screen 2018-08-03 14:22:26 +02:00
samucarc ad7610d7f1 Removed html entities in the audit views 2018-07-24 15:02:11 +02:00
fermin831 2e8e3c27b6 [Rebranding] Modified tinylogo by custom_logo in node 2018-05-22 13:40:23 +02:00
fermin831 8fc8c25548 Fixed login query params deletion (now it does not delete) 2018-04-18 17:58:44 +02:00
enriquecd 18f3020785 Change fixed header and fixed menu positions - #1844 2018-02-28 19:02:54 +01:00
enriquecd 16f5b047d6 Filter config_prepare_session when use F5 balancer - #1882 2018-02-06 17:10:59 +01:00
enriquecd 412374ef25 Fix setting visual console as home screen - #1694 2018-01-12 11:06:42 +01:00
enriquecd 790b5b5da6 Redirect to real url when login - #1694 2017-12-14 12:11:49 +01:00
enriquecd b6b0c8532d Carrefour auto loginhash existing session - #1679 2017-12-11 16:30:09 +01:00
enriquecd abce89355d Insert password changes by recover mail in system audit log - #1329 2017-12-05 12:56:50 +01:00
Arturo Gonzalez ea06ba213b Added registration method to reset pass 2017-08-03 13:05:57 +02:00
Arturo Gonzalez 278330e8f6 Added some fixes to reset pass feature 2017-07-19 11:37:17 +02:00
daniel bea2a38969 fixed error xss in login page 2017-06-29 13:07:35 +02:00
vgilc 3ae20056fc Merge branch '990-advise-links-doesnt-work-in-open-version-dev' into 'develop'
Changed bad ajax call

See merge request !562
2017-06-14 11:05:38 +02:00
daniel 2d441437a8 fixed errors in login page 2017-06-08 11:26:16 +02:00
Arturo Gonzalez d101d9abdc Changed bad ajax call 2017-06-07 11:28:09 +02:00
vgilc 149a77a559 Revert "Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7_rev' into 'develop'"
This reverts merge request !558
2017-06-07 09:32:35 +02:00
vgilc c674892709 Revert "Merge branch 'fixed-errors-in-login' into 'develop'"
This reverts merge request !559
2017-06-07 09:31:46 +02:00
daniel c25c5acfeb fixed errors instalation 2017-06-06 15:22:58 +02:00
daniel 5d3a0c4ab7 fixed errors in login page 2017-06-06 13:57:10 +02:00
Arturo Gonzalez a1063e9b50 Translations changed 2017-05-29 12:35:31 +02:00
artu30 faa353bc5c Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev'
# Conflicts:
#   pandora_console/include/help/clippy/extension_cron_send_email.php
2017-05-23 09:50:22 +02:00
enriquecd 57393eb9cf Fix logout bad permission with myslq service stopped dialog - #825 2017-05-19 11:12:58 +02:00
Arturo Gonzalez 634db70812 Added second condirmation to user session 2017-05-08 12:11:51 +02:00
Arturo Gonzalez dba263632b Revert "Revert "Fixed license failure""
This reverts commit 55196854b0.
2017-05-05 12:26:34 +02:00
Arturo Gonzalez 55196854b0 Revert "Fixed license failure"
This reverts commit 14e7d4b448.
2017-05-05 12:21:58 +02:00
Arturo Gonzalez 830ad6fc90 Revert "Revert "Fixed license failure""
This reverts commit 2b72053992.
2017-05-05 12:17:25 +02:00
Arturo Gonzalez 2b72053992 Revert "Fixed license failure"
This reverts commit 14e7d4b448.
2017-05-05 12:14:17 +02:00
Daniel Maya 14e7d4b448 Fixed license failure 2017-04-27 10:49:54 +02:00
Arturo Gonzalez 5b015dbcb9 Added new icon to meta mail setup and change mail message 2017-04-20 16:11:45 +02:00
Arturo Gonzalez 14a3a79eb3 Changed cod type 2017-04-20 15:00:24 +02:00
Arturo Gonzalez bfa3b43ee7 Added changes to reset password system 2017-04-20 12:36:33 +02:00
Arturo Gonzalez a1f23af142 Added new setup menu to mail 2017-04-20 12:15:45 +02:00
Arturo Gonzalez df80304a80 Move code to enterprise section 2017-04-20 11:36:40 +02:00
Arturo Gonzalez e26dfcd466 Move code to enterprise section 2017-04-20 11:18:43 +02:00