TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/4.2' into release/4.3

Browse Source 
Conflicts:
	Gemfile.lock
	lib/open_project/version.rb
pull/3233/head
Florian Kraft 9 years ago
parent 24819743be 64af6bac4c
commit e989575a2b
8 changed files with 48 additions and 35 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      README.md
  2. 8
      doc/operation_guides/manual/installation-guide.md
  3. 8
      doc/operation_guides/manual/upgrade-guide.md
  4. 8
      doc/operation_guides/packager/installation-guide.md
  5. 26
      doc/operation_guides/packager/upgrade-guide.md
  6. 7
      frontend/app/openproject-app.js
  7. 6
      frontend/rails-plugins.conf.js
  8. 2
      lib/open_project/version.rb

18
README.md
Unescape View File

@ -8,24 +8,24 @@
OpenProject is a web-based project management software. Its key features are:
* [Work Package Tracking](https://openproject.org/features/work-packages/)
* [Project Timelines](https://openproject.org/features/timelines/)
* [Wikis](https://openproject.org/features/wiki/)
* [Forums](https://openproject.org/features/more/)
* [Work Package Tracking](https://www.openproject.org/features/work-packages/)
* [Project Timelines](https://www.openproject.org/features/timelines/)
* [Wikis](https://www.openproject.org/features/wiki/)
* [Forums](https://www.openproject.org/help/user-guides/forum/)
Via plugins, it also supports:
* [Meeting Management](https://openproject.org/features/more/)
* [Scrum Process Support](https://openproject.org/features/agile-scrum/)
* [Time and Cost Reporting](https://openproject.org/features/time-and-costs/)
* and [others](https://openproject.org/download/install-plugins/).
* [Meeting Management](https://www.openproject.org/help/user-guides/meetings/)
* [Scrum Process Support](https://www.openproject.org/features/agile-scrum/)
* [Time and Cost Reporting](https://www.openproject.org/help/user-guides/time-costs/)
* and [others](https://www.openproject.org/download/install-plugins/).
More information and screenshots can be found on [openproject.org](https://www.openproject.org).
## Installation
If you want to run an instance of OpenProject in production (or for evaluation), refer to our
in-depth [installation guides](https://openproject.org/download/).
in-depth [installation guides](https://www.openproject.org/download/).
If you're a developer wanting to set-up a local environment for contributing to OpenProject or
developing plugins, you should refer instead to our [Quick Start for Developers](doc/QUICK_START.md).

8
doc/operation_guides/manual/installation-guide.md
Unescape View File

@ -1,12 +1,12 @@
# Installation of OpenProject 4.1 with Apache on Debian 7.7 or Ubuntu 14.04 LTS
# Installation of OpenProject 4.2 with Apache on Debian 7.7 or Ubuntu 14.04 LTS
**This tutorial helps you to deploy OpenProject 4.1. Please, aware that:**
**This tutorial helps you to deploy OpenProject 4.2. Please, aware that:**
1. This guide requires that you have a clean **Debian 7.7 x64** or **Ubuntu 14.04 x64** installation with administrative rights. We have tested the installation guide on a Debian minimal netinstall image and on an Ubuntu Server image, but it should work on any derivative.
2. OpenProject will be installed with a MySQL database (the guide should work analogous with PostgreSQL).
3. OpenProject will be served in a production environment with Apache (this guide should work analogous with other servers, like nginx and others)
In this guide, we will install **OpenProject 4.1** with a **MySQL** database. Openproject will be served with the **Apache** web server. When your server needs to reboot, OpenProject should start automatically with your server.
In this guide, we will install **OpenProject 4.2** with a **MySQL** database. Openproject will be served with the **Apache** web server. When your server needs to reboot, OpenProject should start automatically with your server.
Note: We have highlighted commands to execute like this
```bash
@ -154,7 +154,7 @@ As a reference, the following Node.js and NPM versions have been installed on ou
[openproject@all] cd ~
[openproject@all] git clone https://github.com/opf/openproject.git
[openproject@all] cd openproject
[openproject@all] git checkout v4.1.0 # please use actual current stable version v4.1.X
[openproject@all] git checkout v4.2.0 # please use actual current stable version v4.2.X
[openproject@all] bundle install
[openproject@all] npm install
```

8
doc/operation_guides/manual/upgrade-guide.md
Unescape View File

@ -1,3 +1,7 @@
# OpenProject 4.1 to OpenProject 4.2 Debian/Ubuntu Upgrade Guide
Please look at the steps in the section about the upgrade to OpenProject 4.1. Just exchange `v4.1.0` to `v4.2.0` when checking out the git repository.
# OpenProject 4.0 to OpenProject 4.1 Debian/Ubuntu Upgrade Guide
This guide describes the upgrade process from OpenProject 4.0 to 4.1 on Debian 7.7 and Ubuntu 14.04 LTS step by step.
@ -7,8 +11,8 @@ Note: We strongly recommend to update your OpenProject installation to the lates
## Preparation
* Backup your current Openproject installation. Typically you should backup the attachment
folder of your installation, the subversion repositories (if applicable) and your database.
* Backup your current Openproject installation. Typically you should backup the attachment
folder of your installation, the subversion repositories (if applicable) and your database.
For more information please have a look at our [backup guide](backup-guide.md)
* Before Upgrading, check that all the installed OpenProject plugins support the new

8
doc/operation_guides/packager/installation-guide.md
Unescape View File

@ -33,14 +33,14 @@ The following steps have to be performed to initiate the actual installation of
apt-get install apt-transport-https
sudo wget -qO - https://deb.packager.io/key | apt-key add -
echo "deb https://deb.packager.io/gh/opf/openproject wheezy stable" | sudo tee /etc/apt/sources.list.d/openproject.list
echo "deb https://deb.packager.io/gh/opf/openproject wheezy stable/4.2" | sudo tee /etc/apt/sources.list.d/openproject.list
sudo apt-get update
sudo apt-get install openproject
## Ubuntu 14.04 Trusty 64bits server
wget -qO - https://deb.packager.io/key | sudo apt-key add -
echo "deb https://deb.packager.io/gh/opf/openproject trusty stable" |
echo "deb https://deb.packager.io/gh/opf/openproject trusty stable/4.2" |
sudo tee /etc/apt/sources.list.d/openproject.list
sudo apt-get update
sudo apt-get install openproject
@ -50,7 +50,7 @@ The following steps have to be performed to initiate the actual installation of
sudo rpm --import https://rpm.packager.io/key
echo "[openproject]
name=Repository for opf/openproject application.
baseurl=https://rpm.packager.io/gh/opf/openproject/fedora20/stable
baseurl=https://rpm.packager.io/gh/opf/openproject/fedora20/stable/4.2
enabled=1" | sudo tee /etc/yum.repos.d/openproject.repo
sudo yum install openproject
@ -59,7 +59,7 @@ The following steps have to be performed to initiate the actual installation of
sudo rpm --import https://rpm.packager.io/key
echo "[openproject]
name=Repository for opf/openproject application.
baseurl=https://rpm.packager.io/gh/opf/openproject/centos6/stable
baseurl=https://rpm.packager.io/gh/opf/openproject/centos6/stable/4.2
enabled=1" | sudo tee /etc/yum.repos.d/openproject.repo
sudo yum install openproject

26
doc/operation_guides/packager/upgrade-guide.md
Unescape View File

@ -1,10 +1,10 @@
# OpenProject upgrade guide
Starting with OpenProject 4.1 stable releases will have their own branch on github. According to this the OpenProject release 4.1 is tracked via the stable/4.1 branch. But why is this important to how the OpenProject packages are provided:
Starting with OpenProject 4.1 stable releases will have their own branch on github. According to this the OpenProject release 4.2 is tracked via the stable/4.2 branch. But why is this important to how the OpenProject packages are provided:
The OpenProject Core and OpenProject Community Edition release 4.0 packages are derived from the stable branch of the respective repositories. Due to the fact that the branch for the OpenProject releasse 4.1 is tracked via the stable/4.1 branch packages has to be derived from the stable/4.1 branch instead of stable. This change makes it necessary to update the source file for the package management system of the machine OpenProject is currently installed on. A typical `apt-get install openproject` e.g. for debian like systems will not work.
The OpenProject Core and OpenProject Community Edition release 4.0 packages are derived from the stable branch of the respective repositories. Due to the fact that the branch for the OpenProject releasse 4.2 is tracked via the stable/4.2 branch packages has to be derived from the stable/4.2 branch instead of stable. This change makes it necessary to update the source file for the package management system of the machine OpenProject is currently installed on. A typical `apt-get install openproject` e.g. for debian like systems will not work.
The following upgrade instructions describe in detail what has to be done to upgrade existing 4.0 installations of the OpenProject Core and the OpenProject Community Edition to 4.1 via the package management system. Therefore the guide is split into two parts:
The following upgrade instructions describe in detail what has to be done to upgrade existing 4.0 installations of the OpenProject Core and the OpenProject Community Edition to 4.2 via the package management system. Therefore the guide is split into two parts:
* The upgrade guide for OpenProject Core
* The upgrade guide for OpenProject Community Edition
@ -15,14 +15,14 @@ Please jump directly to the part of this guide depending on your OpenProject ver
### Debian 7.6 Wheezy 64bits server
echo "deb https://deb.packager.io/gh/opf/openproject wheezy stable/4.1" | sudo tee /etc/apt/sources.list.d/openproject.list
echo "deb https://deb.packager.io/gh/opf/openproject wheezy stable/4.2" | sudo tee /etc/apt/sources.list.d/openproject.list
sudo apt-get update
sudo apt-get install openproject
sudo openproject configure
### Ubuntu 14.04 Trusty 64bits server
echo "deb https://deb.packager.io/gh/opf/openproject trusty stable/4.1" | sudo tee /etc/apt/sources.list.d/openproject.list
echo "deb https://deb.packager.io/gh/opf/openproject trusty stable/4.2" | sudo tee /etc/apt/sources.list.d/openproject.list
sudo apt-get update
sudo apt-get install openproject
sudo openproject configure
@ -31,7 +31,7 @@ Please jump directly to the part of this guide depending on your OpenProject ver
echo "[openproject]
name=Repository for opf/openproject application.
baseurl=https://rpm.packager.io/gh/opf/openproject/fedora20/stable/4.1
baseurl=https://rpm.packager.io/gh/opf/openproject/fedora20/stable/4.2
enabled=1" | sudo tee /etc/yum.repos.d/openproject.repo
sudo yum install openproject
sudo openproject configure
@ -40,14 +40,14 @@ Please jump directly to the part of this guide depending on your OpenProject ver
echo "[openproject]
name=Repository for opf/openproject application.
baseurl=https://rpm.packager.io/gh/opf/openproject/centos6/stable/4.1
baseurl=https://rpm.packager.io/gh/opf/openproject/centos6/stable/4.2
enabled=1" | sudo tee /etc/yum.repos.d/openproject.repo
sudo yum install openproject
sudo openproject configure
### SUSE Linux Enterprise Server 12
sudo zypper addrepo "https://rpm.packager.io/gh/opf/openproject/sles12/stable/4.1" "openproject"
sudo zypper addrepo "https://rpm.packager.io/gh/opf/openproject/sles12/stable/4.2" "openproject"
sudo zypper install openproject
sudo openproject configure
@ -55,14 +55,14 @@ Please jump directly to the part of this guide depending on your OpenProject ver
### Debian 7.6 Wheezy 64bits server
echo "deb https://deb.packager.io/gh/finnlabs/pkgr-openproject-community wheezy stable/4.1" | sudo tee /etc/apt/sources.list.d/pkgr-openproject-community.list
echo "deb https://deb.packager.io/gh/finnlabs/pkgr-openproject-community wheezy stable/4.2" | sudo tee /etc/apt/sources.list.d/pkgr-openproject-community.list
sudo apt-get update
sudo apt-get install openproject-ce
sudo openproject-ce configure
### Ubuntu 14.04 Trusty 64bits server
echo "deb https://deb.packager.io/gh/finnlabs/pkgr-openproject-community trusty stable/4.1" | sudo tee /etc/apt/sources.list.d/pkgr-openproject-community.list
echo "deb https://deb.packager.io/gh/finnlabs/pkgr-openproject-community trusty stable/4.2" | sudo tee /etc/apt/sources.list.d/pkgr-openproject-community.list
sudo apt-get update
sudo apt-get install openproject-ce
sudo openproject-ce configure
@ -71,7 +71,7 @@ Please jump directly to the part of this guide depending on your OpenProject ver
echo "[pkgr-openproject-community]
name=Repository for finnlabs/pkgr-openproject-community application.
baseurl=https://rpm.packager.io/gh/finnlabs/pkgr-openproject-community/fedora20/stable/4.1
baseurl=https://rpm.packager.io/gh/finnlabs/pkgr-openproject-community/fedora20/stable/4.2
enabled=1" | sudo tee /etc/yum.repos.d/pkgr-openproject-community.repo
sudo yum install openproject-ce
sudo openproject-ce configure
@ -80,14 +80,14 @@ Please jump directly to the part of this guide depending on your OpenProject ver
echo "[pkgr-openproject-community]
name=Repository for finnlabs/pkgr-openproject-community application.
baseurl=https://rpm.packager.io/gh/finnlabs/pkgr-openproject-community/centos6/stable/4.1
baseurl=https://rpm.packager.io/gh/finnlabs/pkgr-openproject-community/centos6/stable/4.2
enabled=1" | sudo tee /etc/yum.repos.d/pkgr-openproject-community.repo
sudo yum install openproject-ce
sudo openproject-ce configure
### SUSE Linux Enterprise Server 12
sudo zypper addrepo "https://rpm.packager.io/gh/finnlabs/pkgr-openproject-community/sles12/stable/4.1" "pkgr-openproject-community"
sudo zypper addrepo "https://rpm.packager.io/gh/finnlabs/pkgr-openproject-community/sles12/stable/4.2" "pkgr-openproject-community"
sudo zypper install openproject-ce
sudo openproject-ce configure

7
frontend/app/openproject-app.js
Unescape View File

@ -32,7 +32,12 @@ var I18n = require('./vendor/i18n');
I18n.translations.en = require("locales/js-en.yml").en;
I18n.addTranslations = function(locale, translations) {
I18n.translations[locale] = _.merge(I18n.translations[locale], translations);
if (I18n.translations[locale] === undefined) {
I18n.translations[locale] = translations;
}
else {
I18n.translations[locale] = _.merge(I18n.translations[locale], translations);
}
};
require('angular-animate');

6
frontend/rails-plugins.conf.js
Unescape View File

@ -36,7 +36,11 @@ var path = require('path'),
var PLUGIN_INFO_CMD_PATH = path.join(__dirname, '..', 'bin', 'plugin_info');
function runPluginsInfo() {
var fullCmd = exec(PLUGIN_INFO_CMD_PATH, { silent: true });
var currentWorkingDir = process.cwd();
// Make sure we're in the root directory to launch the plugin_info script
process.chdir(path.join(__dirname, '..'));
var fullCmd = exec(PLUGIN_INFO_CMD_PATH, { silent: false });
process.chdir(currentWorkingDir);
return fullCmd.code === 0 ? fullCmd.output : '{}';
}

2
lib/open_project/version.rb
Unescape View File

@ -48,7 +48,7 @@ module OpenProject
#
# 2.0.0debian-2
def self.special
'-alpha'
''
end
def self.revision

Write Preview
Loading…
Cancel
Save