diff --git a/COPYING b/COPYING deleted file mode 100644 index 33897c93..00000000 --- a/COPYING +++ /dev/null @@ -1,15 +0,0 @@ -PuzzleTime - Web application for time tracking and resource planning. -Copyright (C) 2006-2017 Puzzle ITC GmbH. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . diff --git a/README.md b/README.md index 609ebb60..aa680592 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ PuzzleTime is an open source time tracking and resource planning web application for SMEs. ![Rails Unit Tests](https://github.com/puzzle/puzzletime/workflows/Rails%20Unit%20Tests/badge.svg) +[![GitHub](https://img.shields.io/github/license/puzzle/puzzletime)](https://github.com/puzzle/puzzletime/blob/master/LICENSE) ## Development @@ -15,52 +16,10 @@ directory: rails db:setup # prepare database rails server # start the rails server -A more detailed development documentation in German can be found in [doc/development](doc/development/README.md). This is where you also find some [Deployment](doc/development/03_deployment.md) instructions - -## Heroku - -The current master branch needs to be modified slightly for heroku. To achieve this we create a new branch - - git checkout -b heroku_setup - -Then we make the require changes for Memcache and Sendfile to [production.rb](config/environments/production.rb) - - config.action_dispatch.x_sendfile_header = nil - - config.cache_store = :mem_cache_store, - (ENV["MEMCACHIER_SERVERS"] || "").split(","), - {:username => ENV["MEMCACHIER_USERNAME"], - :password => ENV["MEMCACHIER_PASSWORD"], - :failover => true, - :socket_timeout => 1.5, - :socket_failure_delay => 0.2, - :down_retry_delay => 60 - } - -Then we commit these changes to our branch - - git commit -am 'Changes for heroku' - -Now we can deploy with these modifications to heroku - - heroku create - git push heroku heroku_setup:master - - heroku config:set RAILS_SERVE_STATIC_FILES=true - heroku run rails assets:precompile - - heroku addons:create memcachier:dev - - heroku run rails db:migrate - heroku run 'ln -s /app/db/seeds/development /app/db/seeds/production && rails db:seed' - heroku restart - heroku open - -Then login using (username: mw, password: a) as credentials - +A more detailed development documentation in German can be found in [doc/development](doc/development/README.md). This is where you also find some [Deployment](doc/development/02_deployment.md) instructions ## License PuzzleTime is released under the GNU Affero General Public License. -Copyright 2006-2017 by [Puzzle ITC GmbH](http://puzzle.ch). -See COPYING for more details. +Copyright 2006-2024 by [Puzzle ITC GmbH](http://puzzle.ch). +See [LICENSE](LICENSE) for more details.