Skip to content
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

Fix#107: Resize "manage role" window #110

Merged
merged 2 commits into from
Feb 1, 2024
Merged

Fix#107: Resize "manage role" window #110

merged 2 commits into from
Feb 1, 2024

Conversation

VividhPandey003
Copy link
Contributor

Describe your changes

image

Issue ticket number and link

Closes #107

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Checklist before requesting a review

  • I have performed a self-review of my code
  • I have tested on Chrome and Firefox
  • I have tested on a mobile device
  • I have provided a screenshot or recording of changes in my PR if there were updates to the frontend

@VividhPandey003
fixed modal size
f4f08a5 
Signed-off-by: Vividh Pandey <[email protected]>
@ecurrencyhodler
Copy link
Contributor

Nice. You have some jest tests failing. Can you take another look?

@aliraza556
Copy link
Contributor

aliraza556 commented Jan 31, 2024 •
edited
Loading

Hi @VividhPandey003,
See this PR https://github.com/stakwork/sphinx-tribes-frontend/pull/102/files files changes. I already fixed it SuperAdminHeader.spec.tsx unit test code.

@VividhPandey003
Copy link
Contributor Author

VividhPandey003 commented Jan 31, 2024 •
edited
Loading

Hi @VividhPandey003, See this PR https://github.com/stakwork/sphinx-tribes-frontend/pull/102/files files changes.

Hey @aliraza556, Oh yeah. That is actually what I meant. So I guess it looks like when you PR gets merged. mine will pass the tests right?

@aliraza556
Copy link
Contributor

Hi @VividhPandey003, See this PR https://github.com/stakwork/sphinx-tribes-frontend/pull/102/files files changes.

Hey @aliraza556, Oh yeah. That is actually what I meant. So I guess it looks like when you PR gets merged. mine will pass the tests right?

Yes

@Vayras
Copy link
Contributor

Vayras commented Feb 1, 2024

@VividhPandey003 For the fix for the checks you can make these changes --

  1. ${StartDate30.format('DD MMM')} - ${expectedEndDate.format('DD MMM YYYY')} add this instead of ${StartDate30.format('DD MMM YYYY')} - ${expectedEndDate.format('DD MMM YYYY')} in SuperAdminHeader.spec.tsx line 68

@aliraza556
Copy link
Contributor

@VividhPandey003, you just need to make any changes to your code and commit, and the Jest test will be fixed because this PR (#102) has been merged.

@VividhPandey003
Copy link
Contributor Author

@VividhPandey003 For the fix for the checks you can make these changes --

  1. ${StartDate30.format('DD MMM')} - ${expectedEndDate.format('DD MMM YYYY')} add this instead of ${StartDate30.format('DD MMM YYYY')} - ${expectedEndDate.format('DD MMM YYYY')} in SuperAdminHeader.spec.tsx line 68

Thanks @Vayras I don't need to make these changes I guess though

@aliraza556
Copy link
Contributor

@VividhPandey003 @Vayras
Now there is no need to make changes in this file src/pages/superadmin/header/__tests__/SuperAdminHeader.spec.tsx.

@VividhPandey003
Copy link
Contributor Author

@VividhPandey003, you just need to make any changes to your code and commit, and the Jest test will be fixed because this PR (#102) has been merged.

Ooh, nice. Thanks @aliraza556 for informing

@ecurrencyhodler
Copy link
Contributor

LGTM let's get a code review!

@kevkevinpal kevkevinpal merged commit f6a24e8 into stakwork:master Feb 1, 2024
5 checks passed
@ecurrencyhodler
Copy link
Contributor

Tested. LGTM. Paid!

jordan-ae added a commit to jordan-ae/sphinx-tribes-frontend that referenced this pull request Feb 3, 2024
@jordan-ae
Squashed commit of the following:
75103c0 
commit 9727f60
Merge: 39ca5f1 f43eea2
Author: kevkevin <[email protected]>
Date:   Fri Feb 2 16:35:26 2024 -0600

    Merge pull request stakwork#94 from ChetanKarwa/Profile-fix-closing-create-bounty

    Profile Tab: Fix improper navigation on closing create bounty tab

commit f43eea2
Author: ChetanKarwa <[email protected]>
Date:   Wed Jan 31 02:12:25 2024 +0530

    write test for the navigation fix

commit b94b71a
Author: ChetanKarwa <[email protected]>
Date:   Tue Jan 30 17:16:08 2024 +0530

    Profile Tab: Fix closing create bounty tab

commit 39ca5f1
Merge: aae07e5 8c4789a
Author: kevkevin <[email protected]>
Date:   Fri Feb 2 16:18:22 2024 -0600

    Merge pull request stakwork#135 from Fog3211/fix/tagColor

    Update color of tags to be visible

commit 8c4789a
Author: Fog3211 <[email protected]>
Date:   Fri Feb 2 08:55:37 2024 +0800

    fix: update the tag color of Elastic search Language

commit aae07e5
Merge: dc9231d 98c8144
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 21:48:19 2024 +0100

    Merge pull request stakwork#141 from stakwork/fix/add_tests

    Added tests removed by Saif

commit 98c8144
Author: elraphty <[email protected]>
Date:   Fri Feb 2 20:48:23 2024 +0100

    added tests remove by Saif

commit dc9231d
Merge: 018b868 cf194ff
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 17:54:36 2024 +0100

    Merge pull request stakwork#126 from Vayras/goBackFix

    Go Back Fix  issue stakwork#87

commit cf194ff
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 22:06:14 2024 +0530

    prettier fix

commit 31add2c
Merge: 58328db 018b868
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 22:03:48 2024 +0530

    Merge branch 'master' into goBackFix

commit 018b868
Merge: 070a063 c380fcc
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 15:56:28 2024 +0100

    Merge pull request stakwork#32 from Khaalid-oh/saif/bounty

    Create description box for org home page #1318

commit c380fcc
Author: Khaalid-oh <[email protected]>
Date:   Fri Feb 2 15:43:04 2024 +0100

    issues fixed

commit 070a063
Merge: 5821873 b9d79f3
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 15:35:21 2024 +0100

    Merge pull request stakwork#138 from vishnu552/savebuttondisable

    save button disable in edit Organization

commit 5821873
Merge: ee275b4 830e996
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 15:26:10 2024 +0100

    Merge pull request stakwork#139 from vishnu552/peopleprofilestyle

    Make people profile space consistent

commit f66667b
Author: Khaalid-oh <[email protected]>
Date:   Fri Feb 2 14:45:56 2024 +0100

    issues fixed

commit 0a801a6
Author: Khaalid-oh <[email protected]>
Date:   Fri Feb 2 12:51:33 2024 +0100

    issues fixed

commit 9acaa86
Author: Khaalid-oh <[email protected]>
Date:   Fri Feb 2 12:46:47 2024 +0100

    issues fixed

commit 830e996
Author: vishnu suthar <[email protected]>
Date:   Fri Feb 2 13:45:18 2024 +0530

    test fix

commit 4427da0
Author: vishnu suthar <[email protected]>
Date:   Fri Feb 2 13:43:19 2024 +0530

    inconsistent space profile on people page

commit b9d79f3
Author: vishnu suthar <[email protected]>
Date:   Fri Feb 2 13:18:22 2024 +0530

    test error fixed

commit 1a1c4a9
Author: vishnu suthar <[email protected]>
Date:   Fri Feb 2 12:58:17 2024 +0530

    save button disable when user type more than limit

commit 58328db
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 09:44:06 2024 +0530

    test fix attempt

commit 6b08be1
Merge: cac5919 769139e
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 09:42:57 2024 +0530

    Merge branch 'goBackFix' of https://github.com/Vayras/sphinx-tribes-frontend into goBackFix

commit 8787d9a
Merge: fb5c06d ee275b4
Author: Khalid Sulyman <[email protected]>
Date:   Thu Feb 1 21:46:29 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit ee275b4
Merge: a6f748f d7c0c19
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 14:00:21 2024 -0600

    Merge pull request stakwork#65 from Vayras/OrgAutoPopulate

    Org auto populate

commit a6f748f
Merge: 763c408 4eedc60
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 13:51:09 2024 -0600

    Merge pull request stakwork#118 from MahtabBukhari/resolve-open-bouties-hover-affect-issue

    resolve open bounties background disappear on hover issue

commit 769139e
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 13:38:39 2024 -0600

    testing to see if this helps the issue

commit 763c408
Merge: f6a24e8 5a3b7f1
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 13:32:10 2024 -0600

    Merge pull request stakwork#63 from ChetanKarwa/TribesPage/fix-tags-dropdown

    Tribes page - Fix tags dropdown in tribes page

commit 4205fcb
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:53:18 2024 +0530

    Revert "jest fix"

    This reverts commit 2edaf22.

commit ece4988
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:47:28 2024 +0530

    jest fix

commit 2c601a5
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:19:09 2024 +0530

    go back fix

commit cac5919
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:53:18 2024 +0530

    Revert "jest fix"

    This reverts commit 2edaf22.

commit 2edaf22
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:47:28 2024 +0530

    jest fix

commit ca7a630
Merge: 64396a8 f6a24e8
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:29:22 2024 +0530

    Merge branch 'master' of https://github.com/Vayras/sphinx-tribes-frontend into goBackFix

commit 64396a8
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:19:09 2024 +0530

    go back fix

commit f6a24e8
Merge: a4b4863 cbb23ea
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 12:43:30 2024 -0600

    Merge pull request stakwork#110 from VividhPandey003/resize

    Fix#107: Resize "manage role" window

commit a4b4863
Merge: ac559df 5bf0a04
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 12:36:08 2024 -0600

    Merge pull request stakwork#67 from KumarNayan/master

    Test cases for frontend/app/src/pages/tickets/TicketModalPage.tsx

commit ac559df
Merge: b31a59b 27883e4
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 10:41:25 2024 -0600

    Merge pull request stakwork#95 from ChetanKarwa/fix-badge-modal

    Profile: fix claim badge modal text label overlap

commit fb5c06d
Merge: 8c324e4 b31a59b
Author: Khalid Sulyman <[email protected]>
Date:   Thu Feb 1 17:13:51 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit b31a59b
Merge: 385c68e 4e98a41
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 09:41:49 2024 -0600

    Merge pull request stakwork#109 from adeel-ahmad-sh/people-page-alignment

    fix the alignment issue in people page

commit 4e98a41
Author: Adeel Ahmad <[email protected]>
Date:   Thu Feb 1 00:45:41 2024 +0500

    fix the alignment issue in people page

commit 4eedc60
Author: MahtabBukhari <[email protected]>
Date:   Thu Feb 1 20:10:13 2024 +0500

    fix conflicts

commit 385c68e
Merge: 21767f6 6da1f61
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 08:49:36 2024 -0600

    Merge pull request stakwork#114 from aliraza556/disable-icon-user-side

    Display Block Icon on Disabled User Action Buttons `settings and delete`

commit cbb23ea
Merge: f4f08a5 21767f6
Author: Vividh Pandey <[email protected]>
Date:   Thu Feb 1 18:50:42 2024 +0530

    Merge branch 'stakwork:master' into resize

commit 8c324e4
Merge: fef852a 21767f6
Author: Khalid Sulyman <[email protected]>
Date:   Thu Feb 1 13:51:30 2024 +0100

    Merge branch 'master' into saif/bounty

commit 27883e4
Author: ChetanKarwa <[email protected]>
Date:   Thu Feb 1 18:15:15 2024 +0530

    fix test case

commit 7842547
Author: MahtabBukhari <[email protected]>
Date:   Thu Feb 1 17:44:13 2024 +0500

    remaining two files

commit f356199
Author: MahtabBukhari <[email protected]>
Date:   Thu Feb 1 17:38:57 2024 +0500

    fixed branch conflict

commit 6da1f61
Author: aliraza556 <[email protected]>
Date:   Thu Feb 1 15:14:40 2024 +0500

    fix(super-admin): fixed super-admin unit test

commit 46720f1
Author: aliraza556 <[email protected]>
Date:   Thu Feb 1 15:10:05 2024 +0500

    fix(disable-icon): fixed disable icon in settings and delete button

commit f4f08a5
Author: Vividh Pandey <[email protected]>
Date:   Thu Feb 1 02:20:16 2024 +0530

    fixed modal size

    Signed-off-by: Vividh Pandey <[email protected]>

commit 19a282f
Author: ChetanKarwa <[email protected]>
Date:   Thu Feb 1 00:32:25 2024 +0530

    resolve comments

commit fef852a
Author: Khaalid-oh <[email protected]>
Date:   Wed Jan 31 19:23:14 2024 +0100

    feature:create description box for org home page #1318

commit a99c9bc
Author: Khaalid-oh <[email protected]>
Date:   Wed Jan 31 18:55:15 2024 +0100

    feature:create description box for org home page #1318

commit 83be9ef
Merge: ae45784 ca0967a
Author: Khaalid-oh <[email protected]>
Date:   Wed Jan 31 18:48:45 2024 +0100

    feat: create organization description comment
    :wq
    Merge branch 'saif/bounty' of https://github.com/Khaalid-oh/sphinx-tribes-frontend into saif/bounty
    :qa

commit ca0967a
Merge: a17f81d 76604f7
Author: Khalid Sulyman <[email protected]>
Date:   Wed Jan 31 18:45:50 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit ae45784
Author: Khaalid-oh <[email protected]>
Date:   Wed Jan 31 18:45:06 2024 +0100

    feature:create description box for org home page #1318

commit 9876b9b
Author: ChetanKarwa <[email protected]>
Date:   Wed Jan 31 02:59:01 2024 +0530

    Profile: fix claim badge modal text label overlap

commit 5bf0a04
Author: Kumar Nayan <[email protected]>
Date:   Tue Jan 30 21:47:33 2024 +0530

    Fixed failing tests

commit e2ff843
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 23:39:09 2024 +0530

    fixed tests

commit a17f81d
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 18:28:16 2024 +0100

    feature:create description box for org home page #1318

commit 504f099
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 18:17:01 2024 +0100

    feature:create description box for org home page #1318

commit 5a3b7f1
Author: ChetanKarwa <[email protected]>
Date:   Mon Jan 29 22:46:56 2024 +0530

    add test for no results condition

commit bdab6f1
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 18:16:31 2024 +0100

    feature:create description box for org home page #1318

commit 44bc00f
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 18:15:25 2024 +0100

    feature:create description box for org home page #1318

commit 2a6ef9d
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 22:39:54 2024 +0530

    test

commit a065e00
Merge: fe52ad4 a50c6ca
Author: Khalid Sulyman <[email protected]>
Date:   Mon Jan 29 18:01:25 2024 +0100

    Merge branch 'master' into saif/bounty

commit fe52ad4
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 17:39:36 2024 +0100

    feature:create description box for org home page #1318

commit 3dff8a1
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 22:02:57 2024 +0530

    fixed failing tests

commit 79cd8c0
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 21:55:08 2024 +0530

    Fixed conflict issues

commit 9e25e5c
Merge: 60b1e93 a50c6ca
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 21:50:07 2024 +0530

    Merge branch 'master' into master

commit 60b1e93
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 21:39:06 2024 +0530

    Test cases

commit d7c0c19
Author: Tushar Vyas <[email protected]>
Date:   Mon Jan 29 21:26:32 2024 +0530

    eslint fix

commit 0a0f222
Author: Tushar Vyas <[email protected]>
Date:   Mon Jan 29 21:11:47 2024 +0530

    review changes

commit 7346ad5
Author: Tushar Vyas <[email protected]>
Date:   Mon Jan 29 20:48:49 2024 +0530

    Auto populate correct org

commit 91a1a6c
Author: ChetanKarwa <[email protected]>
Date:   Mon Jan 29 18:30:08 2024 +0530

    retrigger test check

commit 0825ea4
Merge: 8d47802 1cc7208
Author: Khalid Sulyman <[email protected]>
Date:   Mon Jan 29 09:39:53 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit 8bea653
Author: ChetanKarwa <[email protected]>
Date:   Mon Jan 29 13:52:41 2024 +0530

    fix prettier issues

commit 159bcc1
Author: ChetanKarwa <[email protected]>
Date:   Mon Jan 29 13:52:01 2024 +0530

    fix tags dropdown

commit 8d47802
Merge: c0084e4 8fabda3
Author: Khalid Sulyman <[email protected]>
Date:   Fri Jan 26 18:38:49 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit c0084e4
Author: Khalid Sulyman <[email protected]>
Date:   Thu Jan 25 22:46:56 2024 +0100

    feat:description box for org home page #1318

commit a3e8684
Author: Khalid Sulyman <[email protected]>
Date:   Thu Jan 25 22:44:10 2024 +0100

    feat:description box for org home page #1318
jordan-ae added a commit to jordan-ae/sphinx-tribes-frontend that referenced this pull request Feb 3, 2024
@jordan-ae
Squashed commit of the following:
0af75ef 
commit 9727f60
Merge: 39ca5f1 f43eea2
Author: kevkevin <[email protected]>
Date:   Fri Feb 2 16:35:26 2024 -0600

    Merge pull request stakwork#94 from ChetanKarwa/Profile-fix-closing-create-bounty

    Profile Tab: Fix improper navigation on closing create bounty tab

commit f43eea2
Author: ChetanKarwa <[email protected]>
Date:   Wed Jan 31 02:12:25 2024 +0530

    write test for the navigation fix

commit b94b71a
Author: ChetanKarwa <[email protected]>
Date:   Tue Jan 30 17:16:08 2024 +0530

    Profile Tab: Fix closing create bounty tab

commit 39ca5f1
Merge: aae07e5 8c4789a
Author: kevkevin <[email protected]>
Date:   Fri Feb 2 16:18:22 2024 -0600

    Merge pull request stakwork#135 from Fog3211/fix/tagColor

    Update color of tags to be visible

commit 8c4789a
Author: Fog3211 <[email protected]>
Date:   Fri Feb 2 08:55:37 2024 +0800

    fix: update the tag color of Elastic search Language

commit aae07e5
Merge: dc9231d 98c8144
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 21:48:19 2024 +0100

    Merge pull request stakwork#141 from stakwork/fix/add_tests

    Added tests removed by Saif

commit 98c8144
Author: elraphty <[email protected]>
Date:   Fri Feb 2 20:48:23 2024 +0100

    added tests remove by Saif

commit dc9231d
Merge: 018b868 cf194ff
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 17:54:36 2024 +0100

    Merge pull request stakwork#126 from Vayras/goBackFix

    Go Back Fix  issue stakwork#87

commit cf194ff
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 22:06:14 2024 +0530

    prettier fix

commit 31add2c
Merge: 58328db 018b868
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 22:03:48 2024 +0530

    Merge branch 'master' into goBackFix

commit 018b868
Merge: 070a063 c380fcc
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 15:56:28 2024 +0100

    Merge pull request stakwork#32 from Khaalid-oh/saif/bounty

    Create description box for org home page #1318

commit c380fcc
Author: Khaalid-oh <[email protected]>
Date:   Fri Feb 2 15:43:04 2024 +0100

    issues fixed

commit 070a063
Merge: 5821873 b9d79f3
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 15:35:21 2024 +0100

    Merge pull request stakwork#138 from vishnu552/savebuttondisable

    save button disable in edit Organization

commit 5821873
Merge: ee275b4 830e996
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 15:26:10 2024 +0100

    Merge pull request stakwork#139 from vishnu552/peopleprofilestyle

    Make people profile space consistent

commit f66667b
Author: Khaalid-oh <[email protected]>
Date:   Fri Feb 2 14:45:56 2024 +0100

    issues fixed

commit 0a801a6
Author: Khaalid-oh <[email protected]>
Date:   Fri Feb 2 12:51:33 2024 +0100

    issues fixed

commit 9acaa86
Author: Khaalid-oh <[email protected]>
Date:   Fri Feb 2 12:46:47 2024 +0100

    issues fixed

commit 830e996
Author: vishnu suthar <[email protected]>
Date:   Fri Feb 2 13:45:18 2024 +0530

    test fix

commit 4427da0
Author: vishnu suthar <[email protected]>
Date:   Fri Feb 2 13:43:19 2024 +0530

    inconsistent space profile on people page

commit b9d79f3
Author: vishnu suthar <[email protected]>
Date:   Fri Feb 2 13:18:22 2024 +0530

    test error fixed

commit 1a1c4a9
Author: vishnu suthar <[email protected]>
Date:   Fri Feb 2 12:58:17 2024 +0530

    save button disable when user type more than limit

commit 58328db
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 09:44:06 2024 +0530

    test fix attempt

commit 6b08be1
Merge: cac5919 769139e
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 09:42:57 2024 +0530

    Merge branch 'goBackFix' of https://github.com/Vayras/sphinx-tribes-frontend into goBackFix

commit 8787d9a
Merge: fb5c06d ee275b4
Author: Khalid Sulyman <[email protected]>
Date:   Thu Feb 1 21:46:29 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit ee275b4
Merge: a6f748f d7c0c19
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 14:00:21 2024 -0600

    Merge pull request stakwork#65 from Vayras/OrgAutoPopulate

    Org auto populate

commit a6f748f
Merge: 763c408 4eedc60
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 13:51:09 2024 -0600

    Merge pull request stakwork#118 from MahtabBukhari/resolve-open-bouties-hover-affect-issue

    resolve open bounties background disappear on hover issue

commit 769139e
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 13:38:39 2024 -0600

    testing to see if this helps the issue

commit 763c408
Merge: f6a24e8 5a3b7f1
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 13:32:10 2024 -0600

    Merge pull request stakwork#63 from ChetanKarwa/TribesPage/fix-tags-dropdown

    Tribes page - Fix tags dropdown in tribes page

commit 4205fcb
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:53:18 2024 +0530

    Revert "jest fix"

    This reverts commit 2edaf22.

commit ece4988
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:47:28 2024 +0530

    jest fix

commit 2c601a5
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:19:09 2024 +0530

    go back fix

commit cac5919
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:53:18 2024 +0530

    Revert "jest fix"

    This reverts commit 2edaf22.

commit 2edaf22
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:47:28 2024 +0530

    jest fix

commit ca7a630
Merge: 64396a8 f6a24e8
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:29:22 2024 +0530

    Merge branch 'master' of https://github.com/Vayras/sphinx-tribes-frontend into goBackFix

commit 64396a8
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:19:09 2024 +0530

    go back fix

commit f6a24e8
Merge: a4b4863 cbb23ea
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 12:43:30 2024 -0600

    Merge pull request stakwork#110 from VividhPandey003/resize

    Fix#107: Resize "manage role" window

commit a4b4863
Merge: ac559df 5bf0a04
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 12:36:08 2024 -0600

    Merge pull request stakwork#67 from KumarNayan/master

    Test cases for frontend/app/src/pages/tickets/TicketModalPage.tsx

commit ac559df
Merge: b31a59b 27883e4
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 10:41:25 2024 -0600

    Merge pull request stakwork#95 from ChetanKarwa/fix-badge-modal

    Profile: fix claim badge modal text label overlap

commit fb5c06d
Merge: 8c324e4 b31a59b
Author: Khalid Sulyman <[email protected]>
Date:   Thu Feb 1 17:13:51 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit b31a59b
Merge: 385c68e 4e98a41
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 09:41:49 2024 -0600

    Merge pull request stakwork#109 from adeel-ahmad-sh/people-page-alignment

    fix the alignment issue in people page

commit 4e98a41
Author: Adeel Ahmad <[email protected]>
Date:   Thu Feb 1 00:45:41 2024 +0500

    fix the alignment issue in people page

commit 4eedc60
Author: MahtabBukhari <[email protected]>
Date:   Thu Feb 1 20:10:13 2024 +0500

    fix conflicts

commit 385c68e
Merge: 21767f6 6da1f61
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 08:49:36 2024 -0600

    Merge pull request stakwork#114 from aliraza556/disable-icon-user-side

    Display Block Icon on Disabled User Action Buttons `settings and delete`

commit cbb23ea
Merge: f4f08a5 21767f6
Author: Vividh Pandey <[email protected]>
Date:   Thu Feb 1 18:50:42 2024 +0530

    Merge branch 'stakwork:master' into resize

commit 8c324e4
Merge: fef852a 21767f6
Author: Khalid Sulyman <[email protected]>
Date:   Thu Feb 1 13:51:30 2024 +0100

    Merge branch 'master' into saif/bounty

commit 27883e4
Author: ChetanKarwa <[email protected]>
Date:   Thu Feb 1 18:15:15 2024 +0530

    fix test case

commit 7842547
Author: MahtabBukhari <[email protected]>
Date:   Thu Feb 1 17:44:13 2024 +0500

    remaining two files

commit f356199
Author: MahtabBukhari <[email protected]>
Date:   Thu Feb 1 17:38:57 2024 +0500

    fixed branch conflict

commit 6da1f61
Author: aliraza556 <[email protected]>
Date:   Thu Feb 1 15:14:40 2024 +0500

    fix(super-admin): fixed super-admin unit test

commit 46720f1
Author: aliraza556 <[email protected]>
Date:   Thu Feb 1 15:10:05 2024 +0500

    fix(disable-icon): fixed disable icon in settings and delete button

commit f4f08a5
Author: Vividh Pandey <[email protected]>
Date:   Thu Feb 1 02:20:16 2024 +0530

    fixed modal size

    Signed-off-by: Vividh Pandey <[email protected]>

commit 19a282f
Author: ChetanKarwa <[email protected]>
Date:   Thu Feb 1 00:32:25 2024 +0530

    resolve comments

commit fef852a
Author: Khaalid-oh <[email protected]>
Date:   Wed Jan 31 19:23:14 2024 +0100

    feature:create description box for org home page #1318

commit a99c9bc
Author: Khaalid-oh <[email protected]>
Date:   Wed Jan 31 18:55:15 2024 +0100

    feature:create description box for org home page #1318

commit 83be9ef
Merge: ae45784 ca0967a
Author: Khaalid-oh <[email protected]>
Date:   Wed Jan 31 18:48:45 2024 +0100

    feat: create organization description comment
    :wq
    Merge branch 'saif/bounty' of https://github.com/Khaalid-oh/sphinx-tribes-frontend into saif/bounty
    :qa

commit ca0967a
Merge: a17f81d 76604f7
Author: Khalid Sulyman <[email protected]>
Date:   Wed Jan 31 18:45:50 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit ae45784
Author: Khaalid-oh <[email protected]>
Date:   Wed Jan 31 18:45:06 2024 +0100

    feature:create description box for org home page #1318

commit 9876b9b
Author: ChetanKarwa <[email protected]>
Date:   Wed Jan 31 02:59:01 2024 +0530

    Profile: fix claim badge modal text label overlap

commit 5bf0a04
Author: Kumar Nayan <[email protected]>
Date:   Tue Jan 30 21:47:33 2024 +0530

    Fixed failing tests

commit e2ff843
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 23:39:09 2024 +0530

    fixed tests

commit a17f81d
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 18:28:16 2024 +0100

    feature:create description box for org home page #1318

commit 504f099
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 18:17:01 2024 +0100

    feature:create description box for org home page #1318

commit 5a3b7f1
Author: ChetanKarwa <[email protected]>
Date:   Mon Jan 29 22:46:56 2024 +0530

    add test for no results condition

commit bdab6f1
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 18:16:31 2024 +0100

    feature:create description box for org home page #1318

commit 44bc00f
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 18:15:25 2024 +0100

    feature:create description box for org home page #1318

commit 2a6ef9d
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 22:39:54 2024 +0530

    test

commit a065e00
Merge: fe52ad4 a50c6ca
Author: Khalid Sulyman <[email protected]>
Date:   Mon Jan 29 18:01:25 2024 +0100

    Merge branch 'master' into saif/bounty

commit fe52ad4
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 17:39:36 2024 +0100

    feature:create description box for org home page #1318

commit 3dff8a1
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 22:02:57 2024 +0530

    fixed failing tests

commit 79cd8c0
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 21:55:08 2024 +0530

    Fixed conflict issues

commit 9e25e5c
Merge: 60b1e93 a50c6ca
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 21:50:07 2024 +0530

    Merge branch 'master' into master

commit 60b1e93
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 21:39:06 2024 +0530

    Test cases

commit d7c0c19
Author: Tushar Vyas <[email protected]>
Date:   Mon Jan 29 21:26:32 2024 +0530

    eslint fix

commit 0a0f222
Author: Tushar Vyas <[email protected]>
Date:   Mon Jan 29 21:11:47 2024 +0530

    review changes

commit 7346ad5
Author: Tushar Vyas <[email protected]>
Date:   Mon Jan 29 20:48:49 2024 +0530

    Auto populate correct org

commit 91a1a6c
Author: ChetanKarwa <[email protected]>
Date:   Mon Jan 29 18:30:08 2024 +0530

    retrigger test check

commit 0825ea4
Merge: 8d47802 1cc7208
Author: Khalid Sulyman <[email protected]>
Date:   Mon Jan 29 09:39:53 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit 8bea653
Author: ChetanKarwa <[email protected]>
Date:   Mon Jan 29 13:52:41 2024 +0530

    fix prettier issues

commit 159bcc1
Author: ChetanKarwa <[email protected]>
Date:   Mon Jan 29 13:52:01 2024 +0530

    fix tags dropdown

commit 8d47802
Merge: c0084e4 8fabda3
Author: Khalid Sulyman <[email protected]>
Date:   Fri Jan 26 18:38:49 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit c0084e4
Author: Khalid Sulyman <[email protected]>
Date:   Thu Jan 25 22:46:56 2024 +0100

    feat:description box for org home page #1318

commit a3e8684
Author: Khalid Sulyman <[email protected]>
Date:   Thu Jan 25 22:44:10 2024 +0100

    feat:description box for org home page #1318
jordan-ae added a commit to jordan-ae/sphinx-tribes-frontend that referenced this pull request Feb 3, 2024
@jordan-ae
Squashed commit of the following:
57b46b6 
commit 9727f60
Merge: 39ca5f1 f43eea2
Author: kevkevin <[email protected]>
Date:   Fri Feb 2 16:35:26 2024 -0600

    Merge pull request stakwork#94 from ChetanKarwa/Profile-fix-closing-create-bounty

    Profile Tab: Fix improper navigation on closing create bounty tab

commit f43eea2
Author: ChetanKarwa <[email protected]>
Date:   Wed Jan 31 02:12:25 2024 +0530

    write test for the navigation fix

commit b94b71a
Author: ChetanKarwa <[email protected]>
Date:   Tue Jan 30 17:16:08 2024 +0530

    Profile Tab: Fix closing create bounty tab

commit 39ca5f1
Merge: aae07e5 8c4789a
Author: kevkevin <[email protected]>
Date:   Fri Feb 2 16:18:22 2024 -0600

    Merge pull request stakwork#135 from Fog3211/fix/tagColor

    Update color of tags to be visible

commit 8c4789a
Author: Fog3211 <[email protected]>
Date:   Fri Feb 2 08:55:37 2024 +0800

    fix: update the tag color of Elastic search Language

commit aae07e5
Merge: dc9231d 98c8144
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 21:48:19 2024 +0100

    Merge pull request stakwork#141 from stakwork/fix/add_tests

    Added tests removed by Saif

commit 98c8144
Author: elraphty <[email protected]>
Date:   Fri Feb 2 20:48:23 2024 +0100

    added tests remove by Saif

commit dc9231d
Merge: 018b868 cf194ff
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 17:54:36 2024 +0100

    Merge pull request stakwork#126 from Vayras/goBackFix

    Go Back Fix  issue stakwork#87

commit cf194ff
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 22:06:14 2024 +0530

    prettier fix

commit 31add2c
Merge: 58328db 018b868
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 22:03:48 2024 +0530

    Merge branch 'master' into goBackFix

commit 018b868
Merge: 070a063 c380fcc
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 15:56:28 2024 +0100

    Merge pull request stakwork#32 from Khaalid-oh/saif/bounty

    Create description box for org home page #1318

commit c380fcc
Author: Khaalid-oh <[email protected]>
Date:   Fri Feb 2 15:43:04 2024 +0100

    issues fixed

commit 070a063
Merge: 5821873 b9d79f3
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 15:35:21 2024 +0100

    Merge pull request stakwork#138 from vishnu552/savebuttondisable

    save button disable in edit Organization

commit 5821873
Merge: ee275b4 830e996
Author: Raphael Osaze Eyerin <[email protected]>
Date:   Fri Feb 2 15:26:10 2024 +0100

    Merge pull request stakwork#139 from vishnu552/peopleprofilestyle

    Make people profile space consistent

commit f66667b
Author: Khaalid-oh <[email protected]>
Date:   Fri Feb 2 14:45:56 2024 +0100

    issues fixed

commit 0a801a6
Author: Khaalid-oh <[email protected]>
Date:   Fri Feb 2 12:51:33 2024 +0100

    issues fixed

commit 9acaa86
Author: Khaalid-oh <[email protected]>
Date:   Fri Feb 2 12:46:47 2024 +0100

    issues fixed

commit 830e996
Author: vishnu suthar <[email protected]>
Date:   Fri Feb 2 13:45:18 2024 +0530

    test fix

commit 4427da0
Author: vishnu suthar <[email protected]>
Date:   Fri Feb 2 13:43:19 2024 +0530

    inconsistent space profile on people page

commit b9d79f3
Author: vishnu suthar <[email protected]>
Date:   Fri Feb 2 13:18:22 2024 +0530

    test error fixed

commit 1a1c4a9
Author: vishnu suthar <[email protected]>
Date:   Fri Feb 2 12:58:17 2024 +0530

    save button disable when user type more than limit

commit 58328db
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 09:44:06 2024 +0530

    test fix attempt

commit 6b08be1
Merge: cac5919 769139e
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 09:42:57 2024 +0530

    Merge branch 'goBackFix' of https://github.com/Vayras/sphinx-tribes-frontend into goBackFix

commit 8787d9a
Merge: fb5c06d ee275b4
Author: Khalid Sulyman <[email protected]>
Date:   Thu Feb 1 21:46:29 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit ee275b4
Merge: a6f748f d7c0c19
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 14:00:21 2024 -0600

    Merge pull request stakwork#65 from Vayras/OrgAutoPopulate

    Org auto populate

commit a6f748f
Merge: 763c408 4eedc60
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 13:51:09 2024 -0600

    Merge pull request stakwork#118 from MahtabBukhari/resolve-open-bouties-hover-affect-issue

    resolve open bounties background disappear on hover issue

commit 769139e
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 13:38:39 2024 -0600

    testing to see if this helps the issue

commit 763c408
Merge: f6a24e8 5a3b7f1
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 13:32:10 2024 -0600

    Merge pull request stakwork#63 from ChetanKarwa/TribesPage/fix-tags-dropdown

    Tribes page - Fix tags dropdown in tribes page

commit 4205fcb
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:53:18 2024 +0530

    Revert "jest fix"

    This reverts commit 2edaf22.

commit ece4988
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:47:28 2024 +0530

    jest fix

commit 2c601a5
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:19:09 2024 +0530

    go back fix

commit cac5919
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:53:18 2024 +0530

    Revert "jest fix"

    This reverts commit 2edaf22.

commit 2edaf22
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:47:28 2024 +0530

    jest fix

commit ca7a630
Merge: 64396a8 f6a24e8
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:29:22 2024 +0530

    Merge branch 'master' of https://github.com/Vayras/sphinx-tribes-frontend into goBackFix

commit 64396a8
Author: Tushar Vyas <[email protected]>
Date:   Fri Feb 2 00:19:09 2024 +0530

    go back fix

commit f6a24e8
Merge: a4b4863 cbb23ea
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 12:43:30 2024 -0600

    Merge pull request stakwork#110 from VividhPandey003/resize

    Fix#107: Resize "manage role" window

commit a4b4863
Merge: ac559df 5bf0a04
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 12:36:08 2024 -0600

    Merge pull request stakwork#67 from KumarNayan/master

    Test cases for frontend/app/src/pages/tickets/TicketModalPage.tsx

commit ac559df
Merge: b31a59b 27883e4
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 10:41:25 2024 -0600

    Merge pull request stakwork#95 from ChetanKarwa/fix-badge-modal

    Profile: fix claim badge modal text label overlap

commit fb5c06d
Merge: 8c324e4 b31a59b
Author: Khalid Sulyman <[email protected]>
Date:   Thu Feb 1 17:13:51 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit b31a59b
Merge: 385c68e 4e98a41
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 09:41:49 2024 -0600

    Merge pull request stakwork#109 from adeel-ahmad-sh/people-page-alignment

    fix the alignment issue in people page

commit 4e98a41
Author: Adeel Ahmad <[email protected]>
Date:   Thu Feb 1 00:45:41 2024 +0500

    fix the alignment issue in people page

commit 4eedc60
Author: MahtabBukhari <[email protected]>
Date:   Thu Feb 1 20:10:13 2024 +0500

    fix conflicts

commit 385c68e
Merge: 21767f6 6da1f61
Author: kevkevin <[email protected]>
Date:   Thu Feb 1 08:49:36 2024 -0600

    Merge pull request stakwork#114 from aliraza556/disable-icon-user-side

    Display Block Icon on Disabled User Action Buttons `settings and delete`

commit cbb23ea
Merge: f4f08a5 21767f6
Author: Vividh Pandey <[email protected]>
Date:   Thu Feb 1 18:50:42 2024 +0530

    Merge branch 'stakwork:master' into resize

commit 8c324e4
Merge: fef852a 21767f6
Author: Khalid Sulyman <[email protected]>
Date:   Thu Feb 1 13:51:30 2024 +0100

    Merge branch 'master' into saif/bounty

commit 27883e4
Author: ChetanKarwa <[email protected]>
Date:   Thu Feb 1 18:15:15 2024 +0530

    fix test case

commit 7842547
Author: MahtabBukhari <[email protected]>
Date:   Thu Feb 1 17:44:13 2024 +0500

    remaining two files

commit f356199
Author: MahtabBukhari <[email protected]>
Date:   Thu Feb 1 17:38:57 2024 +0500

    fixed branch conflict

commit 6da1f61
Author: aliraza556 <[email protected]>
Date:   Thu Feb 1 15:14:40 2024 +0500

    fix(super-admin): fixed super-admin unit test

commit 46720f1
Author: aliraza556 <[email protected]>
Date:   Thu Feb 1 15:10:05 2024 +0500

    fix(disable-icon): fixed disable icon in settings and delete button

commit f4f08a5
Author: Vividh Pandey <[email protected]>
Date:   Thu Feb 1 02:20:16 2024 +0530

    fixed modal size

    Signed-off-by: Vividh Pandey <[email protected]>

commit 19a282f
Author: ChetanKarwa <[email protected]>
Date:   Thu Feb 1 00:32:25 2024 +0530

    resolve comments

commit fef852a
Author: Khaalid-oh <[email protected]>
Date:   Wed Jan 31 19:23:14 2024 +0100

    feature:create description box for org home page #1318

commit a99c9bc
Author: Khaalid-oh <[email protected]>
Date:   Wed Jan 31 18:55:15 2024 +0100

    feature:create description box for org home page #1318

commit 83be9ef
Merge: ae45784 ca0967a
Author: Khaalid-oh <[email protected]>
Date:   Wed Jan 31 18:48:45 2024 +0100

    feat: create organization description comment
    :wq
    Merge branch 'saif/bounty' of https://github.com/Khaalid-oh/sphinx-tribes-frontend into saif/bounty
    :qa

commit ca0967a
Merge: a17f81d 76604f7
Author: Khalid Sulyman <[email protected]>
Date:   Wed Jan 31 18:45:50 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit ae45784
Author: Khaalid-oh <[email protected]>
Date:   Wed Jan 31 18:45:06 2024 +0100

    feature:create description box for org home page #1318

commit 9876b9b
Author: ChetanKarwa <[email protected]>
Date:   Wed Jan 31 02:59:01 2024 +0530

    Profile: fix claim badge modal text label overlap

commit 5bf0a04
Author: Kumar Nayan <[email protected]>
Date:   Tue Jan 30 21:47:33 2024 +0530

    Fixed failing tests

commit e2ff843
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 23:39:09 2024 +0530

    fixed tests

commit a17f81d
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 18:28:16 2024 +0100

    feature:create description box for org home page #1318

commit 504f099
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 18:17:01 2024 +0100

    feature:create description box for org home page #1318

commit 5a3b7f1
Author: ChetanKarwa <[email protected]>
Date:   Mon Jan 29 22:46:56 2024 +0530

    add test for no results condition

commit bdab6f1
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 18:16:31 2024 +0100

    feature:create description box for org home page #1318

commit 44bc00f
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 18:15:25 2024 +0100

    feature:create description box for org home page #1318

commit 2a6ef9d
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 22:39:54 2024 +0530

    test

commit a065e00
Merge: fe52ad4 a50c6ca
Author: Khalid Sulyman <[email protected]>
Date:   Mon Jan 29 18:01:25 2024 +0100

    Merge branch 'master' into saif/bounty

commit fe52ad4
Author: Khaalid-oh <[email protected]>
Date:   Mon Jan 29 17:39:36 2024 +0100

    feature:create description box for org home page #1318

commit 3dff8a1
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 22:02:57 2024 +0530

    fixed failing tests

commit 79cd8c0
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 21:55:08 2024 +0530

    Fixed conflict issues

commit 9e25e5c
Merge: 60b1e93 a50c6ca
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 21:50:07 2024 +0530

    Merge branch 'master' into master

commit 60b1e93
Author: Kumar Nayan <[email protected]>
Date:   Mon Jan 29 21:39:06 2024 +0530

    Test cases

commit d7c0c19
Author: Tushar Vyas <[email protected]>
Date:   Mon Jan 29 21:26:32 2024 +0530

    eslint fix

commit 0a0f222
Author: Tushar Vyas <[email protected]>
Date:   Mon Jan 29 21:11:47 2024 +0530

    review changes

commit 7346ad5
Author: Tushar Vyas <[email protected]>
Date:   Mon Jan 29 20:48:49 2024 +0530

    Auto populate correct org

commit 91a1a6c
Author: ChetanKarwa <[email protected]>
Date:   Mon Jan 29 18:30:08 2024 +0530

    retrigger test check

commit 0825ea4
Merge: 8d47802 1cc7208
Author: Khalid Sulyman <[email protected]>
Date:   Mon Jan 29 09:39:53 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit 8bea653
Author: ChetanKarwa <[email protected]>
Date:   Mon Jan 29 13:52:41 2024 +0530

    fix prettier issues

commit 159bcc1
Author: ChetanKarwa <[email protected]>
Date:   Mon Jan 29 13:52:01 2024 +0530

    fix tags dropdown

commit 8d47802
Merge: c0084e4 8fabda3
Author: Khalid Sulyman <[email protected]>
Date:   Fri Jan 26 18:38:49 2024 +0100

    Merge branch 'stakwork:master' into saif/bounty

commit c0084e4
Author: Khalid Sulyman <[email protected]>
Date:   Thu Jan 25 22:46:56 2024 +0100

    feat:description box for org home page #1318

commit a3e8684
Author: Khalid Sulyman <[email protected]>
Date:   Thu Jan 25 22:44:10 2024 +0100

    feat:description box for org home page #1318
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.

Resize "manage role" window
5 participants
@VividhPandey003 @ecurrencyhodler @aliraza556 @Vayras @kevkevinpal