chore: bump version to 2.4.1

web-pal · Jan 5, 2018 · 65a4b38 · 65a4b38
2 parents d898272 + 5756b29
commit 65a4b38
Show file tree

Hide file tree

Showing 12 changed files with 296 additions and 282 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
+[![license](https://img.shields.io/github/license/desktop/desktop.svg?style=flat-square)](https://github.com/web-pal/chronos-timetracker/blob/master/LICENSE)
 
 # Chronos timetracker
 

diff --git a/app/app.html b/app/app.html
@@ -14,7 +14,6 @@
         }
       })();
     </script>
-    <link href="https://fonts.googleapis.com/css?family=Montserrat" rel="stylesheet">
   </head>
   <body>
     <div id="root"></div>

diff --git a/app/components/Calendar/Calendar.jsx b/app/components/Calendar/Calendar.jsx
@@ -24,7 +24,7 @@ export default class Calendar extends PureComponent {
   constructor(props) {
     super(props);
     const today = moment().date();
-    const thisMonth = moment().month();
+    const thisMonth = moment().month() + 1;
     const thisYear = moment().year();
     this.state = {
       day: today,
@@ -47,8 +47,9 @@ export default class Calendar extends PureComponent {
     });
   }
 
-  handleSelect = ({ iso, day }) => {
+  handleSelect = ({ iso, day, month, year }) => {
     const { selected } = this.state;
+    this.handleChange({ day, month, year });
     if (selected.indexOf(iso) === -1) {
       this.setState({ selected: [iso], focused: day });
       console.log('CALENDAR onUpdate', iso, moment(iso).format('MM/DD/YYYY'));

diff --git a/app/containers/IssueView/IssueReport/IssueReport.jsx b/app/containers/IssueView/IssueReport/IssueReport.jsx
@@ -102,7 +102,7 @@ const IssueReport: StatelessFunctionalComponent<Props> = ({
               View reports and calculate salaries in Chronos Timesheets
             </Heading>
             <CTAButton
-              onClick={openURLInBrowser(`https://${host.origin}/plugins/servlet/ac/jira-chronos/api-page-jira`)}
+              onClick={openURLInBrowser(`${host.origin}/plugins/servlet/ac/jira-chronos/api-page-jira`)}
             >
               Open plugin
             </CTAButton>

diff --git a/app/containers/IssueView/IssueReport/MainColumn/ProgressBar/styled/index.jsx b/app/containers/IssueView/IssueReport/MainColumn/ProgressBar/styled/index.jsx
@@ -1,7 +1,5 @@
 /* eslint-disable no-confusing-arrow */
 import styled from 'styled-components2';
-// import '../../../../../../assets/fonts/lineto-circular-bold-c.woff';
-// import '../../../../../../assets/fonts/lineto-circular-book-c.woff';
 
 export const ProgressBarContainer = styled.div`
   width: 94%;
@@ -28,19 +26,16 @@ export const ProgressBarFill = styled.div`
 `;
 
 export const Time = styled.span`
-  font-family: Circular-Book !important;
   color: rgba(225, 225, 225, .9);
   font-size: 12px;
   line-height: 23px;
   ${props => props.isHighlighted && `
     color: white;
     font-size: 14px;
-    font-family: Circular-Bold !important;
   `}
 `;
 
 export const TimeLabel = styled.span`
-  font-family: Circular-Book !important;
   color: rgba(225, 225, 225, .7);
   font-size: 10px;
 `;
diff --git a/app/containers/IssueView/IssueReport/styled/index.jsx b/app/containers/IssueView/IssueReport/styled/index.jsx
@@ -36,15 +36,13 @@ export const MetaColumn = styled.div`
 export const MetaItemName = styled.span.attrs({
   className: 'MetaItemName',
 })`
-  font-family: Circular-Book !important;
   color: rgba(225, 225, 225, .9);
   font-size: 14px;
 `;
 
 export const MetaItemValue = styled.span.attrs({
   className: 'MetaItemValue',
 })`
-  font-family: Circular-Bold !important;
   color: white;
   font-size: 28px;
 `;
@@ -58,7 +56,6 @@ export const CTAButton = styled.div`
   padding: 8px 16px;
   margin-top: 8px;
   cursor: pointer;
-  font-family: Circular-Book !important;
   :hover {
     background: #FF991F;
     border-color: #FF991F;
@@ -76,14 +73,12 @@ export const CTAArea = styled.div`
 export const Heading = styled.div`
   font-size: 24px;
   text-align: center;
-  font-family: Circular-Bold !important;
   color: #FFFFFF;
 `;
 
 export const HelpText = styled.a`
   color: rgba(255,255,255,0.85);
   font-size: 12px;
-  font-family: Circular-Book !important;
   cursor: pointer;
   :hover {
     color: white;
@@ -100,11 +95,9 @@ export const ChronosDescriptionMetaItem = styled.div`
   display: flex;
   flex-direction: row;
   justify-content: space-between;
-  font-family: Circular-Book !important;
   margin-bottom: 4px;
   b {
     color: white;
-    font-family: Circular-Bold !important;
   }
 `;
 
@@ -191,7 +184,6 @@ export const LearnMoreLink = styled.a`
   text-decoration: none;
   font-size: 10px;
   color: white;
-  font-family: Circular-Bold !important;
   cursor: pointer;
   :hover {
     color: white;

diff --git a/app/containers/Modals/WorklogModal/WorklogModal.jsx b/app/containers/Modals/WorklogModal/WorklogModal.jsx
@@ -95,7 +95,11 @@ class WorklogModal extends Component<Props, State> {
                   disabled={fetching}
                   onClick={() => {
                     this.props.addManualWorklogRequest({
-                      startTime,
+                      startTime: startTime.set({
+                        year: date.split('/')[2],
+                        month: parseInt(date.split('/')[0], 10) - 1,
+                        date: date.split('/')[1],
+                      }),
                       totalSpent,
                       comment,
                       date,

diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Chronos",
   "productName": "Chronos",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Native app for time-tracking fully integrated with JIRA",
   "main": "./main.prod.js",
   "scripts": {

diff --git a/app/reducers/issues.js b/app/reducers/issues.js
@@ -43,8 +43,8 @@ function itemsById(state: IssuesMap = {}, action): IssuesMap {
             worklog: {
               ...state[action.meta].fields.worklog,
               worklogs: [
-                action.payload,
                 ...state[action.meta].fields.worklog.worklogs,
+                action.payload,
               ],
             },
           },

diff --git a/app/sagas/profile.js b/app/sagas/profile.js
@@ -139,6 +139,8 @@ export function* checkJWT(): Generator<*, void, *> {
         accessToken: userData.token,
         tokenSecret: userData.token_secret,
       }));
+    } else {
+      yield put(profileActions.setLoginFetching(false));
     }
   } catch (err) {
     yield put(profileActions.setLoginFetching(false));

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Chronos",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Full functionality time tracking software with direct JIRA integration",
   "scripts": {
     "build": "concurrently \"yarn build-main\" \"yarn build-renderer\"",
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ @@
             }
           })();
         </script>
-        <link href="https://fonts.googleapis.com/css?family=Montserrat" rel="stylesheet">
       </head>
       <body>
         <div id="root"></div>
@@ Expand Down @@