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

3803 Commits

Author SHA1 Message Date
mdtrooper 95873d9356 Added api for metaconsole. Ticket: #1474 2014-12-15 19:39:05 +01:00
Alejandro Gallardo Escobar 52e6dda3b4 Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop 
Resolved conflicts:
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql
	pandora_console/include/styles/pandora.css
 2014-12-15 15:06:29 +01:00
artica 151f2a5b59 Auto-updated build strings. 2014-12-13 00:01:12 +01:00
mdtrooper d78461a92c Working in the improvements. Incident#1574 2014-12-12 15:01:50 +01:00
mdtrooper b42d643968 Finish the working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
mdtrooper 5d485e16ef Working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
mdtrooper 8633186b0e Working in the improvements. Incident#1574 2014-12-12 15:00:21 +01:00
Ramon Novoa d46c114fd8 Small changes to support the Z/OS extension. 2014-12-12 12:56:21 +01:00
artica e0a80add4b Auto-updated build strings. 2014-12-12 00:01:10 +01:00
Alejandro Gallardo Escobar 9512216ed6 Moved some functions 2014-12-11 18:19:47 +01:00
Alejandro Gallardo Escobar 30f24ff583 Modifications on the ajax calls to gain compatibility 2014-12-11 17:00:55 +01:00
Alejandro Gallardo Escobar 7caf016e4d Added some new rules 2014-12-11 16:16:36 +01:00
Alejandro Gallardo Escobar 33c6789144 Added an option to allow the users to enable the 2 step auth 2014-12-11 16:14:55 +01:00
Alejandro Gallardo Escobar 3c1dbbdc73 File with double auth utilities to be accessed by ajax 2014-12-11 16:10:15 +01:00
Alejandro Gallardo Escobar b71082ccdb Added a class to perform google autenticator checks 2014-12-11 16:09:17 +01:00
mdtrooper 9019b9c78f Fixed the bar charts with all values equal to 0. 2014-12-11 13:48:51 +01:00
artica 523d9dba7e Auto-updated build strings. 2014-12-11 00:01:07 +01:00
artica 7430c87ea0 Auto-updated build strings. 2014-12-10 00:01:10 +01:00
mdtrooper 704b3932a4 Working in the massive action for the tags in policies. Ticket: #1576 2014-12-09 15:57:35 +01:00
artica 95e57c41fe Auto-updated build strings. 2014-12-09 00:01:08 +01:00
artica 6b845912f2 Auto-updated build strings. 2014-12-08 00:01:09 +01:00
artica 8dc47efb5d Auto-updated build strings. 2014-12-07 00:01:08 +01:00
artica 153c666a1b Auto-updated build strings. 2014-12-06 00:01:09 +01:00
artica 2a293139ec Auto-updated build strings. 2014-12-05 00:01:09 +01:00
mdtrooper d20c945af8 Fixed the count of ok agents in the group view into the treeview 
(cherry picked from commit b711dcdd34)

Conflicts:
	pandora_console/include/functions_groups.php
 2014-12-04 16:33:34 +01:00
mdtrooper 1bd2166d7e Cleaned source code style. (only for test git) 2014-12-04 14:39:35 +01:00
mdtrooper 03890a5295 Fixed the acl tags with groups without tags. Ticket: #1611 2014-12-04 13:03:41 +01:00
mdtrooper 3a3db3f0f7 Fixed the acl tags with groups without tags. Ticket: #1611 2014-12-04 13:03:37 +01:00
artica bc27d934de Auto-updated build strings. 2014-12-04 00:01:10 +01:00
mdtrooper f25440d68a Working in the improves of agent view. Ticket: #1285 2014-12-03 16:30:36 +01:00
mdtrooper e45b8183d8 Working in the improves of agent view. Ticket: #1285 2014-12-03 16:30:36 +01:00
Vanessa Gil 7806cee6fd Fixed several bugs with acl tags. 2014-12-03 10:27:27 +01:00
artica 1587428f57 Auto-updated build strings. 2014-12-03 00:01:09 +01:00
mdtrooper 303b4f148f Added feature to set bbcode links in agents description and custom fields. Ticket #1404 2014-12-02 16:38:07 +01:00
mdtrooper 673d0bd34f Added the lost fields for item group in the editor. 2014-12-02 11:40:27 +01:00
artica ab5c8d4948 Auto-updated build strings. 2014-12-02 00:01:10 +01:00
mdtrooper 333781b203 Fixed the not init agents in the tree group view. Ticket: #1584 2014-12-01 16:37:40 +01:00
mdtrooper 3c76f41387 Fixed the group view for agents not init. Ticket: #1584 2014-12-01 13:56:40 +01:00
artica 3d4eb5a399 Auto-updated build strings. 2014-12-01 00:01:08 +01:00
artica 1f3e07cf75 Auto-updated build strings. 2014-11-30 00:01:08 +01:00
artica af5669a96d Auto-updated build strings. 2014-11-29 00:01:09 +01:00
mdtrooper ba24c38940 Fix the ACL tags in the edit module view. Ticket: #1602 2014-11-28 16:38:44 +01:00
mdtrooper 6ba6290830 Fixed the lost id_group in the items on visualmap. Ticket #1586 2014-11-28 16:37:07 +01:00
artica 0d9c5277aa Auto-updated build strings. 2014-11-28 00:01:08 +01:00
artica 9dabd9ce8d Auto-updated build strings. 2014-11-27 00:01:09 +01:00
mdtrooper a8a1bade0d Merge branch 'feature/ticket#1478-New_elements_visualmap' into develop 2014-11-26 16:12:38 +01:00
artica 12160c9a2d Auto-updated build strings. 2014-11-26 00:01:09 +01:00
Vanessa Gil af1b7c1f64 Fixed several bugs in events. 2014-11-25 16:58:20 +01:00
mdtrooper e48580c93a Working in the new elements for the visualmap. Ticket #1478 2014-11-25 13:15:51 +01:00
mdtrooper 018c5136c5 Working in the new elements for the visualmap. Ticket #1478 2014-11-25 11:52:04 +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
artica 6011b413dd Auto-updated build strings. 2014-11-25 00:01:09 +01:00
mdtrooper c7514cd29c Working in the new elements for the visualmap. Ticket #1478 2014-11-24 17:52:28 +01:00
mdtrooper 7edad2cb1d Working in the new elements for the visualmap. Ticket #1478 2014-11-24 16:40:59 +01:00
artica b0dde88f6d Auto-updated build strings. 2014-11-24 00:01:08 +01:00
artica 5326a799e0 Auto-updated build strings. 2014-11-23 00:01:08 +01:00
artica 124e2c39d1 Auto-updated build strings. 2014-11-22 00:01:09 +01:00
Alejandro Gallardo Escobar 07eb065a99 Now the boolean and module string graphs can search data into the history database 2014-11-21 16:01:01 +01:00
mdtrooper e63886e1e7 Fixed the box for the dashboard. 2014-11-21 13:41:20 +01:00
mdtrooper 9f7c8d4483 Working in the new elements for the visualmap. Ticket #1478 2014-11-21 13:28:11 +01:00
mdtrooper 22cff3c2b8 Working in the new elements for the visualmap. Ticket #1478 2014-11-21 10:42:14 +01:00
artica 472a360dbe Auto-updated build strings. 2014-11-21 00:01:09 +01:00
Vanessa Gil afadc5b0bb Fixed bug in event list. 2014-11-20 15:36:29 +01:00
mdtrooper bda09a22e1 Added in setup visual a check for to show the group as text. Ticket: #1501 2014-11-20 15:06:11 +01:00
mdtrooper bb05dfcd58 Fixed PHP warning about the unset 'server_log_dir' 2014-11-20 12:49:13 +01:00
artica 4aed3a4906 Auto-updated build strings. 2014-11-20 00:01:10 +01:00
mdtrooper afebae0b80 Added the toolbox button for copy items. Ticket: #1479 2014-11-19 16:30:01 +01:00
mdtrooper 7ba791f787 Working in the fusion of code of edition and view. 2014-11-19 16:30:01 +01:00
mdtrooper 3b00d4df58 Working in the fusion of code of edition and view. 2014-11-19 16:30:01 +01:00
mdtrooper c509a3195d Working in the fusion of code of edition and view. 2014-11-19 16:30:01 +01:00
mdtrooper 6008df9fc9 Working in the fusion of code of edition and view 2014-11-19 16:30:01 +01:00
mdtrooper 9e2626141b Working in the fusion 2014-11-19 16:30:01 +01:00
mdtrooper b2b163af46 Working in the fusion 2014-11-19 16:30:01 +01:00
mdtrooper 2401c68b26 Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:01 +01:00
mdtrooper a4bbfd40af Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:01 +01:00
mdtrooper 4a51f0c9f7 Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:01 +01:00
mdtrooper e48f675935 Removed the un used field label_color. 2014-11-19 16:30:00 +01:00
mdtrooper a9498399df Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:00 +01:00
mdtrooper 63d783907f Working in the fusion of edit and view code of visualmap. 2014-11-19 16:30:00 +01:00
mdtrooper c6987bdc0d Starting to the fusion. 2014-11-19 16:30:00 +01:00
mdtrooper 97278f60d2 Erased the deprecated field 'no_link_color' in table 'tlayout_data' 2014-11-19 16:30:00 +01:00
artica f587e837b0 Auto-updated build strings. 2014-11-19 00:01:09 +01:00
Alejandro Gallardo Escobar 144deab9d6 Fixed the agent module sla array data for the slicebar 2014-11-18 18:22:23 +01:00
Vanessa Gil e8f5fabeba Fixed tickets #1562, #1556. 2014-11-18 11:27:04 +01:00
artica 0423b93b4c Auto-updated build strings. 2014-11-18 00:01:13 +01:00
Alejandro Gallardo Escobar b7949f9b4a Merge branch 'feature/ticket#1554-ServicesSLA' into develop 2014-11-17 18:32:20 +01:00
Alejandro Gallardo Escobar 8587b8c265 Removed some graphs on the sla reports 2014-11-17 17:54:18 +01:00
artica e41a4415ec Auto-updated build strings. 2014-11-17 00:01:12 +01:00
artica 1ea690ab84 Auto-updated build strings. 2014-11-16 00:01:12 +01:00
artica fc42032a50 Auto-updated build strings. 2014-11-15 00:01:12 +01:00
artica 656bcb8ba3 Auto-updated build strings. 2014-11-14 00:01:11 +01:00
Alejandro Gallardo Escobar 7d6d4e05a4 Merge branch 'feature/ticket#1555-ReportGraphs' into develop 2014-11-13 20:08:02 +01:00
Alejandro Gallardo Escobar a12153dd6e Now the only average value of the simple graphs can be deactivated 2014-11-13 20:04:08 +01:00
artica e0134b6d43 Auto-updated build strings. 2014-11-13 00:01:07 +01:00
Alejandro Gallardo Escobar 40d67cc40c Minor changes on the function "reporting_get_planned_downtimes_intervals" call 2014-11-12 18:02:04 +01:00
artica dc74db1f4f Auto-updated build strings. 2014-11-12 00:01:12 +01:00
artica 81f9e37b28 Auto-updated build strings. 2014-11-11 00:01:07 +01:00
artica ba94ac8f4a Auto-updated build strings. 2014-11-10 00:01:09 +01:00
artica 9befe577f8 Auto-updated build strings. 2014-11-09 00:01:10 +01:00
Junichi Satoh d133abaab7 Updated japanese translations. 2014-11-08 10:55:51 +09:00
artica 152e7e3127 Auto-updated build strings. 2014-11-08 00:01:10 +01:00
Alejandro Gallardo Escobar 1018edcffd Improved some SLA functions to stop the calculations when the module id is invalid 2014-11-07 12:44:36 +01:00
artica fcba9681fb Auto-updated build strings. 2014-11-07 00:01:10 +01:00
Alejandro Gallardo Escobar 5e18e85b5d Fixed the error messages of the planned downtimes queries 2014-11-06 17:39:24 +01:00
mdtrooper a79af4c68c Fixed the javascript for hide the dinamic macros with this property setted. TICKET #1545 2014-11-06 16:43:45 +01:00
artica d9379f8c8b Auto-updated build strings. 2014-11-06 00:01:12 +01:00
hkosaka 4f3a9c4187 Added new API (delete_module_template_by_names). 2014-11-05 17:35:08 +09:00
artica 4d21cc7928 Auto-updated build strings. 2014-11-04 00:01:08 +01:00
artica a8b8bfd7d5 Auto-updated build strings. 2014-11-03 00:01:08 +01:00
artica 0908ed969d Auto-updated build strings. 2014-11-02 00:01:08 +01:00
artica 9d569522d8 Auto-updated build strings. 2014-11-01 00:01:08 +01:00
artica bddc4cc8bd Auto-updated build strings. 2014-10-31 00:01:12 +01:00
Vanessa Gil 0ddfb759d3 Updated translations. 2014-10-30 14:38:21 +01:00
artica 335bd6e3de Auto-updated build strings. 2014-10-30 00:01:08 +01:00
artica cfe3b6f8a7 Auto-updated build strings. 2014-10-29 00:01:06 +01:00
pandora-release d1d642727b Updated version and build strings. 2014-10-28 16:11:20 +01:00
artica 1d9736ad3b Auto-updated build strings. 2014-10-28 00:01:10 +01:00
artica 267f399e5e Auto-updated build strings. 2014-10-27 00:01:08 +01:00
artica 57dc110ce5 Auto-updated build strings. 2014-10-26 00:01:08 +02:00
artica 7c7b6b3927 Auto-updated build strings. 2014-10-25 00:01:10 +02:00
Alejandro Gallardo Escobar 66fe99e493 Minor change on the newsboard width 2014-10-24 13:00:57 +02:00
mdtrooper 606f613aed Fixed the io_safe_output for to use hex html entity for the character º. TICKET: #1495 2014-10-24 12:05:29 +02:00
mdtrooper c025f0ee83 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-10-24 11:02:55 +02:00
artica 83289ea0ca Auto-updated build strings. 2014-10-24 00:01:10 +02:00
pandora-release cef5cf245b Updated version and build strings. 2014-10-23 16:45:00 +02:00
Alejandro Gallardo Escobar c9a13aa255 Improved the performance of the planned downtimes queries 2014-10-23 13:01:00 +02:00
artica 0e6d6a41de Auto-updated build strings. 2014-10-23 00:01:10 +02:00
mdtrooper a13f523596 Added new constant 'ERR_AUTH' 2014-10-22 12:56:40 +02:00
Alejandro Gallardo Escobar ff14364ad7 Merge branch 'feature/history-db-optimization' into develop 2014-10-22 12:04:26 +02:00
Alejandro Gallardo Escobar e89565e760 Modified a bunch of functions to choose when the history db should be used and when not 2014-10-22 12:00:14 +02:00
Alejandro Gallardo Escobar fc5cfb3c32 Added the function "db_search_in_history_db" 2014-10-22 11:52:54 +02:00
Junichi Satoh 244b02516d Updated help. 2014-10-22 18:32:47 +09:00
artica 84c329c6c2 Auto-updated build strings. 2014-10-22 00:01:09 +02:00
mdtrooper 9473270d44 Updated the list of module macros in the helps 2014-10-21 14:38:17 +02:00
mdtrooper 67054d23e5 Updates the styles of calendar widget 2014-10-21 11:17:16 +02:00
artica 30e3064b2c Auto-updated build strings. 2014-10-21 00:01:10 +02:00
Alejandro Gallardo Escobar 266e3a81c5 Added the 'pure' parameter to the URLs of the function "reporting_get_stats_modules_status" 2014-10-20 17:18:24 +02:00
Alejandro Gallardo Escobar bbd7ae85df Error fixes on the function "graph_monitor_wheel" 2014-10-20 16:56:01 +02:00
Alejandro Gallardo Escobar 0b2c6f5c45 Fixed an error on the function "groups_get_tree" 2014-10-20 16:55:02 +02:00
mdtrooper 58fc774564 Added function 'modules_get_agent_group' 2014-10-20 16:45:47 +02:00
mdtrooper f0b446ae9c Into the function 'tags_check_acl' fixed check for profile all with some tag. And added function 'tags_check_acl_by_module' 2014-10-20 16:45:47 +02:00
Alejandro Gallardo Escobar 4cbc91d24e Added the function "openURLTagWindow" 2014-10-20 13:11:38 +02:00
artica 7da6763197 Auto-updated build strings. 2014-10-20 00:01:08 +02:00
artica 3f3a6fcea0 Auto-updated build strings. 2014-10-19 00:01:09 +02:00
artica 44fd6c6e43 Auto-updated build strings. 2014-10-18 00:01:11 +02:00
artica f07bdce454 Auto-updated build strings. 2014-10-17 00:01:08 +02:00
mdtrooper 2f66e76d9e Fixes the colors in calendar widget. Thanks Carla for advises 2014-10-16 17:06:50 +02:00
artica fd58a413af Auto-updated build strings. 2014-10-16 00:01:10 +02:00
Alejandro Gallardo Escobar f6f754983d Merge branch 'feature/ticket#825-MobileEnterpriseACL' into develop 2014-10-15 18:15:36 +02:00
Alejandro Gallardo Escobar dcee34c715 Added a special behaviour when the section is 'mobile' to get the Pandora FMS mobile sections 2014-10-15 18:14:56 +02:00