Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
ac09ca3
Merge branch 'hotfix/incorrect_comments'
Jan 5, 2018
880cf07
Fix managers counter not correct on project list
Jan 5, 2018
afa9cc8
Issue 1539: Provide link to manage profile from user dropdown
Jan 5, 2018
b900aea
Issue #1351 - Don't wrap ProjectCard in Link, instead handle click event
maxceem Jan 6, 2018
46394e2
Issue 1563 - Non persistent manager interface for card/list switch
maxceem Jan 6, 2018
934e11e
Issues #1557 - Make "Active" project tab default for project listing
maxceem Jan 6, 2018
4ddc638
Fix to avoid using active status by default for regular users
maxceem Jan 6, 2018
753bed8
Safety improvement
maxceem Jan 6, 2018
9e48e89
Issue #1533 - Unify the use of the Avatar component on project grid a…
maxceem Jan 6, 2018
7495a9b
Issue #1554 - User in notifications are listed with @handle instead o…
maxceem Jan 6, 2018
ff6a46f
Revert development config for notification API URL
maxceem Jan 6, 2018
b0214b6
issue #1573 fix
anonymousjaggu Jan 6, 2018
959e07c
Issue #1519 - Screen flicker in dropdown
maxceem Jan 7, 2018
88c3bee
Merge pull request #1584 from maxceem/issue-1351
gondzo Jan 7, 2018
f7aa5a0
Merge pull request #1585 from maxceem/issue-1563
gondzo Jan 7, 2018
f11372e
merge cefault active tab changes
gondzo Jan 7, 2018
42bd546
Merge branch 'maxceem-issue-1557' into bugBash06
gondzo Jan 7, 2018
079b65a
Merge pull request #1587 from maxceem/issue-1533
gondzo Jan 7, 2018
b23fbb3
Merge pull request #1588 from maxceem/issue-1554
gondzo Jan 7, 2018
bb7c8a0
Merge pull request #1581 from tpwwu/issue-1580
gondzo Jan 7, 2018
93fa32f
Merge pull request #1582 from tpwwu/issue-1539
gondzo Jan 7, 2018
da35477
Merge pull request #1589 from anonymousjaggu/issue-1573
gondzo Jan 7, 2018
3274abb
Github issue#1572, Project grid and project details don't list the co…
Jan 8, 2018
4b05663
Merge branch 'hotfix/empty_user_avatar_on_project_listing' into dev
Jan 8, 2018
2c9e010
Issue #1469 - User mentions in the posts
passimm Jan 9, 2018
de69dff
select mentions in handle and render fullname
passimm Jan 10, 2018
f7aa5af
Merge pull request #1594 from passimm/issue_1469
gondzo Jan 10, 2018
9ac5d6a
Update circle.yml
gondzo Jan 10, 2018
9fbc68e
Revert "Issue #1469 - User mentions in the posts"
gondzo Jan 10, 2018
9f41092
Merge pull request #1596 from appirio-tech/revert-1594-issue_1469
gondzo Jan 10, 2018
66805a7
1) add shrinkwrap 2) fix lint 3) change notifications.js to render me…
passimm Jan 10, 2018
8f7a337
Issue #1544 - Notifications bundle
maxceem Jan 11, 2018
02a5334
Issue #1519 - Removed connect-app Dropdown component, in favor of the…
maxceem Jan 11, 2018
9618da0
add new event type: notifications.connect.project.post.mention
passimm Jan 11, 2018
60b6501
Merge pull request #1591 from maxceem/issue-1519
gondzo Jan 11, 2018
baf55fe
Merge pull request #1598 from maxceem/issue-1544
gondzo Jan 11, 2018
a8fc35e
remove test data
gondzo Jan 11, 2018
4559387
update shrinkwrap
gondzo Jan 11, 2018
812c0af
update shrinkwrap
gondzo Jan 11, 2018
cbf310a
user mentions fixes
gondzo Jan 12, 2018
c64ac27
lint fixes
gondzo Jan 12, 2018
533901b
add shrinkwrap
gondzo Jan 12, 2018
f7ed667
fix mention bug: mention text adds only to last text box
passimm Jan 12, 2018
2f3f155
Merge pull request #1599 from passimm/fix_mention_bug
gondzo Jan 12, 2018
6beb91a
changes for user mentions
gondzo Jan 14, 2018
6225f79
use handle for user mentions
gondzo Jan 14, 2018
1616a98
fix for issue 1442
kevinkid Jan 14, 2018
fae5bd3
GitHub issue#1595, IBM Chatbot project creation form updates
RishiRajSahu Jan 15, 2018
f96d1a8
GitHub issue#1595, IBM Chatbot project creation form updates
RishiRajSahu Jan 15, 2018
31f56fe
GitHub issue#1595, IBM Chatbot project creation form updates
RishiRajSahu Jan 15, 2018
120d6d6
GitHub issue#1595, IBM Chatbot project creation form updates
RishiRajSahu Jan 15, 2018
84ffb65
Merge pull request #1601 from appirio-tech/hotfix/ibm_watson_chatbot_…
Jan 15, 2018
eb4a7bf
reload current page when following link
gondzo Jan 15, 2018
993bfd7
merge bugBash06 to dev
gondzo Jan 15, 2018
8dfdedb
svg icons refactor with linting fixes
kevinkid Jan 16, 2018
6c30e3f
Merge branch 'dev' into issue-1442
kevinkid Jan 16, 2018
1be1b86
CI fixes
kevinkid Jan 16, 2018
60fab46
Ci fixes
kevinkid Jan 16, 2018
26eb8ad
CI trial fixes
kevinkid Jan 16, 2018
30855da
Ci fixes
kevinkid Jan 16, 2018
4ddf501
clean up final
kevinkid Jan 16, 2018
511e694
update project status on card view
gondzo Jan 16, 2018
8d7967c
global icons component removal
kevinkid Jan 17, 2018
3a98c66
Update development.js
kevinkid Jan 17, 2018
8ad6ab6
Update development.js
kevinkid Jan 17, 2018
3cb18af
dublicate svg files removal
kevinkid Jan 17, 2018
d09b55d
ci debug
kevinkid Jan 17, 2018
e4f51b8
update notification goto handling
gondzo Jan 18, 2018
078e52c
icons add/replacement
kevinkid Jan 18, 2018
fa3e66e
CSS color value fixes for the updated TC UI Kit `_variables`
Jan 19, 2018
66b55db
Merge branch 'dev' of https://github.com/appirio-tech/connect-app int…
Jan 19, 2018
d488f49
CSS fixes for icons and color states.
Jan 19, 2018
ea86d81
Cleanup of assets, CSS fixes
Jan 19, 2018
d5c919d
web notiication settings icon replacement
kevinkid Jan 19, 2018
8512691
GitHub issue#1604, Allow managers/admins to assign Manager role to pe…
RishiRajSahu Jan 19, 2018
b1ff6a0
Issue #1534 - Update the user tooltip with a unified component in all…
maxceem Jan 20, 2018
a954a0a
issue #1613
gondzo Jan 21, 2018
489cf49
issue #1612
gondzo Jan 22, 2018
c247c9b
update icons usage syntax
gondzo Jan 22, 2018
cd785c2
Merge branch 'dev' into issue-1442
gondzo Jan 22, 2018
3f9d54d
Merge branch 'issue-1442' into dev
gondzo Jan 22, 2018
09630b8
lint fixes
gondzo Jan 22, 2018
659652e
lint fixes
gondzo Jan 22, 2018
c567321
Merge pull request #1622 from appirio-tech/feature/add_manager_to_pro…
gondzo Jan 22, 2018
6c7b593
shrinkwrap fix
gondzo Jan 22, 2018
59f88fd
Merge branch 'dev' of https://github.com/appirio-tech/connect-app int…
gondzo Jan 22, 2018
8aa67ed
Merge branch 'dev' into issue-1534
gondzo Jan 22, 2018
fb19c49
Added tooltip to post comments avatars
maxceem Jan 23, 2018
a0f9385
Merge pull request #1620 from maxceem/issue-1534
gondzo Jan 23, 2018
7bce3e2
lint
gondzo Jan 23, 2018
381a49d
Eliminate use of Icons from appirio-tech-react-components"
gondzo Jan 26, 2018
252226f
fix #1682
gondzo Jan 26, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,15 @@ SCSS Files
}
}
}
SVG Icons
- This repository uses plugin babel-plugin-inline-react-svg
- The plugin is used to inline-embed svg icons inside the markup

Steps to adding new icons
- Insert the svg file in the ~/src/assets/images/ directory
- Add a new icon component file in directory ~/src/components/Icons/Icon-Name.jsx and reference it on the global
icon component in the ~/src/components/icons/ directory
- Wrap the svg icon inside an object for caching to optimize on perfomance.
```

### Writing Tests
Expand Down
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ deployment:
commands:
- ./deploy.sh TEST01
test02:
branch: notifications
branch: bugBash06
owner: appirio-tech
commands:
- ./deploy.sh TEST02
Expand Down
2 changes: 1 addition & 1 deletion config/constants/dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {
AUTH0_CLIENT_ID : process.env.AUTH0_CLIENT_ID_DEV,
domain : 'topcoder-dev.com',
DOMAIN : 'topcoder-dev.com',
CONNECT_MESSAGE_API_URL: process.env.CONNECT_MESSAGE_API_URL,
CONNECT_MESSAGE_API_URL: process.env.CONNECT_MESSAGE_API_URL,
ENV : 'DEV',

PROJECTS_API_URL : 'https://api.topcoder-dev.com',
Expand Down
10 changes: 6 additions & 4 deletions config/webpack/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = {
options: {
babelrc: false,
presets: [ 'env', 'react', 'stage-2' ],
plugins: [ 'lodash' ]
plugins: ['lodash', 'inline-react-svg']
}
}, {
test: /\.(coffee|litcoffee|cjsx)$/,
Expand Down Expand Up @@ -91,7 +91,10 @@ module.exports = {
'.gif',
'.jpg',
'.cjsx'
]
],
alias: {
handlebars: 'handlebars/dist/handlebars.min.js'
}
},

plugins: [
Expand All @@ -111,8 +114,7 @@ module.exports = {
// Only emit files when there are no errors
new webpack.NoEmitOnErrorsPlugin(),
new ExtractCssChunks({
filename: '[name].css',
justExtract: true
filename: '[name].css'
})
]
}
3 changes: 2 additions & 1 deletion config/webpack/development.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ module.exports = webpackMerge.strategy({
plugins: [
'lodash',
// add react hot reloader
'react-hot-loader/babel'
'react-hot-loader/babel',
'inline-react-svg'
]
}
}, {
Expand Down
Loading