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

342 Commits

Author SHA1 Message Date
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
Arturo Gonzalez 727bd095f5 Added function to reset password in node 2017-04-20 10:59:32 +02:00
Arturo Gonzalez 48f7fa50dd Added error control and email handler 2017-04-19 16:04:24 +02:00
Arturo Gonzalez 7011eee871 Added a new page to reset password, for now without code, only visual page and error control 2017-04-19 13:26:20 +02:00
daniel 07e5274d0d fixed error in login page errors and change icon pdf report 2017-03-22 15:26:54 +01:00
daniel e888675766 fixed minor error 2017-03-16 18:43:07 +01:00
daniel e252135979 merge develop 2017-03-15 17:09:40 +01:00
daniel aec0d91109 login page new 2017-03-15 15:23:28 +01:00
daniel a87839bd07 login page 2017-03-15 10:12:18 +01:00
artu30 7bca59dee1 Merge branch 'move_mr_to_um' into 'develop' 
Move mr to um

See merge request !249
 2017-03-13 16:45:54 +01:00
Arturo Gonzalez 44ac96ae5e Added mr to um menu (online open and enterprise). Ticket #510 2017-03-13 15:52:30 +01:00
enriquecd 0094cfa9bf Center alert modal window when is opened - #93 2017-03-13 13:25:16 +01:00
Arturo Gonzalez 46b008708c Move mr to um section 2017-03-10 14:01:24 +01:00
m-lopez-f 8de4984faf Fixed dialog of system warning alerts. Gitlab: #506 2017-03-09 15:40:59 +01:00
m-lopez-f 8a1bdf5017 Fixed problems with login that this user not have a administration permissions. Gitlab #323 2017-02-21 09:47:42 +01:00
Arturo Gonzalez 584427de06 Added changes to finish rr feature. Ticket #169 2017-02-14 09:36:11 +01:00
Arturo Gonzalez 5b7f4a5139 Merge branch 'develop' into feature/rolling_release 
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/functions.php
	pandora_console/index.php
	pandora_console/pandoradb_data.sql
 2017-02-13 14:19:25 +01:00
Arturo Gonzalez cafda2a116 Added new option to see the menu bar in classic mode. Ticket #234 2017-02-07 12:58:29 +01:00
daniel 543fd0c7ea delete shortcut bar 2017-02-03 12:23:58 +01:00
daniel 1b26423867 Merge branch 'develop' into 135-informe-de-eventos-sale-agrupado-int-4330-open 2017-01-18 17:39:04 +01:00
m-lopez-f 12f28a00b2 Add logout from session if user have a not login active 2017-01-18 11:57:15 +01:00
daniel 993bad314d fixed errors in events reports #135 2017-01-11 13:26:50 +01:00
m-lopez-f 3b0344298c Revert "Fixed problems with double pandora in servers. Ticket: #3557" 
This reverts commit e7021d8a0f.
 2016-11-18 13:01:13 +01:00
m-lopez-f e7021d8a0f Fixed problems with double pandora in servers. Ticket: #3557 2016-11-07 09:12:58 +01:00
Arturo Gonzalez 63b19a6a54 Added new parameter to configure the saml path in authentication setup 2016-09-08 17:36:56 +02:00
m-lopez-f 14a627fc33 Only show error of licences if user is admin. Ticket: #3999 2016-09-06 16:05:24 +02:00
Arturo Gonzalez 902d0fac9a Control PHP restrictions to minor release process. 2016-07-20 10:08:31 +02:00
Arturo Gonzalez 70c771013c Fixed things in rolling release develop 2016-07-19 15:39:31 +02:00
Arturo Gonzalez 8c20874a88 Changed rolling release manager system. 2016-07-19 12:39:03 +02:00
Arturo Gonzalez 318ba4f049 Added some changes to SAML login system. 2016-07-13 15:33:43 +02:00
Daniel Maya d6b614199a Fixed path. Ticket #3364. 2016-06-27 11:56:39 +02:00
Daniel Maya a75e416b8c redirect mobile. Ticket #3364. 2016-06-27 11:13:34 +02:00
fermin831 d4795bc039 Login wizard may be displayed on enterprise version 
(cherry picked from commit 08dacd5f43)
 2016-06-21 12:01:57 +02:00
fermin831 e2fb16cf63 Added unmerged changes from identification wizard feature 2016-06-16 13:27:19 +02:00
fermin831 e8ce7e7a13 Changed Mail to XXX to Mail to Admin and email is retrieved from initial wizard 2016-06-16 13:13:23 +02:00
fermin831 d5cad00655 Added language and fixed last_um_check functionality 2016-06-16 13:11:04 +02:00
fermin831 7717d633fd Fixed download messages for first time 2016-06-16 13:10:47 +02:00
fermin831 55db630b36 Removed some unwanted traces 2016-06-16 13:09:25 +02:00
fermin831 92563961a9 Added um messages pop-up and fixed popup order 
Conflicts:
	pandora_console/index.php
 2016-06-16 13:09:09 +02:00
fermin831 fcafb16648 Added connection with update manager and some design changes 
Conflicts:
	pandora_console/index.php
 2016-06-16 13:02:29 +02:00
fermin831 dbde4ffc43 Added dummy and undesigned identification wizard 
Conflicts:
	pandora_console/godmode/update_manager/update_manager.setup.php
	pandora_console/include/functions_config.php
	pandora_console/index.php
 2016-06-16 12:59:11 +02:00
Arturo Gonzalez 9bc9bb9cc3 Saml login. Added restiction to admin users and saml button 2016-06-03 12:48:04 +02:00
Arturo Gonzalez b706e92b34 Rolling release in progress... (Fixed an important thing) 2016-06-01 15:26:19 +02:00
Arturo Gonzalez 0618dbbab3 Rolling release in progress... (Added minor releases) 2016-06-01 14:43:31 +02:00
Arturo Gonzalez c0ccd438a9 Saml login fixed 
(cherry picked from commit 02344033f3)
 2016-05-26 16:42:35 +02:00
Arturo Gonzalez 5fb6c1cbcd Fixed some errors in saml login system 2016-04-28 12:39:27 +02:00
Arturo Gonzalez 497e56510a Fixed error when log in as admin with saml login method. 2016-04-06 11:07:26 +02:00
Arturo Gonzalez e9eb16a848 Some changes in saml login system. 2016-02-18 12:29:50 +01:00
Arturo Gonzalez a3a38c9bb6 New login method (saml). Ticket#3393 2016-02-17 13:05:22 +01:00
KIKUCHI Koichiro 0038e7c6e6 Use relative path for renaming install.php 2015-11-13 11:17:47 +09:00
m-lopez-f 7ca6cff969 Fixed problems with view godmode extensions. Tiquet: #2912 2015-10-20 09:42:34 +02:00
m-lopez-f 256da3bc3d Add new functions from acl enterprise menu 2015-10-19 15:08:44 +02:00
Arturo Gonzalez Diaz 5230a9eaa6 Now with the installer 'install.php', in the final step, you can choose if rename the file 'install.php'. Ticket #2539 2015-07-27 18:31:55 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
Ramon Novoa c32c167b6e Ask for the old password before letting a user renew his password. 
(cherry picked from commit 0840c20764)
 2015-05-19 11:38:30 +02:00
mdtrooper 1a035873dc Fixed the PHP Warnings about the re-start the session. 2015-05-06 18:42:42 +02:00
m-lopez-f acfd2146dc Change views and styles in Console 2015-04-01 12:09:23 +02:00
mdtrooper 5f57ca716b Change some code for the future fixed in PHP about the try catch in the includes. TICKET: #1791 (still open thanks PHP) 2015-03-17 16:48:52 +01:00
Ramon Novoa df651810d4 Added support for password encryption to the Pandora FMS Console. 2015-03-02 17:30:19 +01:00
mdtrooper ad26957cef Fixed the lost parameters when the user has a homepage and he tries to access a pandora section (for example lost session). TICKET: #1630 2015-01-19 15:17:58 +01:00
mdtrooper 99786a5a16 Fixed the custom config values for user in the first login. 2015-01-19 14:35:56 +01:00
mdtrooper e750aa7c91 Fixed the first page user for Dashboard. TICKET: #1588 2015-01-16 12:03:03 +01:00
Alejandro Gallardo Escobar c15df44434 Fixed the 2 step login 2014-12-12 12:38:08 +01:00
Alejandro Gallardo Escobar 123fdaee1a Minor fixes 2014-12-11 18:43:30 +01:00
Alejandro Gallardo Escobar 9512216ed6 Moved some functions 2014-12-11 18:19:47 +01:00
Alejandro Gallardo Escobar 0d54510462 Modifications on the login process to include the 2 step verification 2014-12-11 16:18:26 +01:00
mdtrooper 631f0ee2b7 Fixed the lost hash user in the links from metaconsole to the nodes. 2014-11-25 11:07:41 +01:00
Ramon Novoa 6fc115806a Fixed ticket #1553. 2014-11-17 16:55:58 +01:00
Sancho Lerena e94ed05cbd Fixed problem with update check: cannot be disabled because variable was never checked :-O 2014-09-25 13:45:12 +02:00
mdtrooper 5a2102f26c 2014-08-12 Miguel de Dios <miguel.dedios@artica.es> 
* index.php, operation/agentes/ver_agente.php,
	operation/agentes/estado_monitores.php, general/header.php,
	include/functions_clippy.php, include/functions_ui.php,
	include/help/en/help_context_module_unknow.php,
	include/help/clippy/module_unknow.php, include/styles/pandora.css,
	include/javascript/intro.js: added first version of context help
	interactive.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10410 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-08-12 16:31:27 +00:00
mdtrooper 8c7ac00f14 2014-08-08 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions.php,
	include/help/clippy/godmode_agentes_modificar_agente.php,
	include/help/clippy/homepage.php,
	include/help/clippy/godmode_agentes_configurar_agente.php,
	include/javascript/intro.js,
	include/javascript/introjs.css,
	include/javascript/clippy.js,
	include/functions_ui.php,
	include/functions_clippy.php,
	index.php,
	general/header.php: first version of the new feature a annoying
	clippy such as the lovely micro$oft mascot.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10393 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-08-08 15:11:00 +00:00
alexhigh 2f50fb13bd 2014-07-04 Alejandro Gallardo <alejandro.gallardo@artica.es> 
* index.php: Now the shortcut bar isn't loaded while
	the pandora console is in fullscreen mode.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10317 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-07-04 15:46:14 +00:00
mdtrooper 8e972ed3ad 2014-06-24 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_extensions.php, index.php: force to load the
	new integrated update manager and don't load the old update manager
	extension.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10273 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-24 11:14:49 +00:00
mdtrooper 61144da653 2014-06-10 Miguel de Dios <miguel.dedios@artica.es> 
* include/functions_config.php,
	include/functions_update_manager.php, index.php,
	general/logon_ok.php, extensions/update_manager.php,
	godmode/update_manager_xxx/update_manager.online.php: work in the
	first version of new update manager.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10154 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-10 14:34:27 +00:00
alexhigh 450b5fe324 2014-06-06 Alejandro Gallardo <alejandro.gallardo@artica.es> 
* include/functions_snmp_browser.php: Fixed an error.
	
	* index.php: Modified the config.php permission check
	on Windows systems.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10128 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-06-06 09:58:06 +00:00
zarzuelo 3a4ec99fe5 2014-05-30 Sergio Martin <sergio.martin@artica.es> 
* general/logon_ok.php
	godmode/setup/news.php
	include/functions.php
	pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	index.php
	extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql
	extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql
	extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql: Added modal window mode
	to the pandora news for ticket: #821



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10044 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-05-30 09:27:20 +00:00
mdtrooper 4acd8e9b95 2014-03-05 Miguel de Dios <miguel.dedios@artica.es> 
* index.php, operation/search_results.php: fixed the global search
	when the text to search end with whitespace.
	
	Incident: #605




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9510 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2014-03-05 15:29:57 +00:00
zarzuelo 4af53ca3ad 2013-10-11 Sergio Martin <sergio.martin@artica.es> 
* include/functions_ui.php
	index.php
	general/header.php: Add include of dialog.css in 
	config for incident #254



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8889 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-11 09:19:59 +00:00
mdtrooper bc81b2fac4 2013-10-02 Miguel de Dios <miguel.dedios@artica.es> 
* include/javascript/jquery.pandora.js, index.php,
	general/login_page.php: fixed the show the warning trial enterprise
	message when fail login.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8841 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-02 10:08:45 +00:00
Ramon Novoa afe07ff99f 2013-10-01 Ramon Novoa <rnovoa@artica.es> 
* index.php,
	  include/config_process.php: Removed a redeclaration of develop_bypass
	  and set it to 0 by default.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8838 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-10-01 12:53:38 +00:00
mdtrooper f4c2ae0ea8 2013-09-30 Miguel de Dios <miguel.dedios@artica.es> 
* index.php: fixed the check login parameter.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8832 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-09-30 13:56:14 +00:00
mdtrooper c0cf75417c 2013-08-27 Miguel de Dios <miguel.dedios@artica.es> 
* index.php, include/javascript/pandora.js: fixed code style.
	
	* godmode/massive/massive_edit_modules.php: fixed the javascript
	that showed some rows before to select modules to edit.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8699 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-08-27 09:29:36 +00:00
mdtrooper 04afb4615d 2013-08-20 Miguel de Dios <miguel.dedios@artica.es> 
* godmode/servers/servers.build_table.php, include/functions_db.php,
	include/functions_servers.php, index.php: improved the source code
	style.
	
	* include/functions_api.php: added the call to update the agent.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8682 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-08-21 12:37:37 +00:00
koichirok 4eeb07ccc3 2013-08-14 Koichiro Kikuchi <koichiro@rworks.jp> 
* index.php: Improve footer layout.

	MERGED FROM branch_4.0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8663 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-08-14 06:46:20 +00:00
koichirok 8b705f701c 2013-08-08 Koichiro Kikuchi <koichiro@rworks.jp> 
* index.php: Fixed footer layout probrems: Now we can see the
	 footer at the browser bottom when reducing the browser height.
	 Also fixes the footer overlay probrem in some pages (e.g.
	 "Modules in policy" page).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8647 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-08-08 14:05:57 +00:00
mdtrooper 4ffc91b368 2013-08-07 Miguel de Dios <miguel.dedios@artica.es> 
* godmode/setup/setup_auth.php, godmode/admin_access_logs.php,
	godmode/agentes/module_manager.php: removed the code as
	"call time passing variables by reference" deprecated in PHP 5.4.
	
	* index.php: improved the source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8635 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-08-07 08:26:26 +00:00
zarzuelo 6860129ced 2013-08-01 Sergio Martin <sergio.martin@artica.es> 
* include/functions_filemanager.php
	images/upload_file.png
	images/edit.png
	images/mimetypes/unknown.png
	images/mimetypes/image.png
	images/mimetypes/zip.png
	images/mimetypes/directory.png
	images/mimetypes/text.png
	images/create_directory.png
	images/create_file.png: Change icons on filemanager
	adding some usability improvements

	* index.php: Fix out of bounds of the footer in the
	policy modules view for bug #2320

	* godmode/massive/massive_operations.php: Fix double
	advertment alert

	* include/help/en/help_profile.php
	include/help/es/help_profile.php: Make changes on the
	ACLs table to put it with the same permissions of the 
	wiki



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8617 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
 2013-08-01 14:56:50 +00:00