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

Core 4458 update terms page #787

Merged
merged 35 commits into from
Feb 7, 2023
Merged

Core 4458 update terms page #787

merged 35 commits into from
Feb 7, 2023

Conversation

ekachxaidze98
Copy link
Contributor

@ekachxaidze98 ekachxaidze98 commented Feb 7, 2023 •
edited by jira bot
Loading

mcancellieri and others added 28 commits December 8, 2022 10:56
@mcancellieri
Update faq
096b7a4
@ekachxaidze98
add linking (#754)
b1c44f5
@ekachxaidze98
Merge branch 'content' of https://github.com/oacore/about into content
3e719b5
@ekachxaidze98
Merge branch 'content' of https://github.com/oacore/about into content
6737155
@ekachxaidze98
Merge branch 'content' of https://github.com/oacore/about into content
02d4484
@ekachxaidze98
Merge branch 'content' of https://github.com/oacore/about into content
b4a2e4d
@ekachxaidze98
fix missing buttons issue
f373602
@ekachxaidze98
Merge branch 'content' of https://github.com/oacore/about into content
5a8b379
@ekachxaidze98
Merge branch 'content' of https://github.com/oacore/about into content
d4f3b6d
@ekachxaidze98 @mcancellieri
feat: CORE-4429 open pdf in new tab
5ccd85a
@ekachxaidze98 @mcancellieri
CORE-4429 babel config
e6beb9e
@ekachxaidze98 @mcancellieri
update dependencies
e7e6d2d
@valeriibudko
[CORE-4431] docs-membership (#773)
01a28ea
@ekachxaidze98
update dataset text
9ead4f7
@ekachxaidze98
Merge branch 'content' of https://github.com/oacore/about into content
f116b0d
@ekachxaidze98
update dataset text
a853ac6
@ekachxaidze98
Merge branch 'content' of https://github.com/oacore/about into content
a92ff91
@ekachxaidze98
Merge branch 'master' of https://github.com/oacore/about
cba9f2f
@valeriibudko
Merge remote-tracking branch 'origin/content' into content
ba85578 
# Conflicts:
#	package-lock.json
@ekachxaidze98
Merge branch 'content' of https://github.com/oacore/about into content
cab7c0e
@ekachxaidze98
Merge branch 'master' of https://github.com/oacore/about
5dcd31a
@ekachxaidze98
CORE-4458: update terms page
752c511
@ekachxaidze98
CORE update api pdf file
0b2b0f4
@ekachxaidze98
Merge branch 'content' of https://github.com/oacore/about into content
c7a1ecd
@ekachxaidze98
temporary page
bac1c10
@ekachxaidze98
CORE-4458 update terms page (#784)
e0929f7 
* update dataset text

* CORE-4458: update terms page

* temporary page
@ekachxaidze98
Merge branch 'content' of https://github.com/oacore/about into content
f55a7a6
@ekachxaidze98
CORE-4458 update terms
f98aa7b
@vercel
Copy link

vercel bot commented Feb 7, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated
about ❌ Failed (Inspect) Feb 7, 2023 at 6:49PM (UTC)

@valeriibudko
Merge remote-tracking branch 'origin/content' into content
680ffcb 
# Conflicts:
#	babel.config.js
#	package-lock.json
@valeriibudko
[bugfix] Config babel/runtime
4a5dc0c
@valeriibudko
Merge branch 'content' into CORE-4458-update-terms-page
1be4aab 
# Conflicts:
#	data/terms.yml
#	templates/term/index.jsx
#	templates/term/styles.module.scss
@valeriibudko valeriibudko merged commit 9ef461f into content Feb 7, 2023
@valeriibudko valeriibudko deleted the CORE-4458-update-terms-page branch February 7, 2023 20:24
valeriibudko added a commit that referenced this pull request Feb 7, 2023
@valeriibudko @ekachxaidze98 @mcancellieri
Core 4458 update terms page (#787) (#791)
114013c 
* Update faq

* add linking (#754)

* fix missing buttons issue

* feat: CORE-4429 open pdf in new tab

* CORE-4429 babel config

* update dependencies

* [CORE-4431] docs-membership (#773)

* update dataset text

* update dataset text

* CORE-4458: update terms page

* CORE update api pdf file

* temporary page

* CORE-4458 update terms page (#784)

* update dataset text

* CORE-4458: update terms page

* temporary page

* CORE-4458 update terms

* update terms page

* [bugfix] Config babel/runtime

* [CORE-4458] Fix conflict

* [CORE-4458] Fix DOM conflict

---------

Co-authored-by: ekachxaidze98 <65679299+ekachxaidze98@users.noreply.github.com>
Co-authored-by: mcancellieri <mcancellieri@users.noreply.github.com>
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.
3 participants
@ekachxaidze98 @valeriibudko @mcancellieri