{"payload":{"feedbackUrl":"https://github.com/orgs/community/discussions/53140","repo":{"id":369925260,"defaultBranch":"dev","name":"proton-affiliate","ownerLogin":"edenia","currentUserCanPush":false,"isFork":false,"isEmpty":false,"createdAt":"2021-05-22T23:35:40.000Z","ownerAvatar":"https://avatars.githubusercontent.com/u/5633366?v=4","public":true,"private":false,"isOrgOwned":true},"refInfo":{"name":"","listCacheKey":"v0:1678461726.0198631","currentOid":""},"activityList":{"items":[{"before":"a7bd7287742b570e0a9a4fc578cc869bedd781c3","after":null,"ref":"refs/heads/fix/resolve-main-conflicts","pushedAt":"2023-03-10T15:17:23.016Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"xavier506","name":"Xavier Fernandez","path":"/xavier506","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/5632966?s=80&v=4"}},{"before":"96b30dfd5c8bfecc8f9e33bd20c08b61b19c5a54","after":"f33404781acc5c10027e9497fc275afc3e4d7cc3","ref":"refs/heads/main","pushedAt":"2023-03-10T15:17:19.055Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"xavier506","name":"Xavier Fernandez","path":"/xavier506","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/5632966?s=80&v=4"},"commit":{"message":"Fix/resolve main conflicts (#426)\n\n* Fix/review contracts 398 (#403)\r\n\r\n* fix(env): use right endpoint\r\n\r\n* fix(readme): use right url\r\n\r\n* fix(contracts): admin now can approve payment after expiration and use XPR price from API\r\n\r\n* fix(hapi): query XPR price directly instead of BTC\r\n\r\n* chore(vscode): add cpp properties for Linux\r\n\r\n* chore(contracts): install dependecies\r\n\r\n* chore(vscode): add needed configuration\r\n\r\n* Fix/add translation to spanish (#405)\r\n\r\n* fix(webapp): translate home, about and help routes\r\n\r\n* fix(webapp): add spanish translation in home page\r\n\r\n* fix(webapp): add spanish translation and fix proptype\r\n\r\n* fix(webapp): add translation to spanish in admin route\r\n\r\n* fix(webapp): minor fix in spanish text\r\n\r\n* chore(webapp): display the current year in the footer and change text\r\n\r\n* Fix/last tx users 335 (#406)\r\n\r\n* fix(webapp): add link to transaction in last tx\r\n\r\n* fix(webapp): use correct url to link ricardian contract\r\n\r\n* Feat/agree terms and conditions 332 (#417)\r\n\r\n* feat(webapp): add agreement checkbox required to join or complete the referral\r\n\r\n* fix(webapp): disable button to join when the status is pending kyc or pending approval\r\n\r\n* fix(webapp): minor fix in spanish text\r\n\r\n* Fix/contracts conflicts (#419)\r\n\r\n* Feat/approve rejected payments 402 (#416)\r\n\r\n* feat(webapp): show rejected payments in admin section\r\n\r\n* feat(webapp): add rejected referrals into the referall payments section\r\n\r\n* feat(webapp): add button to reapprove rejected payment\r\n\r\n* feat(webapp): perform transaction to pay rejected referral\r\n\r\n* fix(webapp): fix filter referrals payments and avoid to show duplicated values\r\n\r\n* feat(contracts): add contract to approve and pay a rejected referral\r\n\r\n* fix(webapp): change text\r\n\r\n* feat(contracts): add payrejected action\r\n\r\n* fix(contracts): set correct authorization\r\n\r\n- chore(contracts): add case to payrejected action in test file\r\n\r\n* fix(contracts): add 'eosio.code' permission to affiliate in the unit tests\r\n\r\n* fix(contracts): set usd_reward_amount before use it\r\n\r\n* fix(webapp): unselect checkbox when performs a transaction sucessfully\r\n\r\n* fix(contracts): first check if invitee is an account and remove unneeded conversion\r\n\r\n* fix(postgres):Update postgres versio (#424)\r\n\r\n* fix(webapp): resolve conflicts\r\n\r\n* fix(kubernetes): resolve conflicts\r\n\r\n* chore(contracts): compile contract\r\n\r\n---------\r\n\r\nCo-authored-by: Francis Gómez <96137247+fagomezra@users.noreply.github.com>","shortMessageHtmlLink":"Fix/resolve main conflicts (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"1617788087\" data-permission-text=\"Title is private\" data-url=\"https://github.com/edenia/proton-affiliate/issues/426\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/edenia/proton-affiliate/pull/426/hovercard\" href=\"https://github.com/edenia/proton-affiliate/pull/426\">#426</a>)"}},{"before":"2c2446c60f2778e5fc25ef076c5cee1243be8b47","after":"a7bd7287742b570e0a9a4fc578cc869bedd781c3","ref":"refs/heads/fix/resolve-main-conflicts","pushedAt":"2023-03-09T18:19:30.596Z","pushType":"push","commitsCount":1,"pusher":{"login":"Torresmorah","name":"Helbertson Torres","path":"/Torresmorah","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/66583677?s=80&v=4"},"commit":{"message":"chore(contracts): compile contract","shortMessageHtmlLink":"chore(contracts): compile contract"}},{"before":"96b30dfd5c8bfecc8f9e33bd20c08b61b19c5a54","after":"2c2446c60f2778e5fc25ef076c5cee1243be8b47","ref":"refs/heads/fix/resolve-main-conflicts","pushedAt":"2023-03-09T18:11:18.159Z","pushType":"push","commitsCount":10,"pusher":{"login":"Torresmorah","name":"Helbertson Torres","path":"/Torresmorah","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/66583677?s=80&v=4"},"commit":{"message":"fix(kubernetes): resolve conflicts","shortMessageHtmlLink":"fix(kubernetes): resolve conflicts"}},{"before":null,"after":"96b30dfd5c8bfecc8f9e33bd20c08b61b19c5a54","ref":"refs/heads/fix/resolve-main-conflicts","pushedAt":"2023-03-09T17:30:02.018Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"Torresmorah","name":"Helbertson Torres","path":"/Torresmorah","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/66583677?s=80&v=4"},"commit":{"message":"Merge pull request #421 from edenia/update-variable-webapp\n\nfix(webapp):update variable webapp","shortMessageHtmlLink":"Merge pull request <a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"1605592754\" data-permission-text=\"Title is private\" data-url=\"https://github.com/edenia/proton-affiliate/issues/421\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/edenia/proton-affiliate/pull/421/hovercard\" href=\"https://github.com/edenia/proton-affiliate/pull/421\">#421</a> from edenia/update-variable-webapp"}},{"before":"8dfb2808beb331b97b149805ed8ea14c12d8db10","after":"397aa25c0b430aa5fc398fbab3cba27b2139297a","ref":"refs/heads/fix/resolve-conflicts","pushedAt":"2023-03-09T17:17:10.378Z","pushType":"push","commitsCount":1,"pusher":{"login":"Torresmorah","name":"Helbertson Torres","path":"/Torresmorah","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/66583677?s=80&v=4"},"commit":{"message":"fix(contracts): resolve conflicts","shortMessageHtmlLink":"fix(contracts): resolve conflicts"}},{"before":null,"after":"8dfb2808beb331b97b149805ed8ea14c12d8db10","ref":"refs/heads/fix/resolve-conflicts","pushedAt":"2023-03-09T16:27:41.851Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"Torresmorah","name":"Helbertson Torres","path":"/Torresmorah","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/66583677?s=80&v=4"},"commit":{"message":"fix(webapp): resolve conflicts","shortMessageHtmlLink":"fix(webapp): resolve conflicts"}},{"before":"f5703cbe19233ba3be4ae2c9947f38b82decbaf2","after":null,"ref":"refs/heads/update-postgres-version","pushedAt":"2023-03-08T23:26:23.929Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"xavier506","name":"Xavier Fernandez","path":"/xavier506","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/5632966?s=80&v=4"}},{"before":"05152b126e79bc861aebac1b78b9a39ec2ad4115","after":"82c45bbe37a32e8e7ee8e999ee918a2dc7203fc2","ref":"refs/heads/dev","pushedAt":"2023-03-08T23:26:20.991Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"xavier506","name":"Xavier Fernandez","path":"/xavier506","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/5632966?s=80&v=4"},"commit":{"message":"fix(postgres):Update postgres versio (#424)","shortMessageHtmlLink":"fix(postgres):Update postgres versio (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"1616127798\" data-permission-text=\"Title is private\" data-url=\"https://github.com/edenia/proton-affiliate/issues/424\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/edenia/proton-affiliate/pull/424/hovercard\" href=\"https://github.com/edenia/proton-affiliate/pull/424\">#424</a>)"}},{"before":null,"after":"f5703cbe19233ba3be4ae2c9947f38b82decbaf2","ref":"refs/heads/update-postgres-version","pushedAt":"2023-03-08T23:23:06.159Z","pushType":"branch_creation","commitsCount":0,"pusher":{"login":"fagomezra","name":"Francis Gómez","path":"/fagomezra","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/96137247?s=80&v=4"},"commit":{"message":"fix(postgres):Update postgres versio","shortMessageHtmlLink":"fix(postgres):Update postgres versio"}},{"before":"2267cc509f71c772e47efaf04bfd791375871afb","after":null,"ref":"refs/heads/feat/approve-rejected-payments-402","pushedAt":"2023-03-07T14:42:25.393Z","pushType":"branch_deletion","commitsCount":0,"pusher":{"login":"xavier506","name":"Xavier Fernandez","path":"/xavier506","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/5632966?s=80&v=4"}},{"before":"0117753bb4db8bf15afde81ee68183954981d4cd","after":"05152b126e79bc861aebac1b78b9a39ec2ad4115","ref":"refs/heads/dev","pushedAt":"2023-03-07T14:42:21.492Z","pushType":"pr_merge","commitsCount":1,"pusher":{"login":"xavier506","name":"Xavier Fernandez","path":"/xavier506","primaryAvatarUrl":"https://avatars.githubusercontent.com/u/5632966?s=80&v=4"},"commit":{"message":"Feat/approve rejected payments 402 (#416)\n\n* feat(webapp): show rejected payments in admin section\r\n\r\n* feat(webapp): add rejected referrals into the referall payments section\r\n\r\n* feat(webapp): add button to reapprove rejected payment\r\n\r\n* feat(webapp): perform transaction to pay rejected referral\r\n\r\n* fix(webapp): fix filter referrals payments and avoid to show duplicated values\r\n\r\n* feat(contracts): add contract to approve and pay a rejected referral\r\n\r\n* fix(webapp): change text\r\n\r\n* feat(contracts): add payrejected action\r\n\r\n* fix(contracts): set correct authorization\r\n\r\n- chore(contracts): add case to payrejected action in test file\r\n\r\n* fix(contracts): add 'eosio.code' permission to affiliate in the unit tests\r\n\r\n* fix(contracts): set usd_reward_amount before use it\r\n\r\n* fix(webapp): unselect checkbox when performs a transaction sucessfully\r\n\r\n* fix(contracts): first check if invitee is an account and remove unneeded conversion","shortMessageHtmlLink":"Feat/approve rejected payments 402 (<a class=\"issue-link js-issue-link\" data-error-text=\"Failed to load title\" data-id=\"1598987508\" data-permission-text=\"Title is private\" data-url=\"https://github.com/edenia/proton-affiliate/issues/416\" data-hovercard-type=\"pull_request\" data-hovercard-url=\"/edenia/proton-affiliate/pull/416/hovercard\" href=\"https://github.com/edenia/proton-affiliate/pull/416\">#416</a>)"}}],"hasNextPage":false,"hasPreviousPage":false,"activityType":"all","actor":null,"timePeriod":"all","sort":"DESC","perPage":30,"cursor":"djE6ks8AAAADAM85NAA","startCursor":null,"endCursor":null}},"title":"Activity · edenia/proton-affiliate"}