Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of http://ci.lab.zammad.com/core/zammad into develop

Browse source 
Conflicts:
	script/local_browser_tests.sh
This commit is contained in:
Martin Edenhofer 2015-11-24 13:37:49 +01:00
commit f27598d389
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -1,12 +1,13 @@
[![Build Status](http://ci.zammad.org/buildStatus/icon?job=Zammad Unittest Develop (MySQL))](http://ci.zammad.org/job/Zammad%20Unittest%20Develop%20(MySQL)/) [![Build Status](http://ci.zammad.org/buildStatus/icon?job=Zammad Unittest Develop (MySQL))](http://ci.zammad.org/job/Zammad%20Unittest%20Develop%20(MySQL)/)
[![Build Status](http://ci.zammad.org/buildStatus/icon?job=Zammad Unittest Develop (MariaDB Cluster))](http://ci.zammad.org/job/Zammad%20Unittest%20Develop%20(MariaDB%20Cluster)/) [![Build Status](http://ci.zammad.org/buildStatus/icon?job=Zammad Unittest Develop (MariaDB Cluster))](http://ci.zammad.org/job/Zammad%20Unittest%20Develop%20(MariaDB%20Cluster)/)
Welcome to Zammad Welcome to Zammad
================= =================
Zammad is a web based open source helpdesk/ticket system with many features Zammad is a web based open source helpdesk/ticket system with many features
to manage customer telephone calls and e-mails. It is distributed under the to manage customer telephone calls and e-mails. It is distributed under the
GNU AFFERO General Public License (AGPL) and tested on Linux, Solaris, AIX, GNU AFFERO General Public License (AGPL) and tested on Linux, Solaris, AIX,
Windows, FreeBSD, OpenBSD and Mac OS 10.x. Do you receive many e-mails and FreeBSD, OpenBSD and Mac OS 10.x. Do you receive many e-mails and
want to answer them with a team of agents? You're going to love Zammad! want to answer them with a team of agents? You're going to love Zammad!

4
README_Install_Ubuntu.md
View file

@ -75,8 +75,8 @@
### Get Zammad ### Get Zammad
* cd /var/www/zammad * cd /var/www/zammad
* wget http://zammad.org/zammad-1.0.1.tar.gz * wget http://zammad.org/zammad-latest.tar.gz
* tar -xzf zammad-1.0.1.tar.gz * tar -xzf zammad-latest.tar.gz
### Edit Gemfile ### Edit Gemfile
* vi Gemfile * vi Gemfile

2
script/local_browser_tests.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
while true; do while true; do
read -p "Do you wish to drop the database and execute all browser tests?" read -p "Do you wish to drop the database and execute all browser tests?" yn
case $yn in case $yn in
[Yy]* ) echo "Start tests..."; break;; [Yy]* ) echo "Start tests..."; break;;
[Nn]* ) exit;; [Nn]* ) exit;;

3
script/websocket-server.rb
View file

@ -65,7 +65,6 @@ if ARGV[0] != 'start' && ARGV[0] != 'stop'
end end
if ARGV[0] == 'stop' if ARGV[0] == 'stop'
puts "Stopping websocket server (pid:#{@options[:i]})" puts "Stopping websocket server (pid:#{@options[:i]})"
# read pid # read pid
@ -76,8 +75,8 @@ if ARGV[0] == 'stop'
Process.kill( 9, pid.to_i ) Process.kill( 9, pid.to_i )
exit exit
end end
if ARGV[0] == 'start' && @options[:d]
if ARGV[0] == 'start' && @options[:d]
puts "Starting websocket server on #{@options[:b]}:#{@options[:p]} (secure:#{@options[:s]},pid:#{@options[:i]})" puts "Starting websocket server on #{@options[:b]}:#{@options[:p]} (secure:#{@options[:s]},pid:#{@options[:i]})"
Daemons.daemonize Daemons.daemonize