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

Modify viewing tables for organisations #1176

Merged
merged 53 commits into from Jul 27, 2021
Merged

Modify viewing tables for organisations #1176

merged 53 commits into from Jul 27, 2021

Conversation

knirirr
Copy link
Contributor

@knirirr knirirr commented Jul 26, 2021

Fixes for public and private user profiles.

hoseinmirian and others added 30 commits July 14, 2021 14:47
@hoseinmirian
Initialize Organisation table with more functionalities
60bf9af
@hoseinmirian
Add updateUserOrganisation action in store
2c85b23
@hoseinmirian
Autogenerated documentation files
bf0f731
@hoseinmirian
Structured OrganisationsTable properly so it reacts to different routes
813c72b
@hoseinmirian
Complete users being able to delete organisation
48d92b6
@hoseinmirian
Merge branch 'Hossein-link-userorganisation-#1098' of https://github.…
8a44c53 
…com/FAIRsharing/fairsharing.github.io into Hossein-link-userorganisation-#1098
@hoseinmirian
Autogenerated documentation files
85e3ede
@hoseinmirian
Merge branch 'dev' into Hossein-link-userorganisation-#1098
4e7cc8c
@hoseinmirian
Autogenerated documentation files
24814e6
@hoseinmirian
Complete test for OrganisationTable so far
629f231
@hoseinmirian
Autogenerated documentation files
83dd856
@hoseinmirian
try fixing bug with github
7206f1c
@hoseinmirian
Merge branch 'Hossein-link-userorganisation-#1098' of https://github.…
6e3c5f6 
…com/FAIRsharing/fairsharing.github.io into Hossein-link-userorganisation-#1098
@hoseinmirian
Autogenerated documentation files
c5838d4
@hoseinmirian
Add await for record test
6a4b8e7
@hoseinmirian
Merge branch 'Hossein-link-userorganisation-#1098' of https://github.…
57311b0 
…com/FAIRsharing/fairsharing.github.io into Hossein-link-userorganisation-#1098
@hoseinmirian
Autogenerated documentation files
330892b
@hoseinmirian
Load all organisations
1a183c8
@hoseinmirian
Add proper margin for Public Profile
b98359c
@hoseinmirian
More responsiveness for profile
00f91db
@hoseinmirian
Add organisations functionality
020666a
@hoseinmirian
Autogenerated documentation files
431b76b
@hoseinmirian
Complete test for organisationTable plus adding snackbars
b76c96a
@hoseinmirian
Organisations add functionality and layout completed
842600c
@hoseinmirian
Merge branch 'Hossein-associating-org-users-#1154' of https://github.…
5eeaeac 
…com/FAIRsharing/fairsharing.github.io into Hossein-associating-org-users-#1154
@hoseinmirian
Autogenerated documentation files
939d745
@hoseinmirian
Complete creating new org and test
6973ef0
@hoseinmirian
Merge branch 'Hossein-associating-org-users-#1154' of https://github.…
9c5e4c8 
…com/FAIRsharing/fairsharing.github.io into Hossein-associating-org-users-#1154
@hoseinmirian
Autogenerated documentation files
2091842
@hoseinmirian
Merge pull request #1157 from FAIRsharing/Hossein-associating-org-use…
0e98ae4 
…rs-#1154

Hossein associating org users #1154
hoseinmirian and others added 20 commits July 22, 2021 10:52
@hoseinmirian
Autogenerated documentation files
1a5438e
@hoseinmirian
Apply Milo's comments
45f9998
@hoseinmirian
Complete test
c8719ac
@hoseinmirian
Delete docs
04f28f5
@hoseinmirian
Update doc
03310a4
@hoseinmirian
Autogenerated documentation files
7efecfc
@hoseinmirian
Update EditProfile
3fe90f7
@hoseinmirian
fix github test
b53ca24
@hoseinmirian
Add max-width to restrict the increasment of width due to multiple au…
66a7de4 
…tocomplete items
@hoseinmirian
Autogenerated documentation files
3f9db3f
@hoseinmirian
Try fixing the responsiveness issue
045e89a
@hoseinmirian
Autogenerated documentation files
ececf6c
@hoseinmirian
Apply latest Milo's comments
10a6e14
@hoseinmirian
Merge branch 'Hossein-link-userorganisation-#1098' of https://github.…
dd618d2 
…com/FAIRsharing/fairsharing.github.io into Hossein-link-userorganisation-#1098
@knirirr
Changed size of organisations table on private profile.
df82a14
@knirirr
Viewing table for organisations added, put in private profile.
6d4c070
@knirirr
Attempted fix for 'v-slot' directive doesn't support any modifier.
2d85b08
@knirirr
v-slot still a problem.
3c6a7a9
@knirirr
Modified .eslintrc.js due to Codacy complaints.
ceb49ae
@knirirr
Trying to disable a specific line rather than modify .eslintrc.js.
090692d
@knirirr knirirr changed the base branch from dev to Hossein-link-userorganisation-#1098 July 26, 2021 13:15
@hoseinmirian
Copy link
Contributor

hoseinmirian commented Jul 26, 2021 •
edited

@knirirr would you please first my updated branch due to I already tried to cover all these issues in that branch before I review your branch, tnx,

#1153

@knirirr
Copy link
Contributor Author

knirirr commented Jul 26, 2021

@knirirr would you please first my updated branch due to I already tried to cover all these issues in that branch before I review your branch, tnx,

Unfortunately, they are not covered. Thus, I have written this PR to indicate what needs doing, rather than post more screenshots.

@hoseinmirian
Copy link
Contributor

@knirirr

I did some improvement and a special branch for your current branch.. please check and then either by approving or rejecting it, I ll approve yours to mine. tnx
#1180

@knirirr knirirr changed the base branch from Hossein-link-userorganisation-#1098 to dev July 27, 2021 08:23
@knirirr knirirr mentioned this pull request Jul 27, 2021
Closed
@knirirr knirirr merged commit efe6752 into dev Jul 27, 2021
@knirirr knirirr deleted the modify_viewing_tables_for_organisations branch July 27, 2021 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hoseinmirian hoseinmirian hoseinmirian approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@knirirr @hoseinmirian