fix merge conflicts
Description
Description
Details
Details
- Committed
saduruss May 5 2023, 11:02 - Pushed
gitlab-richart May 5 2023, 11:02 - Parents
- rAKA0accf93c7be2: correction in default input
rAKAf9de4c21dd63: Merge branch 'features/adding-shape-recomputation-capability-python' into… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| f9de4c21dd63 | anciaux | Merge branch 'features/adding-shape-recomputation-capability-python' into… | May 5 2023 | |||
| 3983eb743993 | anciaux | Merge branch 'bugfixes/60-hybrid-phase-field-formulation-unstable-in-dynamics'… | May 4 2023 | |||
| ea41a8601b8b | saduruss | code formatting | May 4 2023 | |||
| cadd5fc53f8b | saduruss | add phase-field isotropic option | May 3 2023 | |||
| 5444501584d0 | richart | Merge branch 'bugfixes/macos-compilation-documentation' into 'master' | May 3 2023 | |||
| f54488dde6c3 | hnat_lesiv | fixed type and added general MUMPS setup | May 1 2023 | |||
| 09f28cee1a33 | hnat_lesiv | Made more generic as per Emil's suggestions | May 1 2023 | |||
| 3c0a98d57357 | hnat_lesiv | Added compilation instructions for Mac OS X in doc | Apr 30 2023 | |||
| 7dc9436514c3 | richart | Merge branch 'bugfixes/57-print-statement-in-fragment-manager' into 'master' | Apr 24 2023 | |||
| 3d0478aea235 | richart | Cleaning debug messages | Apr 21 2023 | |||
| 6cb1e0229070 | richart | Adding some functions in the python interface | Apr 17 2023 | |||
| 508269a11768 | richart | Update .gitlab-ci.yml | Apr 12 2023 | |||
| 372d3e4be94e | richart | Update steering-committee-meeting.md | Apr 12 2023 | |||
| ce7833aecb83 | richart | Update steering-committee-meeting.md | Apr 12 2023 | |||
| d58807eb2a4f | richart | Update steering-committee-meeting.md | Apr 12 2023 | |||
| 240da8edacb7 | richart | Merge branch 'features/issue-template' into 'master' | Apr 11 2023 | |||
| a8660d48ad0c | anciaux | adding a template for service desk | Apr 11 2023 | |||
| bbc031e574bd | gallyamov | Merge branch 'features/custom_cohesive_materials_python' into 'master' | Apr 4 2023 | |||
| d723f97de42a | gallyamov | Warning correction and a python example | Apr 4 2023 | |||
| 275453e1154b | gallyamov | Correcting bad_cast | Apr 4 2023 | |||
| 05201b9e0176 | richart/gallyamov | Code quality correction | Apr 4 2023 | |||
| 3b4f27fa5ded | richart/gallyamov | Bug fix with the bad_cast | Apr 4 2023 | |||
| 6e590d38f9c1 | gallyamov | Modifications to py_material for custom materials | Apr 4 2023 | |||
| ef83c6a1fdd0 | richart | Removing broken pages (doc is on readthedoc any way) | Mar 31 2023 | |||
| 4fd15fdf6bc2 | richart | Merge branch 'releases/5.0.0' into 'master' | Mar 31 2023 | |||
| 782eefab8ea8 | richart | Releasing version 5.0.0 | Mar 31 2023 |