Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

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

Snippets Groups Projects

34dbafc9

Commit 34dbafc9 authored 3 years ago by Florian Spreckelsen

Downloads
- Plain Diff

Merge branch 'f-qrcode' into 'dev'

qrcode

See merge request !43

parents fb0b86d2 d06cca62

No related branches found

No related tags found

2 merge requests!47Release v0.4.0,!43qrcode

Pipeline #14927 passed 3 years ago

Stage: setup

Stage: linting

Stage: test

Stage: deploy

Changes 10
Pipelines 17

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 22 additions, 1 deletion

CHANGELOG.md
Makefile 4 additions, 1 deletion

Makefile
build.properties.d/00_default.properties 3 additions, 0 deletions

build.properties.d/00_default.properties
libs/qrcode-1.4.4.zip 0 additions, 0 deletions

libs/qrcode-1.4.4.zip
src/core/js/ext_map.js 1 addition, 1 deletion

src/core/js/ext_map.js
src/core/js/ext_qrcode.js 201 additions, 0 deletions

src/core/js/ext_qrcode.js
src/core/js/fileupload.js 2 additions, 2 deletions

src/core/js/fileupload.js
src/core/js/webcaosdb.js 1 addition, 14 deletions

src/core/js/webcaosdb.js
test/core/js/modules/ext_qrcode.js.js 101 additions, 0 deletions

test/core/js/modules/ext_qrcode.js.js
test/core/js/modules/webcaosdb.js.js 1 addition, 23 deletions

test/core/js/modules/webcaosdb.js.js

with 336 additions and 42 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