Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

caosdb-webui
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

7dc02d0c

Commit 7dc02d0c authored 3 years ago by Florian Spreckelsen

Downloads
- Plain Diff

Merge branch 'dev' into f-ckeditor-update-and-plugins

parents 1ab5cede 7caa6f7a

No related branches found

No related tags found

2 merge requests!68DOC: update CHANGELOG,!66DEP: Update ckeditor dependencies

Pipeline #19459 canceled 3 years ago

Stage: linting

Stage: test

Stage: deploy

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 5 additions, 0 deletions

CHANGELOG.md
misc/entity_state_test_data.py 12 additions, 2 deletions

misc/entity_state_test_data.py
src/core/css/webcaosdb.css 12 additions, 0 deletions

src/core/css/webcaosdb.css
src/core/js/caosdb.js 18 additions, 23 deletions

src/core/js/caosdb.js
src/core/js/form_elements.js 2 additions, 9 deletions

src/core/js/form_elements.js
src/core/xsl/entity.xsl 7 additions, 1 deletion

src/core/xsl/entity.xsl
test/core/js/modules/caosdb.js.js 68 additions, 2 deletions

test/core/js/modules/caosdb.js.js
test/core/js/modules/entity.xsl.js 6 additions, 2 deletions

test/core/js/modules/entity.xsl.js
test/core/xml/test_case_list_of_myrecordtype.xml 1 addition, 0 deletions

test/core/xml/test_case_list_of_myrecordtype.xml

with 131 additions and 39 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment