Skip to content

Commit

Permalink
Merge pull request #2687 from compucorp/PCHR-3811-update-civihr-repo-url
Browse files Browse the repository at this point in the history
PCHR-3811: Update the civihr repo URL
  • Loading branch information
davialexandre authored Jun 15, 2018
2 parents 2708605 + 03ab4f1 commit 40b4cf2
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 215 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Overview
_A brief description of the pull request. Try to keep it non-technical. Please mark your pull request with the appropriate [label(s)](https://github.com/civicrm/civihr/blob/staging/CONTRIBUTING.md#label-types)_
_A brief description of the pull request. Try to keep it non-technical. Please mark your pull request with the appropriate [label(s)](https://github.com/compucorp/civihr/blob/staging/CONTRIBUTING.md#label-types)_

## Before
_The current status. Please provide screenshots or gifs ([LICEcap](http://www.cockos.com/licecap/), [SilentCast](https://github.com/colinkeenan/silentcast)) where appropriate._
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ def testJS(hrcoreFolder, java.util.LinkedHashMap extension) {
def listCivihrGitRepoPath() {
return [
[
'url': 'https://github.com/civicrm/civihr.git',
'url': 'https://github.com/compucorp/civihr.git',
'folder': "$CIVICRM_EXT_ROOT/civihr"
],
[
Expand Down
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
CiviHR is a collection of extensions defining a human-resources application
that runs on top of the CiviCRM platform.
[CiviHR](https://civihr.org/) is an open source HR software solution, that runs on top of the CiviCRM platform.

See also:
* Install: [doc/INSTALL.md](doc/INSTALL.md)
* Upgrade: [doc/UPGRADE.md](doc/UPGRADE.md)
* Develop (install, test, etc): [doc/DEVELOP.md](doc/DEVELOP.md)
* Wiki: http://wiki.civicrm.org/confluence/display/HR/CiviHR
* Issues: http://issues.civicrm.org/jira/secure/Dashboard.jspa?selectPageId=11213
* User Guide: http://civihr-documentation.readthedocs.io/en/latest/
* Demo site: https://demo.civihrhosting.co.uk/

We are using browserstack for testing:

Expand Down
106 changes: 0 additions & 106 deletions doc/DEVELOP.md

This file was deleted.

73 changes: 9 additions & 64 deletions doc/INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,74 +1,19 @@
## Pre-requisites
# Introduction

CiviCRM 4.5
CiviHR is a complex system, with many moving parts. The code in this repository is just one of these parts. It's possible to create a new site manually, but, given the number of necessary steps, this a hard and time consuming task. For this reason, the best way to install CiviHR is by using one of the installation methods available:

> NOTE: CiviHR includes some significant changes to the nomal CiviCRM
> user-experience. As with any significant change or addition, CiviHR
> should be evaluated on a test/staging site before installing on a
> live/production site.
## Using the civihr-installer script

## Download
The [civihr-installer](https://github.com/compucorp/civihr-installer) script has a mininum set of requirements and it is a quick way to get CiviHR up and running. Please check its repository for more information on how to use it.

```bash
cd </path/to/extension/dir>
# (ex: $drupalroot/vendor/civicrm or $civiroot/tools/extensions or a custom-configed path)
> Note: A site created with this script is not suited for development, as it will not include many tools and files required for this kind of work. If you're looking for that, the installation with buildkit is the way to go.
wget https://github.com/civicrm/civihr/archive/1.4.0.zip
unzip 1.4.0.zip
mv civihr-1.4.0 civihr
```

> NOTE: On some misconfigured systems, the "wget" command may display a warning
> like "ERROR: The certificate of `github.com' is not trusted." For a workaround,
> add the option "--no-check-certificate" or check out [this article](http://blog.55minutes.com/2012/01/fixing-https-certificate-errors-in-wget-and-ruby/).
## Install (Option A: Drush)
## Using buildkit

If you have Drush installed, then you can enable all the extensions at once:
[Buildkit](https://github.com/civicrm/civicrm-buildkit) is a collection of development tools for CiviCRM. Among these tools, there's `civibuild`, which can be used to quickly create new sites. To create a new CiviHR site, you can use the `hr17` build type:

```bash
cd /var/www/drupal
bash vendor/civicrm/civihr/bin/drush-install.sh --with-sample-data
```

If you're familiar with different ways to call drush, then you can use the same
techniques with drush-install.sh, e.g.

```bash
cd /var/www/drupal/vendor/civicrm/civihr
./bin/drush-install.sh --with-sample-data --root=/var/www/drupal

or

cd /var/www/drupal/sites/example.com
bash /var/www/drupal/vendor/civicrm/civihr/bin/drush-install.sh --with-sample-data
$ civibuild create hr17
```

Read the drush-install.sh for details.

## Install (Option B: Manual)

CiviHR includes over a dozen extensions. These can be activated piecemeal.
The following extensions provide the major features and may be activated
individually:

* org.civicrm.hrbank: Bank Details
* org.civicrm.hrcareer: Career History
* org.civicrm.hrdemog: Extended Demographics
* org.civicrm.hremerg: Emergency Contacts
* org.civicrm.hrabsence: Absences
* org.civicrm.hrjobcontract: Job Contracts
* org.civicrm.hrmed: Medical and Disability
* org.civicrm.hrqual: Qualifications
* org.civicrm.hrreport: Reporting
* org.civicrm.hrstaffdir: Staff Directory
* org.civicrm.hrcase: Case
* org.civicrm.hrcaseutils: Case Utils
* org.civicrm.hrim: Instant messanger link
* org.civicrm.hrrecruitment: Recruitment
* org.civicrm.hrprofile: Profile

Finally, these two extensions build on top of the others:

* uk.co.compucorp.civicrm.hrsampledata: Generate random example data
* org.civicrm.hrui: Trim/revise CiviCRM UI for CiviHR users
Please check the [civibuild documentation](https://docs.civicrm.org/dev/en/latest/tools/civibuild/) for more information on all the available params.
11 changes: 0 additions & 11 deletions doc/RELEASE.md

This file was deleted.

24 changes: 0 additions & 24 deletions doc/UPGRADE.md

This file was deleted.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"license": "AGPL-3.0",
"repository": {
"type": "git",
"url": "https://github.com/civicrm/civihr.git"
"url": "https://github.com/compucorp/civihr.git"
},
"bugs": {
"url": "https://github.com/civicrm/civihr/issues"
"url": "https://github.com/compucorp/civihr/issues"
},
"scripts": {
"precommit": "lint-staged",
Expand Down

0 comments on commit 40b4cf2

Please sign in to comment.