Skip to content
This repository has been archived by the owner on Jun 15, 2024. It is now read-only.

Release v2.0.0 #77

Draft
wants to merge 49 commits into
base: master
Choose a base branch
from
Draft

Release v2.0.0 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
326980a
Functional improvements
CVilla17 Sep 23, 2022
f75d461
removing public option
CVilla17 Sep 27, 2022
1a6c6c5
Upgrade cript version to 0.5.0
rjmello Sep 29, 2022
fb88a50
Modify how File and Data objects are associated
rjmello Sep 29, 2022
5b09a65
Upload File objects first
rjmello Sep 29, 2022
c79356a
Merge pull request #34 from C-Accel-CRIPT/sdk-update
nh916 Sep 29, 2022
3151614
Attempting to solve merge conflicts
CVilla17 Sep 30, 2022
4d53301
Merge pull request #33 from C-Accel-CRIPT/Carlos-dev
rjmello Oct 7, 2022
7dec68b
Merge branch 'master' into fix_develop_branch_and_master
nh916 Nov 15, 2022
8c569f8
bumping version to 0.6.3
nh916 Nov 15, 2022
8e252aa
removed requirements_dev.txt
nh916 Nov 15, 2022
748f4cd
updated packages on requirements.txt
nh916 Nov 15, 2022
0714e0c
removing docs from master, so docs can only live in the docs branch
nh916 Nov 15, 2022
82dc9ff
removed requirements_docs.txt from master branch because everything f…
nh916 Nov 15, 2022
469e543
added pandas to dependencies and showing that we are using python 3.9+
nh916 Nov 15, 2022
cd08e2c
Merge pull request #45 from C-Accel-CRIPT/fix_develop_branch_and_master
brili Nov 16, 2022
fa3b1a2
Merge pull request #49 from C-Accel-CRIPT/readme_badges
nh916 Dec 1, 2022
be77009
Merge pull request #48 from C-Accel-CRIPT/bump_version
nh916 Dec 1, 2022
e4f797c
Merge pull request #47 from C-Accel-CRIPT/update_requirements
nh916 Dec 1, 2022
7fb5e73
Fix mac issues
Dec 15, 2022
1a7a68b
Merge pull request #53 from DBoraD/fix-mac_build
brili Dec 19, 2022
3a084f9
updated workflow (#54)
nh916 Dec 23, 2022
6991cfe
updated importing tkinter (#55)
nh916 Dec 24, 2022
c939411
Feature property method (#57)
CVilla17 Jan 3, 2023
15c43f2
Add material characteristics (#52)
CVilla17 Jan 3, 2023
4a41348
Version bump 1.0.0 (#59)
nh916 Jan 4, 2023
84bc585
fixed artifact name (#61)
nh916 Jan 4, 2023
96c6d30
update requirements.txt and bump Excel Uploader version (#67)
nh916 Jan 17, 2023
5922cc0
Resolve merge conflict between master and develop branch (#69)
nh916 Jan 18, 2023
8d6a74c
Changes to allow for smooth file uploads (#75)
CVilla17 Feb 3, 2023
5df4c49
version bump (#76)
nh916 Feb 6, 2023
b05bc7d
Fix merge conflict (#78)
nh916 Feb 14, 2023
e77b5f7
Merge branch 'develop' of github.com:C-Accel-CRIPT/cript-excel-upload…
CVilla17 Feb 14, 2023
d42cee5
Changed values in parse.py to use correct cell key
CVilla17 Feb 14, 2023
1dbb6fc
Fix cell key bug (#79)
CVilla17 Feb 14, 2023
2dcca1e
Fixing merge conflict (#80)
nh916 Feb 16, 2023
20bfb9e
Merge branch 'develop' of github.com:C-Accel-CRIPT/cript-excel-upload…
CVilla17 Mar 13, 2023
12c855b
Can add existing material nodes from other projects
CVilla17 Mar 20, 2023
0231334
got rid of a print statement
CVilla17 Mar 20, 2023
3534d39
Experiment and inventory update
CVilla17 Mar 20, 2023
9e92c51
Merge pull request #82 from C-Accel-CRIPT/experiment_and_inventory
brili Mar 23, 2023
4ad2670
Merge pull request #81 from C-Accel-CRIPT/use_existing_mat_nodes
brili Mar 23, 2023
0595728
Made changes to updates in response to code review comments
CVilla17 Mar 27, 2023
ac1589a
Made changes to updates in response to code review comments (#85)
CVilla17 Mar 29, 2023
2ba972c
Changed sheet parameters to include new sheets, and partially impleme…
CVilla17 May 6, 2023
1475dcc
Rough specs for new functions
CVilla17 May 6, 2023
1cc443f
expanding data model for computat
CVilla17 May 14, 2023
b6a6fac
Merge branch 'develop' into feature_clean_updates
CVilla17 May 14, 2023
ae4bddc
Merge pull request #86 from C-Accel-CRIPT/feature_clean_updates
CVilla17 May 25, 2023
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
Loading