Skip to content

Merge latest dev #1638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
gondzo merged 92 commits into from
Jan 26, 2018
Merged

Merge latest dev #1638

gondzo merged 92 commits into from
Jan 26, 2018

Conversation

@gondzo
Copy link
Collaborator

@gondzo gondzo commented Jan 26, 2018

No description provided.

Vikas Agarwal and others added 30 commits January 5, 2018 19:39
Merge branch 'hotfix/incorrect_comments'
ac09ca3
Fix managers counter not correct on project list
880cf07
Issue 1539: Provide link to manage profile from user dropdown
afa9cc8
@maxceem
Issue #1351 - Don't wrap ProjectCard in Link, instead handle click event
b900aea
@maxceem
Issue 1563 - Non persistent manager interface for card/list switch
46394e2
@maxceem
Issues #1557 - Make "Active" project tab default for project listing
934e11e
@maxceem
Fix to avoid using active status by default for regular users
4ddc638
@maxceem
Safety improvement
753bed8
@maxceem
Issue #1533 - Unify the use of the Avatar component on project grid a…
9e48e89 
…nd cards
@maxceem
Issue #1554 - User in notifications are listed with @handle instead o…
7495a9b 
…f their name
@maxceem
Revert development config for notification API URL
ff6a46f
@anonymousjaggu
issue #1573 fix
b0214b6
@maxceem
Issue #1519 - Screen flicker in dropdown
959e07c
@gondzo
Merge pull request #1584 from maxceem/issue-1351
88c3bee 
Issue #1351 - Don't wrap ProjectCard in Link, instead handle click event
@gondzo
Merge pull request #1585 from maxceem/issue-1563
f7aa5a0 
Issue #1563 - Non persistent manager interface for card/list switch
@gondzo
merge cefault active tab changes
f11372e
@gondzo
Merge branch 'maxceem-issue-1557' into bugBash06
42bd546
@gondzo
Merge pull request #1587 from maxceem/issue-1533
079b65a 
Issue #1533 - Unify the use of the Avatar component on project grid and cards
@gondzo
Merge pull request #1588 from maxceem/issue-1554
b23fbb3 
Issue #1554 - User in notifications are listed with @handle instead of their name
@gondzo
Merge pull request #1581 from tpwwu/issue-1580
bb7c8a0 
Issue #1580 Fix managers counter not correct on project list
@gondzo
Merge pull request #1582 from tpwwu/issue-1539
93fa32f 
Issue 1539: Provide link to manage profile from user dropdown
@gondzo
Merge pull request #1589 from anonymousjaggu/issue-1573
da35477 
issue #1573 fix
Github issue#1572, Project grid and project details don't list the co…
3274abb 
…rrect managers

— Fixed
Merge branch 'hotfix/empty_user_avatar_on_project_listing' into dev
4b05663
@passimm
Issue #1469 - User mentions in the posts
2c9e010
@passimm
select mentions in handle and render fullname
de69dff
@gondzo
Merge pull request #1594 from passimm/issue_1469
f7aa5af 
Issue #1469 - User mentions in the posts
@gondzo
Update circle.yml
9ac5d6a
@gondzo
Revert "Issue #1469 - User mentions in the posts"
9fbc68e
@gondzo
Merge pull request #1596 from appirio-tech/revert-1594-issue_1469
9f41092 
Revert "Issue #1469 - User mentions in the posts"
kevinkid and others added 29 commits January 17, 2018 23:55
@kevinkid
Update development.js
3a98c66
@kevinkid
Update development.js
8ad6ab6
@kevinkid
dublicate svg files removal
3cb18af
@kevinkid
ci debug
d09b55d
@gondzo
update notification goto handling
e4f51b8
@kevinkid
icons add/replacement
078e52c
CSS color value fixes for the updated TC UI Kit _variables
fa3e66e
Merge branch 'dev' of https://github.com/appirio-tech/connect-app int…
66b55db 
…o issue-1442

* 'dev' of https://github.com/appirio-tech/connect-app:
  CSS color value fixes for the updated TC UI Kit `_variables`
  update notification goto handling
  update project status on card view
CSS fixes for icons and color states.
d488f49
Cleanup of assets, CSS fixes
ea86d81
@kevinkid
web notiication settings icon replacement
d5c919d
@RishiRajSahu
GitHub issue#1604, Allow managers/admins to assign Manager role to pe…
8512691 
…ople added to a project

-- Added control for managers to add others on manager role
@maxceem
Issue #1534 - Update the user tooltip with a unified component in all…
b1ff6a0 
… instances
@gondzo
issue #1613
a954a0a
@gondzo
issue #1612
489cf49
@gondzo
update icons usage syntax
c247c9b
@gondzo
Merge branch 'dev' into issue-1442
cd785c2
@gondzo
Merge branch 'issue-1442' into dev
3f9d54d
@gondzo
lint fixes
09630b8
@gondzo
lint fixes
659652e
@gondzo
Merge pull request #1622 from appirio-tech/feature/add_manager_to_pro…
c567321 
…ject

GitHub issue#1604, Allow managers/admins to assign Manager role to pe…
@gondzo
shrinkwrap fix
6c7b593
@gondzo
Merge branch 'dev' of https://github.com/appirio-tech/connect-app int…
59f88fd 
…o dev
@gondzo
Merge branch 'dev' into issue-1534
8aa67ed
@maxceem
Added tooltip to post comments avatars
fb19c49
@gondzo
Merge pull request #1620 from maxceem/issue-1534
a0f9385 
Issue #1534 - Update the user tooltip with a unified component in all instances
@gondzo
lint
7bce3e2
@gondzo
Eliminate use of Icons from appirio-tech-react-components"
381a49d
@gondzo
fix #1682
252226f
@gondzo gondzo merged commit 71ebf8f into bugBash07 Jan 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@gondzo @maxceem @anonymousjaggu @passimm @kevinkid @RishiRajSahu