Skip to content

Commit

Permalink
Merge pull request #1434 from civicrm/staging
Browse files Browse the repository at this point in the history
Sync master with staging
  • Loading branch information
AkA84 authored Feb 10, 2017
2 parents 0bd65af + 3f0c685 commit 99e2f70
Show file tree
Hide file tree
Showing 19,876 changed files with 4,153 additions and 2,048,867 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*~
*.bak
**/.sass-cache
*/node_modules
**/node_modules
.DS_Store
hrabsence/build
hrjob/build
Expand All @@ -11,4 +11,3 @@ hrabsence/build

# Exclude sass cache from all extension directories
*/.sass-cache/

4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ See also:
* 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

We are using browserstack for testing:

<a href="https://www.browserstack.com/"><img src="https://www.browserstack.com/images/layout/browserstack-logo-600x315.png" align="left" height="100" ></a>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 2 additions & 1 deletion com.civicrm.hrjobroles/CRM/Hrjobroles/Page/JobRoles.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ function run() {

private static function registerScripts() {
CRM_Core_Resources::singleton()->addVars('hrjobroles', array(
'baseURL' => CRM_Extension_System::singleton()->getMapper()->keyToUrl('com.civicrm.hrjobroles')
'baseURL' => CRM_Extension_System::singleton()->getMapper()->keyToUrl('com.civicrm.hrjobroles'),
'path' => CRM_Core_Resources::singleton()->getUrl('com.civicrm.hrjobroles')
));

CRM_Core_Resources::singleton()->addScriptFile('com.civicrm.hrjobroles', CRM_Core_Config::singleton()->debug ? 'js/src/job-roles.js' : 'js/dist/job-roles.min.js', 1010);
Expand Down
3 changes: 3 additions & 0 deletions com.civicrm.hrjobroles/css/hrjobroles.css
Original file line number Diff line number Diff line change
Expand Up @@ -9604,6 +9604,9 @@ fieldset[disabled]
#hrjobroles .hrjobroles-switch[disabled] + .radio-label {
cursor: not-allowed;
}
#hrjobroles .spinner-height {
height: 80px;
}
#hrjobroles .add-new-row {
box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.176);
}
Expand Down
4 changes: 2 additions & 2 deletions com.civicrm.hrjobroles/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<author>gregmeszaros</author>
<email>[email protected]</email>
</maintainer>
<releaseDate>2017-01-16</releaseDate>
<version>1.6.5</version>
<releaseDate>2017-02-10</releaseDate>
<version>1.6.6</version>
<develStage>alpha</develStage>
<compatibility>
<ver>4.7</ver>
Expand Down
4 changes: 2 additions & 2 deletions com.civicrm.hrjobroles/js/dist/job-roles.min.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion com.civicrm.hrjobroles/js/src/job-roles/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ define([
'job-roles/filters/filters',
'job-roles/services/services',
'job-roles/controllers/hr-job-roles-controller',
'job-roles/controllers/modal-dialog',
'job-roles/services/hr-job-roles-service',
'job-roles/services/date-validation',
'job-roles/services/hr-job-roles-service-filter',
Expand Down Expand Up @@ -40,7 +41,7 @@ define([
classNamePrefix: 'hrjobroles-',
contactId: decodeURIComponent((new RegExp('[?|&]cid=([^&;]+?)(&|#|;|$)').exec(location.search)||[,""])[1].replace(/\+/g, '%20'))||null,
debug: true,
pathApp: '',
pathApp: CRM.vars.hrjobroles.path,
pathRest: CRM.url('civicrm/ajax/rest'),
pathBaseUrl: CRM.vars.hrjobroles.baseURL + '/',
pathTpl: 'views/',
Expand Down
Loading

0 comments on commit 99e2f70

Please sign in to comment.