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

806 Commits

Author SHA1 Message Date
Tatiana Llorente 90b61533f8 Fixed visual bugs in black theme - #4572 2019-09-10 10:26:28 +02:00
fbsanchez 9868462d43 Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha 2019-09-02 09:57:45 +02:00
Daniel Rodriguez aa383e3f56 Merge branch 'ent-4513-bugs-en-password-policy' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2678
 2019-08-30 14:35:57 +02:00
marcos.alconada d650ff6959 fixed error 2019-08-30 11:28:24 +02:00
Tatiana Llorente 56ffa6b056 Added button for close error popup - #4154 2019-08-21 12:44:19 +02:00
marcos.alconada 30f7a48d7b Fixed error with news modal windows 2019-08-12 09:36:16 +02:00
fbsanchez adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
Daniel Rodriguez bfb4cb19a0 Merge branch 'ent-4330-Bug-con-autorefresh-en-eventos' into 'develop' 
Added feature to autorefresh in events view with datatables - #4330

See merge request artica/pandorafms!2605
 2019-07-18 12:22:44 +02:00
Tatiana Llorente 0316c55d39 Added feature to autorefresh in events view with datatables - #4330 2019-07-16 16:46:36 +02:00
Tatiana Llorente 9ad4c98268 Added feature to autorefresh in events view with datatables - #4330 2019-07-16 15:43:52 +02:00
Alejandro Fraguas 1320e76d3d Merge branch 'ent-3927-contador-de-intentos-fallidos-en-la-pantalla-de-error-de-login' into 'develop' 
Ent 3927 contador de intentos fallidos en la pantalla de error de login

See merge request artica/pandorafms!2383
 2019-07-16 09:54:02 +02:00
Tatiana Llorente cb14a9f2e8 Added feature to autorefresh in events view with datatables - #4330 2019-07-16 09:38:52 +02:00
Tatiana Llorente 7d119bfe5a Added feature to autorefresh in events view with datatables - #4330 2019-07-15 17:41:20 +02:00
Daniel Barbero Martin bd070b706b fixed minor error 2019-07-11 12:45:52 +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
marcos.alconada 6349c29eb5 Add message for autenticaition error SAML 2019-07-01 13:45:42 +02:00
Daniel Rodriguez 6976ba9c8e Merge branch 'ent-3800-mal-enrutamiento-discovery' into 'develop' 
Ent 3800 mal enrutamiento discovery

See merge request artica/pandorafms!2350
 2019-06-26 12:02:43 +02:00
Daniel Rodriguez 265202f1ed Merge branch 'ent-4136-button-styles' into 'develop' 
Review 1

See merge request artica/pandorafms!2470
 2019-06-20 16:35:12 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez c741020538 styles review 2019-06-04 13:57:55 +02:00
fbsanchez b4dcf4a6f1 style review 2019-06-03 11:55:56 +02:00
fbsanchez 9de5dadbf2 style review 2019-06-03 11:16:51 +02:00
fbsanchez eb5ee75d33 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-03 09:18:49 +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 30320b7897 Fixed login button style and removed help icons from agent_management 2019-05-30 11:12:37 +02:00
fbsanchez 30ce8f65e4 UM register, UM newsletter flow improved 2019-05-29 10:01:21 +02:00
marcos.alconada 41bc705c02 Image only for welcome message 2019-05-24 14:19:31 +02:00
marcos.alconada 9587b4cc44 Image only for welcome message 2019-05-24 14:18:39 +02:00
fbsanchez f46fdea220 Merge remote-tracking branch 'origin/develop' into fix/uno 2019-05-23 18:46:56 +02:00
fbsanchez 8f9c9fd156 removed trace from user_edit 2019-05-23 18:46:43 +02:00
fbsanchez 4fe7680694 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-05-22 15:33:13 +02:00
fbsanchez bd88cbd42d 1st approach simplifying MC management 2019-05-22 15:31:59 +02:00
Daniel Rodriguez 979f11ca8f Merge branch 'ent-1668-update-manager' into 'develop' 
Ent 1668 update manager

See merge request artica/pandorafms!2420
 2019-05-22 15:25:49 +02:00
Luis Calvo e361c4243a Autorefresh bug fix 2019-05-21 12:16:06 +02:00
fbsanchez 5e9b2479eb Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager 2019-05-20 13:11:39 +02:00
fbsanchez 034480bf88 minor fixes 
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
 2019-05-16 12:28:46 +02:00
fbsanchez e7dbb55392 Minor fixes 
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
 2019-05-16 12:00:49 +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
marcos.alconada bc849c16fb Only one image for welcome new board 
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
 2019-05-14 17:13:44 +02:00
marcos.alconada bad2a330fd Se muestra en la pantalla mediante html la imganen 
Former-commit-id: ddd86fc0b4768ed5c3750c304fded70de3389864
 2019-05-14 09:48:41 +02:00
fbsanchez ced1b32915 Configuration, Registration and newsletter wizards 
Former-commit-id: bbd367a10fd01c229c848b15572c4b1d6ccb75cf
 2019-05-13 17:55:41 +02:00
marcos.alconada ac60e296c1 Add new message to News board 
Former-commit-id: ad9170857d95fa2c211d09a5f59f6012739177c5
 2019-05-10 11:17:46 +02:00
marcos.alconada dcfb9c9b61 se actualiza en mensaje en la meta 
Former-commit-id: b20edf93845577c1fdd551211907a25888c6543a
 2019-04-24 17:45:01 +02:00
marcos.alconada de4ea8434a Se ajusta la ventana de usuario bloqueado 
Former-commit-id: dca9700142a5f4b539892f8727d8e5c83222312b
 2019-04-24 17:11:02 +02:00
marcos.alconada d7ca0f1134 Add strong 
Former-commit-id: 68b08a3a6f7dbdd4365b88faf9bfb678e506a5ac
 2019-04-24 16:51:41 +02:00
marcos.alconada 43d8a25c39 Add remaning attemps 
Former-commit-id: 07960eaa4b3281ee13f14b0fc5249b94ac0626fa
 2019-04-24 16:49:04 +02:00
Alejandro Fraguas 6594095de7 Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' into 'develop' 
Ent 3707 nuevo diseño para las tablas

See merge request artica/pandorafms!2352

Former-commit-id: 684daf476bf288e294b67f97fc80fdf6a6ddcce4
 2019-04-17 10:19:42 +02:00
Tatiana Llorente 29c282dc79 Changed popup no access - #3625 
Former-commit-id: 0798f53d9074a580309aeb9f9577ec518efd9264
 2019-04-15 14:42:58 +02:00
Tatiana Llorente 6a9c972ed6 Changed popup no access - #3625 
Former-commit-id: c58c9f47bab666985ed4cfe0c9c5edf1ed057e76
 2019-04-12 13:54:48 +02:00
Luis Calvo 5998b30a16 Added css hint to discovery tasks when task list is empty 
Former-commit-id: 1da71cda1b1ed376bb6bae0281b0dd882dbfbeff
 2019-04-10 17:30:35 +02:00
Tatiana Llorente 3da2f267a2 New design for the tables - #3707 
Former-commit-id: 6b2550344a7748e210fdb81a26751e9e94cbbfa4
 2019-04-05 13:51:35 +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
Daniel Maya 8923c53ec4 Fixed problem with fixed header 
Former-commit-id: 9bf6d824b94f301a804511c106f6465ce9dff0fa
 2019-04-03 16:48:28 +02:00
Tatiana Llorente 34598f391b Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas 
Former-commit-id: 8b576f68f26c1fe2b0d6c1f9029eac599f7a377f
 2019-03-27 17:05:50 +01:00
Tatiana Llorente 845cb85c55 New design for tables - #3707 
Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
 2019-03-27 17:03:55 +01:00
alejandro-campos 082e5f06d6 fix pandora logo image path 
Former-commit-id: 92bc151f8e988758af7381ca95b8055ec7a23d5e
 2019-03-27 16:26:47 +01: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
fbsanchez ba0ddfb826 style revission 
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
 2019-03-26 19:29:48 +01:00
Daniel Barbero Martin 4cd06539a2 fixed minor error refresh header 
Former-commit-id: 5fd75dd4fe634760c37fb06a16cc127c9cbfc71d
 2019-03-26 18:37:49 +01:00
Daniel Barbero Martin 004fec7454 Revert "fixed minor error header disabled" 
This reverts commit 2cf945a5e3 [formerly 87ac8d400ac83f316bf8efb1fca6afe2d60e6c8c].


Former-commit-id: 3129ccb02e68230c537e25bc5bd939c400c2ae66
 2019-03-26 18:35:56 +01:00
Daniel Barbero Martin 2cf945a5e3 fixed minor error header disabled 
Former-commit-id: 87ac8d400ac83f316bf8efb1fca6afe2d60e6c8c
 2019-03-26 17:59:00 +01:00
fbsanchez 511295f1c6 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 
Former-commit-id: f43d6ace220a8058f91d115386bdf56e59550cbe
 2019-03-26 16:32:19 +01:00
fbsanchez 436e60c736 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 
Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f
 2019-03-25 20:14:24 +01:00
alejandro-campos 9947fb8f34 remove console.log 
Former-commit-id: 12feadfc9094d8507e5e7df595e7667a67964362
 2019-03-25 19:42:12 +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 Rodriguez 3ef49d14f9 Merge branch 'ent-3669-Cambios-en-cabecera' into 'develop' 
Ent 3669 cambios en cabecera

See merge request artica/pandorafms!2287

Former-commit-id: 8fd555ba5167fe268dccf0801366e6ad4fb58cd0
 2019-03-25 17:57:47 +01:00
Daniel Barbero Martin 4ea17bb0c6 fixed reload page twice 
Former-commit-id: 5944f47d1e0d2e5997deb6afcab6744a514216f7
 2019-03-25 12:53:50 +01:00
Tatiana Llorente fe7103ba9c Changes in header 
Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c
 2019-03-25 12:41:39 +01:00
fbsanchez 750c64fbd7 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
 2019-03-13 09:52:00 +01:00
Alejandro Fraguas cb1fc5dc67 Merge branch 'ent-3616-Pantalla-de-login' into 'develop' 
Ent 3616 pantalla de login

See merge request artica/pandorafms!2248

Former-commit-id: c6e02af2b50a12933ec31cd5496fafb10a646c7a
 2019-03-12 17:23:04 +01:00
manuel 8f9beccf76 Fixed url 
Former-commit-id: 7bed92d53f59a0b01034d3630dcddce8a7bc5cfa
 2019-03-11 12:47:27 +01:00
manuel bf0e8633ff Added button servers list in header 
Former-commit-id: 96d9f7a49d617b0a9f04df601c41bbce71009e38
 2019-03-11 12:36:52 +01:00
Tatiana Llorente 71afb7a741 New login page 
Former-commit-id: 69408bda61a30561372a5ebaecc08fd04b434611
 2019-03-11 10:07:22 +01:00
Tatiana Llorente acc44ff9ce Merge branch 'develop' into 'ent-3432-Nueva-cabecera-y-menu-lateral' 
Conflicts:
   pandora_console/install.php
Former-commit-id: 35214830b309620c88c44b32f93cfae93775e9a8
 2019-03-06 09:18:38 +01:00
fbsanchez 70e4e86cdf Merge remote-tracking branch 'origin/ent-3432-Nueva-cabecera-y-menu-lateral' into ent-3595-discovery-fase-2 
Former-commit-id: ba98fda78052b11f7bb579cf84d5e29e557e68ac
 2019-03-05 18:58:26 +01:00
fbsanchez c03631ec9b Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 
Former-commit-id: 1e68380f62f61e9ac895a0c2bade2e6c8f5b589f
 2019-03-05 18:56:14 +01:00
Tatiana Llorente 7be5d3e9e0 new header and menu 
Former-commit-id: 7a36ca23fc302cf3b86dca26971ce591107b66e8
 2019-03-05 12:54:11 +01:00
fbsanchez d89e3993e7 WIP first tasks 
Former-commit-id: 4fbdab2389d5727c44693b129baa4ceadc6934ae
 2019-03-04 20:02:35 +01:00
Tatiana Llorente 12a287f322 Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into ent-3432-Nueva-cabecera-y-menu-lateral 
Conflicts:
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/install.php


Former-commit-id: 1c1a318ae74ab3a363a88d99cc079eea6e213171
 2019-03-04 09:52:05 +01:00
Tatiana Llorente 36fa0fc41f new header and menu 
Former-commit-id: d1e8fbd044711f87b75177c32225be7847b60018
 2019-03-04 08:39:56 +01:00
samucarc 7e53461b94 Added new alert when failed database 
Former-commit-id: ee0e8efaf3f32b4c5a86d421873555969274ca43
 2019-02-28 17:40:11 +01:00
fbsanchez ec5c9d7c27 clippy returns 
Former-commit-id: b9ed010f5af1002593471a0d0298848b3593e41e
 2019-02-27 13:41:26 +01:00
Tatiana Llorente 34eedc5330 new header and menu 
Former-commit-id: aac70c14548c725b68fa031202e0b8449b725f45
 2019-02-26 11:20:17 +01:00
Tatiana Llorente 3e87c8e931 new header and menu 
Former-commit-id: 975b72219cb07e0d4f9b332607e554bd65ea7cc3
 2019-02-26 10:43:59 +01:00
Tatiana Llorente 4c92375a58 new header and menu 
Former-commit-id: 3509107664a968fc358a8bb3e662f27b26b10c73
 2019-02-25 12:23:15 +01:00
Tatiana Llorente 526311d1c6 new header and menu 
Former-commit-id: 0748bc89d30e8ae4723026848d493d15d82af9cd
 2019-02-25 11:54:46 +01:00
fbsanchez b1aa0fe2f2 Merge from develop 
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
 2019-02-22 12:30:27 +01:00
fbsanchez 912f0baace Discovery Tasks first tasks and some minor fixes 
Former-commit-id: 4a37dc99f1b1a95217e9be207526d750133a14a6
 2019-02-15 18:42:44 +01:00
fbsanchez 3e9e668e00 Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices 
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
 2019-02-14 10:59:27 +01:00
fbsanchez f75a292b34 minor fixes/updates in notifications UI 
Former-commit-id: d4f5b7db1b5a6f0a023e33c4b8cd55db7765b11a
 2019-02-13 16:40:37 +01:00
fbsanchez ed63ef47fa Moved ReconServer to DiscoveryServer 
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
 2019-02-13 14:56:10 +01:00
fermin831 8be28b5fed Removed some header icons (it will be substituted by notifications) 
Former-commit-id: 29929ee6f9785cf892b3a0afe7779531d5615e6c
 2019-02-13 11:47:33 +01:00
fermin831 fe50d6caff Open toasts and messages into new window 
Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8
 2019-02-13 11:09:15 +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
fermin831 48724fe033 Added onclick to notification-item's 
Former-commit-id: 2e4833686b08b104b11ba9023f6eca38e0ed6bd9
 2019-02-12 16:46:21 +01:00
fermin831 cc2b2709f9 Show the notifications with AJAX 
Former-commit-id: 73f407d13d3805dce879c1431311a4aaec00c152
 2019-02-12 16:25:59 +01:00