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

Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2017-01-10 00:16:00 +01:00
commit 2019fced1d
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE.md vendored
View file

@ -6,7 +6,7 @@ Hi there - thanks for filling an issue. Please ensure the following things befor
- Add the `log/production.log` file from your system. Attention: Make sure no confidential data is in it! - Add the `log/production.log` file from your system. Attention: Make sure no confidential data is in it!
- Please write the issue in english - Please write the issue in english
* This textblock will be removed automatically when you submit the issue* * The textblock between "<!-- -->" will be removed automatically when you submit the issue *
--> -->
### Infos: ### Infos:

1
README.md
View file

@ -11,6 +11,7 @@ You're going to love Zammad!
## Statusbadges ## Statusbadges
- Current develop version: [![GitHub version](https://badge.fury.io/gh/zammad%2Fzammad.svg)](https://packager.io/gh/zammad/zammad)
- Build: [![Build Status](https://travis-ci.org/zammad/zammad.svg?branch=develop)](https://travis-ci.org/zammad/zammad) - Build: [![Build Status](https://travis-ci.org/zammad/zammad.svg?branch=develop)](https://travis-ci.org/zammad/zammad)
- Code: [![Code Climate](https://codeclimate.com/github/zammad/zammad/badges/gpa.svg)](https://codeclimate.com/github/zammad/zammad) [![Coverage Status](https://coveralls.io/repos/github/zammad/zammad/badge.svg)](https://coveralls.io/github/zammad/zammad) - Code: [![Code Climate](https://codeclimate.com/github/zammad/zammad/badges/gpa.svg)](https://codeclimate.com/github/zammad/zammad) [![Coverage Status](https://coveralls.io/repos/github/zammad/zammad/badge.svg)](https://coveralls.io/github/zammad/zammad)
- Docs: [![Documentation Status](https://readthedocs.org/projects/zammad/badge/?version=latest)](https://docs.zammad.org) - Docs: [![Documentation Status](https://readthedocs.org/projects/zammad/badge/?version=latest)](https://docs.zammad.org)

1
contrib/cleanup.sh
View file

@ -11,3 +11,4 @@ rm app/assets/javascripts/app/controllers/_integration/clearbit.coffee
rm app/assets/javascripts/app/controllers/role.coffee rm app/assets/javascripts/app/controllers/role.coffee
rm app/assets/javascripts/app/controllers/report.coffee rm app/assets/javascripts/app/controllers/report.coffee
rm app/assets/javascripts/app/controllers/report_profile.coffee rm app/assets/javascripts/app/controllers/report_profile.coffee

3
contrib/packager.io/after.sh
View file

@ -9,3 +9,6 @@ set -e
# download locales and translations to make a offline installation possible # download locales and translations to make a offline installation possible
contrib/packager.io/fetch_locales.rb contrib/packager.io/fetch_locales.rb
# delete asset cache
rm -r tmp/cache