Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

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

Snippets Groups Projects

f4780918

Commit f4780918 authored 3 years ago by Timm Fitschen Committed by Florian Spreckelsen 3 years ago

Downloads
- Patches
- Plain Diff

ENH: Merge JS files during make

parent 5a2abfd4

No related branches found

No related tags found

3 merge requests!36merge f-boot-tour to dev,!31remove xs,!24add merge_js.sh script

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Makefile 13 additions, 9 deletions

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

build.properties.d/00_default.properties
misc/merge_js.sh 70 additions, 0 deletions

misc/merge_js.sh
src/core/js/footer.js 0 additions, 60 deletions

src/core/js/footer.js
src/core/js/webcaosdb.js 7 additions, 1 deletion

src/core/js/webcaosdb.js
src/core/webcaosdb.xsl 3 additions, 0 deletions

src/core/webcaosdb.xsl
src/core/xsl/main.xsl 1 addition, 186 deletions

src/core/xsl/main.xsl
src/core/xsl/welcome.xsl 1 addition, 1 deletion

src/core/xsl/welcome.xsl
test/core/index.html 2 additions, 60 deletions

test/core/index.html
test/core/js/modules/welcome.xsl.js 2 additions, 2 deletions

test/core/js/modules/welcome.xsl.js

with 144 additions and 319 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