Merge branch 'beta' into issue-13-14
# Conflicts: # src/views-territories.js
Showing
- README.md 1 addition, 1 deletionREADME.md
- src/styles/circles.scss 31 additions, 4 deletionssrc/styles/circles.scss
- src/styles/custom-grid.scss 14 additions, 0 deletionssrc/styles/custom-grid.scss
- src/styles/dashboard.scss 16 additions, 2 deletionssrc/styles/dashboard.scss
- src/styles/evaluations.scss 1 addition, 1 deletionsrc/styles/evaluations.scss
- src/styles/index.scss 45 additions, 0 deletionssrc/styles/index.scss
- src/styles/margins.scss 6 additions, 1 deletionsrc/styles/margins.scss
- src/styles/shared-files.scss 10 additions, 1 deletionsrc/styles/shared-files.scss
- src/styles/shared-notes.scss 3 additions, 3 deletionssrc/styles/shared-notes.scss
- src/styles/territory-profile.scss 22 additions, 0 deletionssrc/styles/territory-profile.scss
- src/utils.js 1 addition, 1 deletionsrc/utils.js
- src/views-territories.js 91 additions, 55 deletionssrc/views-territories.js
- src/widgets-display-circle-tzcld.js 2 additions, 2 deletionssrc/widgets-display-circle-tzcld.js
- src/widgets-display-evaluation-indicators-tzcld.js 162 additions, 133 deletionssrc/widgets-display-evaluation-indicators-tzcld.js
- src/widgets-display-evaluation-tzcld.js 15 additions, 14 deletionssrc/widgets-display-evaluation-tzcld.js
- src/widgets-display-shared-files.js 5 additions, 1 deletionsrc/widgets-display-shared-files.js
- src/widgets-display-territory-list.js 1 addition, 1 deletionsrc/widgets-display-territory-list.js
- src/widgets-display-territory-tzcld.js 4 additions, 4 deletionssrc/widgets-display-territory-tzcld.js
Loading
Please register or sign in to comment