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

453 Commits

Author SHA1 Message Date
fermin831 27cebafd02 Merge branch 'feature/identification_wizard' into pandora_6.0 
Conflicts:
	pandora_console/godmode/update_manager/update_manager.setup.php
 2016-06-13 18:36:35 +02:00
fermin831 a5bb107984 Fixed display newsletter checkbox at first time 2016-06-13 18:18:36 +02:00
fermin831 2ea9b6f97b Added some dafault values 2016-06-13 18:18:12 +02:00
fermin831 a93a6befee Removed some unwanted traces 2016-06-13 17:31:17 +02:00
fermin831 72fbd5e67a Added um messages pop-up and fixed popup order 2016-06-13 17:24:47 +02:00
fermin831 e578c8ff64 Added some definitive images and fixed several design issues 2016-06-13 13:06:10 +02:00
fermin831 60df86a8d4 Added feedback message when subscription and register 2016-06-08 18:32:15 +02:00
fermin831 bdbb74e6db Added connection with update manager and some design changes 2016-06-08 13:51:34 +02:00
Daniel Maya 7849ebb7b0 Auto-hidden menu.Ticket #3601 
(cherry picked from commit c5e97eb396)
 2016-06-07 14:55:26 +02:00
Daniel Maya 380cafffde New development. Display lateral menus whit left click. 
(cherry picked from commit 0acf4f41eb)
 2016-06-06 11:41:00 +02:00
m-lopez-f d0556f96c3 Fixed url in firts task of custom field 
(cherry picked from commit 18ba1ed374)
 2016-06-06 10:18:06 +02:00
Daniel Maya a291eaf143 Fixed menu position. Ticket #3709. 
(cherry picked from commit a42e3a310b)
 2016-06-02 15:14:28 +02:00
Arturo Gonzalez 56ffe00f45 Fixed errors in saml login page 
(cherry picked from commit 9255d87869)
 2016-05-30 10:24:22 +02:00
Arturo Gonzalez 9caeb1e7f8 Added a diferent loging page to saml system. 
(cherry picked from commit 8cb651079a)
 2016-05-27 14:00:30 +02:00
fermin831 c91a473748 Solved newsletter display if forced. Delete all required when return 2016-05-26 18:41:38 +02:00
fermin831 8ef98134cf Solved problem with return button 2016-05-26 17:57:26 +02:00
Arturo Gonzalez 3b1a3692dd Added change in pandora header, now users without PM permissions dont see warning incon. Ticket #3548 
(cherry picked from commit f52d02992e)
 2016-05-26 17:25:20 +02:00
fermin831 5740aa3be7 Added pagination to update manager messages 2016-05-26 16:52:47 +02:00
fermin831 62aab34c8f Added header link to UM messages 2016-05-26 15:53:31 +02:00
fermin831 92c5751bbb Minor type fix 2016-05-25 13:03:19 +02:00
fermin831 1a743640b5 Added dummy and undesigned identification wizard 2016-05-25 12:43:49 +02:00
Arturo Gonzalez b98056b65a Revert "Revert "New login method (saml). Ticket#3393"" 
This reverts commit f59665fe4b.
 2016-05-18 12:04:52 +02:00
fermin831 6cdf363b27 Improved sql cache to permit make cache of several databases TICKETS #3581 2016-05-03 16:06:13 +02:00
Arturo Gonzalez f59665fe4b Revert "New login method (saml). Ticket#3393" 
This reverts commit 08569e64e3.

Conflicts:
	pandora_console/general/login_page.php
	pandora_console/godmode/setup/setup_auth.php
	pandora_console/include/constants.php
	pandora_console/index.php
 2016-03-29 16:34:41 +02:00
Arturo Gonzalez 502988c812 Some changes in saml login system. 
(cherry picked from commit e9eb16a848)
 2016-03-29 13:19:58 +02:00
Arturo Gonzalez 08569e64e3 New login method (saml). Ticket#3393 
Conflicts:
	pandora_console/include/auth/mysql.php
 2016-03-29 13:15:37 +02:00
Arturo Gonzalez dd30466665 Revert "New login method (saml). Ticket#3393" 
This reverts commit d373d3b3aa.
 2016-02-18 12:54:24 +01:00
Arturo Gonzalez 45d8ac18a8 Revert "Some changes in saml login system." 
This reverts commit 2c1e80d913.
 2016-02-18 12:53:39 +01:00
Arturo Gonzalez 2c1e80d913 Some changes in saml login system. 2016-02-18 12:27:48 +01:00
Arturo Gonzalez d373d3b3aa New login method (saml). Ticket#3393 2016-02-17 13:08:26 +01:00
mdtrooper b94f47f3a9 Fixed the refresh time in the enterprise dashboard. TICKET: #3156 2016-01-13 14:10:49 +01:00
m-lopez-f a57f62e5bf Fixed problems with performance. Tiquet: #2970 2015-11-18 16:31:44 +01:00
m-lopez-f 740536a034 Changed text in firts task 2015-08-06 14:55:55 +02:00
m-lopez-f 42f8ad7072 Change url in botton create. Tiquet: #2499 2015-07-22 08:50:15 +02:00
m-lopez-f c4d6c18b25 Fixed styles and errors of php 2015-07-14 15:59:39 +02:00
m-lopez-f 8c64e6b481 Fixed style 2015-07-09 17:52:37 +02:00
m-lopez-f 606e29684b Add pagination in custom reports and visual console. Tiquet: #2398 2015-07-08 16:09:00 +02:00
mdtrooper 3e2fd15302 Fixed, now the first task for visualmap does not show in metaconsole. 2015-07-06 18:18:52 +02:00
m-lopez-f 8c3056eb79 Add legal text in files and change data 2015-07-02 15:24:39 +02:00
Alejandro Gallardo Escobar 0b2bdfa72d Improved the behaviour of the login page inputs 2015-06-30 15:48:54 +02:00
m-lopez-f 1b4ae0d26e Merge to feature/Newview 2015-06-29 10:39:05 +02:00
m-lopez-f 806962f2e5 Add new firts task and change text in other 2015-06-29 10:33:01 +02:00
m-lopez-f 06b56d80c8 Add new view when no have data in this view 
(cherry picked from commit 15fb6f20a4)
 2015-06-26 14:52:50 +02:00
m-lopez-f 15fb6f20a4 Add new view when no have data in this view 2015-06-26 14:52:01 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f 37d792e07c Change visual 2015-06-25 08:21:53 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
m-lopez-f ff1186ee57 Changed visual of console 2015-06-16 16:09:50 +02:00
m-lopez-f 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00