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

387 Commits

Author SHA1 Message Date
marcos 848f60229a updates on 2FA all users feature 2020-10-06 17:02:58 +02:00
Luis 0d27296b79 Fixed acl enterprise acl gextensions 2020-08-24 10:16:25 +02:00
Daniel Rodriguez 846fd10ce1 Merge branch 'ent-5824-connection-lost-warn' into 'develop' 
Ent 5824 connection lost warn

See merge request artica/pandorafms!3326
 2020-07-14 18:10:11 +02:00
Luis Calvo d3087de163 Merge remote-tracking branch 'origin/develop' into ent-5824-connection-lost-warn 2020-07-06 10:49:24 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
fbsanchez 032faf8c0c WIP Smart services 2020-06-26 15:48:58 +02:00
alejandro-campos cec16d01b8 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-23 09:56:21 +02:00
Daniel Rodriguez cd261fa629 Merge branch 'ent-5709-Fallo-refresh-consola-visual' into 'develop' 
Fixed error time refresh initial page CV

See merge request artica/pandorafms!3223
 2020-06-22 13:53:38 +02:00
Luis Calvo d346c76322 Connection error dialog working 2020-06-19 23:03:37 +02:00
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