Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Stud.IP
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

024421a9

Commit 024421a9 authored 2 years ago by Jan-Hendrik Willms

Downloads
- Patches
- Plain Diff

load jquery.qrcode via npm and rework integration into stud.ip

Closes #993

Merge request studip/studip!571

parent c6893fd3

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/resources/resource.php 1 addition, 1 deletion

app/controllers/resources/resource.php
app/controllers/resources/room_planning.php 1 addition, 1 deletion

app/controllers/resources/room_planning.php
package-lock.json 13 additions, 0 deletions

package-lock.json
package.json 1 addition, 0 deletions

package.json
resources/assets/javascripts/bootstrap/qr_code.js 1 addition, 41 deletions

resources/assets/javascripts/bootstrap/qr_code.js
resources/assets/javascripts/jquery-bundle.js 1 addition, 0 deletions

resources/assets/javascripts/jquery-bundle.js
resources/assets/javascripts/lib/qr_code.js 7 additions, 11 deletions

resources/assets/javascripts/lib/qr_code.js
resources/assets/stylesheets/scss/qrcode.scss 3 additions, 1 deletion

resources/assets/stylesheets/scss/qrcode.scss
resources/assets/stylesheets/studip.less 0 additions, 1 deletion

resources/assets/stylesheets/studip.less
resources/assets/stylesheets/studip.scss 1 addition, 0 deletions

resources/assets/stylesheets/studip.scss

with 29 additions and 56 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