Implement sort by newest and oldest filters on org page #48
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
You've got a lot of test failing. Can you address these? You can also run tests locally running yarn. |
jordan-ae
force-pushed
the
feat/implement-sort-by-filter-on-org-page
branch
from
a3a0e0e to
dc43a30
Compare
|
@okhot tests are build workflow are failing |
|
Working on it! |
|
You have a merge conflict. Can you fix this? src/pages/tickets/org/orgHeader/index.tsx |
|
okhot you also have to resolve this conflict as well: |
jordan-ae
force-pushed
the
feat/implement-sort-by-filter-on-org-page
branch
from
9597bab to
956c72a
Compare
|
@ecurrencyhodler please could you approve workflows for this PR |
|
@okhot please fix the merge conflicts |
…manage bounty role
commit 21767f6 Merge: 7f239ae 1d41263 Author: Raphael Osaze Eyerin <[email protected]> Date: Thu Feb 1 13:08:01 2024 +0100 Merge pull request stakwork#102 from aliraza556/Hide-bounty-button-org-page Fix(hide-button): Fixed Post Bounty Button in an Organization Page commit 1d41263 Merge: 65df96b 7f239ae Author: Ali Raza <[email protected]> Date: Thu Feb 1 13:41:43 2024 +0500 Merge branch 'master' into Hide-bounty-button-org-page commit 7f239ae Merge: 1ae78c0 2fd656d Author: Raphael Osaze Eyerin <[email protected]> Date: Thu Feb 1 09:29:27 2024 +0100 Merge pull request stakwork#104 from stakwork/fix/re_enable_pagination fixed superadmin pagination commit 2fd656d Author: elraphty <[email protected]> Date: Thu Feb 1 09:20:46 2024 +0100 fixed failing test commit 36fb13b Merge: 89a41de 1ae78c0 Author: elraphty <[email protected]> Date: Thu Feb 1 08:40:35 2024 +0100 fixed merge conflicts commit 1ae78c0 Merge: 7ca294f a292c32 Author: Raphael Osaze Eyerin <[email protected]> Date: Thu Feb 1 08:32:30 2024 +0100 Merge pull request stakwork#93 from Vayras/fixedOrgScrolling Fixed org scrolling commit 7ca294f Merge: 562ec76 21975b9 Author: Bamidele Oluwatobi <[email protected]> Date: Wed Jan 31 22:13:56 2024 +0100 Merge pull request stakwork#75 from stakwork/feat/cypress-git-action Feat/cypress git action commit 562ec76 Merge: 76604f7 c07ec9f Author: Raphael Osaze Eyerin <[email protected]> Date: Wed Jan 31 21:00:15 2024 +0100 Merge pull request stakwork#76 from Gaurav-Gaikwad-1/ticketsTest Tickets.tsx Component Tests commit 21975b9 Author: Oluwatobi Bamidele <[email protected]> Date: Wed Jan 31 20:01:42 2024 +0100 update: handled error while creating user profile commit ba552df Author: Oluwatobi Bamidele <[email protected]> Date: Wed Jan 31 19:30:01 2024 +0100 update: changed localhost mode dispatch back to tribes from community commit 65df96b Author: aliraza556 <[email protected]> Date: Wed Jan 31 22:01:26 2024 +0500 fix(super-admin-unit-test): fixed the super-admin-header unit test and clean code commit 89a41de Author: elraphty <[email protected]> Date: Wed Jan 31 17:57:22 2024 +0100 fixed superadmin pagination commit 3e3bfbb Author: aliraza556 <[email protected]> Date: Wed Jan 31 18:34:17 2024 +0500 fix(super-admin-unit-test): fixed the super-admin-header unit test commit 55f92ff Author: aliraza556 <[email protected]> Date: Wed Jan 31 14:46:49 2024 +0500 fix(hide-button): fixed hide post bounty button in org page and also manage bounty role commit a292c32 Author: Tushar Vyas <[email protected]> Date: Wed Jan 31 02:13:06 2024 +0530 prettier commit 55e306f Author: Tushar Vyas <[email protected]> Date: Wed Jan 31 02:12:29 2024 +0530 update commit 5feb98f Author: Tushar Vyas <[email protected]> Date: Wed Jan 31 02:03:48 2024 +0530 test additon commit aa4c235 Author: Tushar Vyas <[email protected]> Date: Wed Jan 31 02:01:54 2024 +0530 org scrolling fix commit c07ec9f Merge: a605934 35e9d87 Author: Gaurav Gaikwad <[email protected]> Date: Wed Jan 31 00:14:00 2024 +0530 updated code commit a605934 Author: Gaurav Gaikwad <[email protected]> Date: Wed Jan 31 00:04:12 2024 +0530 updated Ticket.spec.tsx commit 7b1b958 Merge: 6f869da efcc7f6 Author: Tushar Vyas <[email protected]> Date: Tue Jan 30 23:50:05 2024 +0530 Merge branch 'master' of https://github.com/stakwork/sphinx-tribes-frontend commit 35e9d87 Author: Gaurav Gaikwad <[email protected]> Date: Tue Jan 30 19:57:16 2024 +0530 Update Tickets.spec.tsx commit 7af1868 Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 01:25:56 2024 +0100 update: stop tracking screen shots commit be217f3 Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 01:25:02 2024 +0100 correct part commit 866421c Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 01:24:11 2024 +0100 update: stop tracking nodes.json file commit 43480df Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:53:17 2024 +0100 update: cypress screenshot commit 72d3cab Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:51:37 2024 +0100 update: run prettier commit 31ade8d Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:51:03 2024 +0100 update: cypress should try to access port 3007 and not 3000 again commit a9a4003 Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:50:29 2024 +0100 update: when frontend is running on 3007 backend host should be 13000 commit 46717f0 Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:49:19 2024 +0100 update: changed port cypress test run on commit 8fa0be6 Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:45:54 2024 +0100 when testing with cypress host url should be localhost:13007 commit 2955c7b Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:40:32 2024 +0100 update: updated spelling error in flow commit dfa9bcd Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:28:31 2024 +0100 update: ensured I can run another commad after yarn start commit 8ca26dd Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:07:01 2024 +0100 fix: use yarn instead of npm commit cc3a53d Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 23:56:48 2024 +0100 update: installed dependencies and start the server commit 6c9c1ea Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 23:42:23 2024 +0100 fix: trying to know what folders and file we have in our current directory commit fc43049 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 23:32:56 2024 +0100 fix: trying to get the present working directory commit 6a96a32 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 23:24:09 2024 +0100 update: changed copy part for fixtures commit cc5f438 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 23:16:10 2024 +0100 update: trying to add permissions to cypress commit 8199c1d Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 23:07:05 2024 +0100 getting correct write access commit 1ba5b9b Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 22:56:24 2024 +0100 fix: added write access to sphinx-tribes-frontend cypress folder commit c3e2ef8 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 22:35:06 2024 +0100 update: added some steps for docker config commit 5e31b94 Author: Gaurav Gaikwad <[email protected]> Date: Tue Jan 30 01:03:31 2024 +0530 Tickets.tsx Component Tests commit 73988a7 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 20:05:14 2024 +0100 update: changed the host port from 5001 to 13000 and change ModeDispatch to community commit 21e7f8b Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 19:57:31 2024 +0100 feat: add script for cypress run commit 01e8992 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 19:44:19 2024 +0100 feat: setup github workflow for cypress test commit 6f869da Merge: 9641e6e 1cc7208 Author: Tushar Vyas <[email protected]> Date: Mon Jan 29 19:31:56 2024 +0530 Merge branch 'master' of https://github.com/stakwork/sphinx-tribes-frontend commit 187a78f Merge: 14035f2 1cc7208 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 13:44:11 2024 +0100 Merge branch 'master' into feat/setup-cypress commit 14035f2 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 13:13:34 2024 +0100 update: fixed prettier commit 9641e6e Merge: a8934d2 8fabda3 Author: Tushar Vyas <[email protected]> Date: Sat Jan 27 20:55:29 2024 +0530 Merge branch 'master' of https://github.com/stakwork/sphinx-tribes-frontend commit 019e05f Author: Oluwatobi Bamidele <[email protected]> Date: Sat Jan 27 02:42:58 2024 +0100 update: change details back to normal commit d67e0ec Author: Oluwatobi Bamidele <[email protected]> Date: Sat Jan 27 02:03:48 2024 +0100 update: fixed config, jest test was failling commit c5c1053 Author: Oluwatobi Bamidele <[email protected]> Date: Sat Jan 27 01:10:20 2024 +0100 feat: added a simple function to help post relay users to tribe server commit 9fb073e Author: Oluwatobi Bamidele <[email protected]> Date: Sat Jan 27 00:55:43 2024 +0100 update: used dynamic user record from nodes array commit a49cf45 Author: Oluwatobi Bamidele <[email protected]> Date: Sat Jan 27 00:20:33 2024 +0100 feat: cypress login test commit c438dbd Author: Oluwatobi Bamidele <[email protected]> Date: Fri Jan 26 19:42:40 2024 +0100 feat: cypress initial setup commit a8934d2 Merge: b0df733 a8cb8f5 Author: Tushar Vyas <[email protected]> Date: Fri Jan 26 10:44:20 2024 +0530 Merge branch 'master' of https://github.com/stakwork/sphinx-tribes-frontend
commit 21767f6 Merge: 7f239ae 1d41263 Author: Raphael Osaze Eyerin <[email protected]> Date: Thu Feb 1 13:08:01 2024 +0100 Merge pull request stakwork#102 from aliraza556/Hide-bounty-button-org-page Fix(hide-button): Fixed Post Bounty Button in an Organization Page commit 1d41263 Merge: 65df96b 7f239ae Author: Ali Raza <[email protected]> Date: Thu Feb 1 13:41:43 2024 +0500 Merge branch 'master' into Hide-bounty-button-org-page commit 7f239ae Merge: 1ae78c0 2fd656d Author: Raphael Osaze Eyerin <[email protected]> Date: Thu Feb 1 09:29:27 2024 +0100 Merge pull request stakwork#104 from stakwork/fix/re_enable_pagination fixed superadmin pagination commit 2fd656d Author: elraphty <[email protected]> Date: Thu Feb 1 09:20:46 2024 +0100 fixed failing test commit 36fb13b Merge: 89a41de 1ae78c0 Author: elraphty <[email protected]> Date: Thu Feb 1 08:40:35 2024 +0100 fixed merge conflicts commit 1ae78c0 Merge: 7ca294f a292c32 Author: Raphael Osaze Eyerin <[email protected]> Date: Thu Feb 1 08:32:30 2024 +0100 Merge pull request stakwork#93 from Vayras/fixedOrgScrolling Fixed org scrolling commit 7ca294f Merge: 562ec76 21975b9 Author: Bamidele Oluwatobi <[email protected]> Date: Wed Jan 31 22:13:56 2024 +0100 Merge pull request stakwork#75 from stakwork/feat/cypress-git-action Feat/cypress git action commit 562ec76 Merge: 76604f7 c07ec9f Author: Raphael Osaze Eyerin <[email protected]> Date: Wed Jan 31 21:00:15 2024 +0100 Merge pull request stakwork#76 from Gaurav-Gaikwad-1/ticketsTest Tickets.tsx Component Tests commit 21975b9 Author: Oluwatobi Bamidele <[email protected]> Date: Wed Jan 31 20:01:42 2024 +0100 update: handled error while creating user profile commit ba552df Author: Oluwatobi Bamidele <[email protected]> Date: Wed Jan 31 19:30:01 2024 +0100 update: changed localhost mode dispatch back to tribes from community commit 65df96b Author: aliraza556 <[email protected]> Date: Wed Jan 31 22:01:26 2024 +0500 fix(super-admin-unit-test): fixed the super-admin-header unit test and clean code commit 89a41de Author: elraphty <[email protected]> Date: Wed Jan 31 17:57:22 2024 +0100 fixed superadmin pagination commit 3e3bfbb Author: aliraza556 <[email protected]> Date: Wed Jan 31 18:34:17 2024 +0500 fix(super-admin-unit-test): fixed the super-admin-header unit test commit 55f92ff Author: aliraza556 <[email protected]> Date: Wed Jan 31 14:46:49 2024 +0500 fix(hide-button): fixed hide post bounty button in org page and also manage bounty role commit a292c32 Author: Tushar Vyas <[email protected]> Date: Wed Jan 31 02:13:06 2024 +0530 prettier commit 55e306f Author: Tushar Vyas <[email protected]> Date: Wed Jan 31 02:12:29 2024 +0530 update commit 5feb98f Author: Tushar Vyas <[email protected]> Date: Wed Jan 31 02:03:48 2024 +0530 test additon commit aa4c235 Author: Tushar Vyas <[email protected]> Date: Wed Jan 31 02:01:54 2024 +0530 org scrolling fix commit c07ec9f Merge: a605934 35e9d87 Author: Gaurav Gaikwad <[email protected]> Date: Wed Jan 31 00:14:00 2024 +0530 updated code commit a605934 Author: Gaurav Gaikwad <[email protected]> Date: Wed Jan 31 00:04:12 2024 +0530 updated Ticket.spec.tsx commit 7b1b958 Merge: 6f869da efcc7f6 Author: Tushar Vyas <[email protected]> Date: Tue Jan 30 23:50:05 2024 +0530 Merge branch 'master' of https://github.com/stakwork/sphinx-tribes-frontend commit 35e9d87 Author: Gaurav Gaikwad <[email protected]> Date: Tue Jan 30 19:57:16 2024 +0530 Update Tickets.spec.tsx commit 7af1868 Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 01:25:56 2024 +0100 update: stop tracking screen shots commit be217f3 Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 01:25:02 2024 +0100 correct part commit 866421c Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 01:24:11 2024 +0100 update: stop tracking nodes.json file commit 43480df Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:53:17 2024 +0100 update: cypress screenshot commit 72d3cab Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:51:37 2024 +0100 update: run prettier commit 31ade8d Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:51:03 2024 +0100 update: cypress should try to access port 3007 and not 3000 again commit a9a4003 Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:50:29 2024 +0100 update: when frontend is running on 3007 backend host should be 13000 commit 46717f0 Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:49:19 2024 +0100 update: changed port cypress test run on commit 8fa0be6 Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:45:54 2024 +0100 when testing with cypress host url should be localhost:13007 commit 2955c7b Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:40:32 2024 +0100 update: updated spelling error in flow commit dfa9bcd Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:28:31 2024 +0100 update: ensured I can run another commad after yarn start commit 8ca26dd Author: Oluwatobi Bamidele <[email protected]> Date: Tue Jan 30 00:07:01 2024 +0100 fix: use yarn instead of npm commit cc3a53d Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 23:56:48 2024 +0100 update: installed dependencies and start the server commit 6c9c1ea Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 23:42:23 2024 +0100 fix: trying to know what folders and file we have in our current directory commit fc43049 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 23:32:56 2024 +0100 fix: trying to get the present working directory commit 6a96a32 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 23:24:09 2024 +0100 update: changed copy part for fixtures commit cc5f438 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 23:16:10 2024 +0100 update: trying to add permissions to cypress commit 8199c1d Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 23:07:05 2024 +0100 getting correct write access commit 1ba5b9b Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 22:56:24 2024 +0100 fix: added write access to sphinx-tribes-frontend cypress folder commit c3e2ef8 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 22:35:06 2024 +0100 update: added some steps for docker config commit 5e31b94 Author: Gaurav Gaikwad <[email protected]> Date: Tue Jan 30 01:03:31 2024 +0530 Tickets.tsx Component Tests commit 73988a7 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 20:05:14 2024 +0100 update: changed the host port from 5001 to 13000 and change ModeDispatch to community commit 21e7f8b Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 19:57:31 2024 +0100 feat: add script for cypress run commit 01e8992 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 19:44:19 2024 +0100 feat: setup github workflow for cypress test commit 6f869da Merge: 9641e6e 1cc7208 Author: Tushar Vyas <[email protected]> Date: Mon Jan 29 19:31:56 2024 +0530 Merge branch 'master' of https://github.com/stakwork/sphinx-tribes-frontend commit 187a78f Merge: 14035f2 1cc7208 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 13:44:11 2024 +0100 Merge branch 'master' into feat/setup-cypress commit 14035f2 Author: Oluwatobi Bamidele <[email protected]> Date: Mon Jan 29 13:13:34 2024 +0100 update: fixed prettier commit 9641e6e Merge: a8934d2 8fabda3 Author: Tushar Vyas <[email protected]> Date: Sat Jan 27 20:55:29 2024 +0530 Merge branch 'master' of https://github.com/stakwork/sphinx-tribes-frontend commit 019e05f Author: Oluwatobi Bamidele <[email protected]> Date: Sat Jan 27 02:42:58 2024 +0100 update: change details back to normal commit d67e0ec Author: Oluwatobi Bamidele <[email protected]> Date: Sat Jan 27 02:03:48 2024 +0100 update: fixed config, jest test was failling commit c5c1053 Author: Oluwatobi Bamidele <[email protected]> Date: Sat Jan 27 01:10:20 2024 +0100 feat: added a simple function to help post relay users to tribe server commit 9fb073e Author: Oluwatobi Bamidele <[email protected]> Date: Sat Jan 27 00:55:43 2024 +0100 update: used dynamic user record from nodes array commit a49cf45 Author: Oluwatobi Bamidele <[email protected]> Date: Sat Jan 27 00:20:33 2024 +0100 feat: cypress login test commit c438dbd Author: Oluwatobi Bamidele <[email protected]> Date: Fri Jan 26 19:42:40 2024 +0100 feat: cypress initial setup commit a8934d2 Merge: b0df733 a8cb8f5 Author: Tushar Vyas <[email protected]> Date: Fri Jan 26 10:44:20 2024 +0530 Merge branch 'master' of https://github.com/stakwork/sphinx-tribes-frontend
|
please fix merge conflicts @okhot |
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
Signed-off-by: Vividh Pandey <[email protected]>
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
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
|
@okhot since all of the tests are failing try this instead. |
|
@okhot if I don't get an update by tomorrow I will have to unassign this from you. |
aliraza556
reviewed
Feb 6, 2024
| </DropDownButton> | ||
| </SoryByContainer> | ||
| </FiltersLeft> | ||
| <EuiPopover |
|
Hi @okhot, Here are the PR changes: please copy and paste into the new PR stakwork/sphinx-tribes#160 branch, only these files:
Please avoid committing repeatedly here. Once you make changes in the new PR branch, the PR will be closed. Also, whenever you commit the code, please ensure to run the command Don't include these files:
|
|
Closing this PR since the commit history is a mess and all the tests are failing please rebase and squash the commits to reopen this PR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your changes
Implemented Sort by Newest and oldest on the org page
https://www.loom.com/share/d11cdfa3cdfc45a7a381589e3c790f21?sid=c74cf43c-a39b-43e1-b100-630bb408a86c
Issue ticket number and link
#1326
Type of change
Checklist before requesting a review