tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-14 06:18:40 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,557 Commits 34 Branches 30 Tags
Commit Graph

12557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alejandro Gallardo Escobar
5a2a54e127 Some changed on the vbar and hbar legends and tooltips and changed the windows carriage returns by its unix version 
(cherry picked from commit 3637ddc2d479edfc68d6494cb8f59ab85e72ec80)
 2016-05-26 08:58:33 +02:00
artica
49f0d1fa1f Auto-updated build strings. 2016-05-26 00:01:16 +02:00
Alejandro Gallardo Escobar
e16cb318a1 Visual fixes on the horizontal bar graphs 2016-05-25 18:02:13 +02:00
Arturo Gonzalez
74ab9a5fe9 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2016-05-25 17:43:52 +02:00
Alejandro Gallardo Escobar
e4758e9731 Fixed an error which affected to the values of the custom graphs 2016-05-25 17:41:19 +02:00
Arturo Gonzalez
9a9f8e17b8 Fixed events with/without tags table in advanced options. Ticket #3702 2016-05-25 17:40:34 +02:00
axl89
3179a206a4 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2016-05-25 16:38:28 +02:00
axl89
79219cfc9f Fixed Sauce Labs integration 2016-05-25 16:38:10 +02:00
Arturo Gonzalez
921a79bd30 Fixed error when a user havent profiles and is acl strict. Ticket #3555 2016-05-25 16:04:06 +02:00
axl89
35f937a630 Fixed using self outside class 2016-05-25 15:50:35 +02:00
axl89
ea77c6fb5d Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2016-05-25 15:40:38 +02:00
axl89
7d064bbf44 Improved the integration with Sauce Labs 2016-05-25 15:39:51 +02:00
Arturo Gonzalez
710e15f1b2 Fixed "autocomplete agent search" with disabled agents. Ticket #3655 2016-05-25 15:30:46 +02:00
Alejandro Gallardo Escobar
60261b2d01 Huge improvements on the visual console fullscreen view 
(cherry picked from commit f68f1823f331c18c377591bdd8d42ae9b306b72b)
 2016-05-25 13:38:31 +02:00
Alejandro Gallardo Escobar
52921b4fde Added the styles for the fullscreen view of the visual consoles 
(cherry picked from commit 72ff758d4951ac164ae2ba8fe31b80980692da65)

Conflicts:
	pandora_console/include/styles/pandora.css
 2016-05-25 13:38:17 +02:00
Alejandro Gallardo Escobar
735bb32e1a Added the keep_aspect_ratio parameter to the render_map action 
(cherry picked from commit a1155e5e71d92cf5f8c3e72ffd73eff96ed84c14)
 2016-05-25 13:37:17 +02:00
Alejandro Gallardo Escobar
2bea12d737 Huge improvement on the public console visualization 2016-05-25 11:45:31 +02:00
Alejandro Gallardo Escobar
1f455a5958 Added a parameter to resize the visual map while keeping its aspect ratio 2016-05-25 10:43:49 +02:00
Arturo Gonzalez
b6ee433df3 New transactional maps in progress... (Working in transactions creation system) 2016-05-25 10:22:05 +02:00
artica
72c83d4720 Auto-updated build strings. 2016-05-25 00:01:15 +02:00
axl89
1590ffcfb0 Fixed login twice in test PAN_2 2016-05-24 19:33:41 +02:00
axl89
9a0f13a2b4 Added test PAN_2 2016-05-24 19:20:34 +02:00
axl89
9f24fee0fa Modified Docker launch script 2016-05-24 17:33:17 +02:00
axl89
cb983f7ffd Changing script workflow 2016-05-24 17:09:29 +02:00
Alejandro Gallardo Escobar
6b8c92c6b3 Error fix 2016-05-24 16:33:32 +02:00
Alejandro Gallardo Escobar
732a651d6d Added a function to easily made a control which only appear on mouse move 
(cherry picked from commit 8d69c50d4b6e23defd22eafe99aceeaf0e5927da)
 2016-05-24 16:24:40 +02:00
axl89
bd705a961e Removed Docker debug traces 2016-05-24 15:28:24 +02:00
axl89
88023e6a8d Still debugging 2016-05-24 15:07:17 +02:00
axl89
52bfde8ab0 Debugging Docker behaviour in Travis CI environment 2016-05-24 14:53:55 +02:00
axl89
1c6d71518a Modified the docker run command 2016-05-24 14:53:03 +02:00
axl89
74eaa802c9 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2016-05-24 14:29:08 +02:00
Axel
ffacb2cfad Update .travis.yml 
Fixed YAML syntax error
 2016-05-24 14:28:55 +02:00
Axel
bf54acee5d Update Dockerfile 
Adding expose ports to the Docker container
 2016-05-24 13:49:39 +02:00
axl89
cfa68b55a9 Adding expose ports to the Docker container 2016-05-24 13:46:44 +02:00
Axel
51baf320e0 Update .travis.yml 
Fixed YAML syntax error
 2016-05-24 13:40:13 +02:00
axl89
b2488d858b Trying Sauce Labs 2016-05-24 13:36:15 +02:00
Axel
6dfe6a8af8 Update .travis.yml 
Start the xvfb service
 2016-05-24 11:49:30 +02:00
Axel
4eb6c730ac Update .travis.yml 
Added xvfb as a dependency to run the console CI tests
 2016-05-24 11:36:40 +02:00
Axel
3eea16faf3 Update .travis.yml 
Added firefox to run console CI tests
 2016-05-24 11:30:24 +02:00
Axel
8d753a7f36 Update .travis.yml 
Debugging PAN1.py
 2016-05-24 11:25:56 +02:00
Axel
34e13dd348 Update install_console.py 
We now click on the "remove installer file" button, and leave the console ready for CI tests
 2016-05-24 11:17:20 +02:00
Axel
9c756deaa5 Update .travis.yml 
Added selenium dependencies
 2016-05-24 10:40:56 +02:00
Axel
5cecc6f9d1 Update .travis.yml 
Fixed script directory
 2016-05-24 10:36:49 +02:00
Axel
88e810bf97 Update .travis.yml 
Missed $TRAVIS_BUILD_DIR in the previous commit. Adding it.
 2016-05-24 10:33:33 +02:00
axl89
f3780941a1 Modified .travis.yml and test.sh to better adapt to Travis CI build workflow 2016-05-24 10:28:43 +02:00
Axel
384c5652d7 Update .travis.yml 
Added python environment variables to use 2.7
 2016-05-24 00:48:35 +02:00
Axel
531b7e9eb9 Update test.sh 
Fixed the exit status before executing the console CI scripts
 2016-05-24 00:40:02 +02:00
Axel
5fea428a87 Update Dockerfile 
Added "yum clean all" instruction to make it pass on the Docker Hub (thank God for good practices at 12am!)
 2016-05-24 00:23:30 +02:00
artica
927e8ba396 Auto-updated build strings. 2016-05-24 00:01:15 +02:00
Axel
3c7486a4ed Update test.sh 
Just triggering a build
 2016-05-23 20:25:52 +02:00