Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-webui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-webui
Commits
41274920
Commit
41274920
authored
3 years ago
by
Alexander Schlemmer
Browse files
Options
Downloads
Plain Diff
Merge branch 'dev' into f-fix-get-parents
parents
340a9ed5
aa280573
Branches
f-fix-get-parents
No related tags found
1 merge request
!33
Draft: F fix get parents
Pipeline
#9311
passed
3 years ago
Stage: linting
Stage: test
Stage: deploy
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGELOG.md
+2
-2
2 additions, 2 deletions
CHANGELOG.md
DEPENDENCIES.md
+1
-1
1 addition, 1 deletion
DEPENDENCIES.md
src/core/css/tour.css
+4
-0
4 additions, 0 deletions
src/core/css/tour.css
src/core/js/fileupload.js
+0
-0
0 additions, 0 deletions
src/core/js/fileupload.js
with
7 additions
and
3 deletions
CHANGELOG.md
+
2
−
2
View file @
41274920
...
...
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on
[
Keep a Changelog
](
https://keepachangelog.com/en/1.0.0/
)
,
and this project adheres to
[
Semantic Versioning
](
https://semver.org/spec/v2.0.0.html
)
.
## [
Unreleased]
## [
v0.4.0-rc1] - 2021-06-16
### Added (for new features, dependecies etc.)
...
...
@@ -50,7 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Security (in case of vulnerabilities)
## [v0.3.1]- 2021-06-15
## [v0.3.1]
- 2021-06-15
This is the last Bootstrap-3 compatible release.
...
...
This diff is collapsed.
Click to expand it.
DEPENDENCIES.md
+
1
−
1
View file @
41274920
*
CaosDB Server == 0.
3
*
CaosDB Server == 0.
4
*
Make 4.2.0
This diff is collapsed.
Click to expand it.
src/core/css/tour.css
+
4
−
0
View file @
41274920
...
...
@@ -251,6 +251,10 @@ div.caosdb-v-tour-toc-show {
border
:
none
;
}
.caosdb-v-tour-toc-header
{
margin-left
:
0.75rem
;
}
/* For elements in popovers which are not for clicking but only illustrative. */
.caosdb-v-tour-unclickable
{
cursor
:
text
!important
;
...
...
This diff is collapsed.
Click to expand it.
src/
ext
/js/fileupload.js
→
src/
core
/js/fileupload.js
+
0
−
0
View file @
41274920
File moved
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment