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.

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

Stage #1432

Merged
merged 27 commits into from
Jul 8, 2022
Merged

Stage #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7bd4921
Merge pull request #1354 from hypersign-protocol/develop
Vishwas1 Jun 23, 2022
722cbf9
Merge pull request #1358 from hypersign-protocol/develop
Vishwas1 Jun 23, 2022
b6a5817
Merge pull request #1365 from hypersign-protocol/develop
Vishwas1 Jun 23, 2022
0cedd68
Merge pull request #1373 from hypersign-protocol/develop
Vishwas1 Jun 23, 2022
1fd0a4f
Merge pull request #1378 from hypersign-protocol/develop
Vishwas1 Jun 24, 2022
a761161
Merge pull request #1379 from hypersign-protocol/develop
Vishwas1 Jun 24, 2022
3f00b58
Merge pull request #1382 from hypersign-protocol/develop
Vishwas1 Jun 25, 2022
71b5d20
Merge pull request #1383 from hypersign-protocol/develop
Vishwas1 Jun 25, 2022
3254fc8
Merge pull request #1388 from hypersign-protocol/develop
Vishwas1 Jun 27, 2022
2d2ad35
Merge pull request #1390 from hypersign-protocol/develop
Vishwas1 Jun 27, 2022
132874b
Merge pull request #1391 from hypersign-protocol/develop
Vishwas1 Jun 27, 2022
9357426
Merge pull request #1392 from hypersign-protocol/develop
Vishwas1 Jun 27, 2022
e93fad2
Merge pull request #1393 from hypersign-protocol/v5.5.0
Vishwas1 Jun 27, 2022
fcdd8a3
Merge pull request #1407 from hypersign-protocol/develop
Vishwas1 Jul 6, 2022
5454d5c
Merge pull request #1408 from hypersign-protocol/develop
Vishwas1 Jul 6, 2022
45ac9ed
Merge pull request #1410 from hypersign-protocol/develop
Vishwas1 Jul 7, 2022
2ddac3e
Merge pull request #1411 from hypersign-protocol/develop
Vishwas1 Jul 7, 2022
4207ec6
Merge pull request #1416 from hypersign-protocol/develop
Vishwas1 Jul 7, 2022
04a4475
Merge pull request #1422 from hypersign-protocol/develop
Vishwas1 Jul 8, 2022
48540d0
Merge pull request #1426 from hypersign-protocol/develop
Vishwas1 Jul 8, 2022
3cfd740
Merge pull request #1428 from hypersign-protocol/develop
Vishwas1 Jul 8, 2022
620aa0c
Merge pull request #1429 from hypersign-protocol/develop
Vishwas1 Jul 8, 2022
4a4f4cf
Merge pull request #1430 from hypersign-protocol/develop
Vishwas1 Jul 8, 2022
cfc18b3
minor bug fix
Vishwas1 Jul 8, 2022
c3c0ca6
this was buggy code; so removed it
Vishwas1 Jul 8, 2022
5278120
fixed social action display on the login page
Vishwas1 Jul 8, 2022
45e967a
Merge pull request #1431 from hypersign-protocol/v5.6.0
Vishwas1 Jul 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@
>Make sure to add
<a
target="_blank"
:href="`https://telegram.me/hyperfyre_stage_bot?startgroup=any`"
:href="`https://telegram.me/${hfTgBotId}?startgroup=any`"
>{{appName}} Telegram Bot</a
>
in your public group, for this functionality to work properly.</span
Expand Down
10 changes: 5 additions & 5 deletions src/components/participant/Action.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<template>
<div class="accordion mt-3 mx-auto overflow-hidden" role="tablist" style="max-width: 600px"
@click=" checkIfUserHasLoggedIn()">
<div class="accordion mt-3 mx-auto overflow-hidden" role="tablist" style="max-width: 600px" @click="checkIfUserHasLoggedIn()">
<loading :active.sync="isLoading" :can-cancel="true" :is-full-page="fullPage"></loading>
<Profile v-if="userProfile" :user="userProfile" />

Expand Down Expand Up @@ -171,9 +170,10 @@ export default {
checkIfUserHasLoggedIn() {
if (!this.userProfile) {
// TODO: bad way of coding. We should only hide which is being clicked
document.querySelectorAll(".action-wrap").forEach(e => {
// hiding second child
if (e.children[1]) e.children[1].style.display = 'none'
document.querySelectorAll(".card-header").forEach(elm => {
elm.classList.add('collapsed')
elm.attributes['aria-expanded'].value = false;
document.getElementById(elm.attributes['aria-controls'].value).style.display = 'none';
})
return this.notifyErr(Messsages.EVENT_ACTIONS.UNAUTHENTICATED);
}
Expand Down
5 changes: 0 additions & 5 deletions src/components/participant/ActionInputs/TwitterRetweet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,6 @@ export default {
fullPage: true,
};
},
updated(){
if(this.data.value && this.retweetUrl != ""){
this.retweetUrl = this.data.value;
}
},
mounted() {
eventBus.$on(`disableInput${this.data._id}`, this.disableInput);
},
Expand Down