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

11926 Commits

Author SHA1 Message Date
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
Axel f2e840a4d5 Update test.sh 2016-05-23 20:03:17 +02:00
axl89 5d544c836c Added console CI tests and test.sh to execute them 2016-05-23 19:50:08 +02:00
m-lopez-f cefbc70ede Fixed feature to add cron extension in meta. Tiquet: #3669 2016-05-23 15:20:46 +02:00
Axel da10acd6c3 Update Dockerfile 2016-05-23 12:15:18 +02:00
m-lopez-f 4b90a4f318 Fixed problems in new feature with url. Tiquet: #3079 2016-05-23 10:00:50 +02:00
m-lopez-f fe51e17511 Feature grouped by agent in event list. Supported to metaconsole. Tiquet: #3079 2016-05-23 09:45:42 +02:00
m-lopez-f 9f772e5091 Feature. new form of groped data in event list. Tiquet: #3079 2016-05-23 09:22:57 +02:00
Junichi Satoh 61f1947728 Updated Japanese translations. 2016-05-23 15:37:44 +09:00
artica 92d203fbf9 Auto-updated build strings. 2016-05-23 00:01:50 +02:00
artica 8cdaf766fb Auto-updated build strings. 2016-05-22 00:01:12 +02:00
artica b99bdb5527 Auto-updated build strings. 2016-05-21 00:01:18 +02:00
Ramón Novoa 28001d2dc5 Update README.md 2016-05-20 16:21:56 +02:00
Ramon Novoa 3e33d54acc Added a build status image to the README. 2016-05-20 16:18:32 +02:00
Ramon Novoa d0f9f40b5c Revert "Temporarily disabled the Tentacle server in the testing container." 
This reverts commit dae1f7b99b.
 2016-05-20 12:10:40 +02:00
Ramon Novoa fda5ccbcda Allocate a pseudo-TTY when running docker (for the Tentacle Server). 2016-05-20 12:09:45 +02:00
Ramon Novoa 449b976333 Run docker as the build command. 2016-05-20 12:06:26 +02:00
Ramon Novoa 665e1f89d1 Properly configure pandora_server.conf when running tests. 2016-05-20 11:59:44 +02:00
Ramon Novoa dae1f7b99b Temporarily disabled the Tentacle server in the testing container. 2016-05-20 11:42:55 +02:00
Ramon Novoa 7105d6801e Start Apache and MySQL before installing the console. 2016-05-20 10:00:54 +02:00
Ramon Novoa e7a555532f Use the newly created pandorafms/pandorafms-base image. 2016-05-20 09:41:22 +02:00
Ramon Novoa d02fec16ee Revert "Prevent timeouts when installing deps." 
This reverts commit 931c0dea60.
 2016-05-20 09:41:22 +02:00
artica c4caf668c1 Auto-updated build strings. 2016-05-20 00:01:16 +02:00
Ramon Novoa 931c0dea60 Prevent timeouts when installing deps. 2016-05-19 17:06:33 +02:00
Ramon Novoa a802a6e90d Testing. 2016-05-19 16:42:05 +02:00
Ramon Novoa 35fcc9cd46 Playing with Travis CI. 2016-05-19 16:39:53 +02:00
fermin831 c7737c14d6 Added password type to update manager proxy Tickets #3552 2016-05-19 11:01:29 +02:00
artica 621a396fd1 Auto-updated build strings. 2016-05-19 00:01:14 +02:00
Alejandro Gallardo Escobar a0097dc31d Now the custom title used in pandora uses event delegation, so won't be necessary to bind the event to new elements 
(cherry picked from commit 38a26cd739)
 2016-05-18 15:30:57 +02:00