Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

s4s
- Activity
- Members

Snippets Groups Projects

3e2831a1

Commit 3e2831a1 authored 7 years ago by Timo Jeremy Pinzauti

Downloads
- Plain Diff

Merge branch 'master' of https://git.fslab.de/tpinza2s/s4s

parents 520319e9 f3ed530a

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.idea/workspace.xml 191 additions, 184 deletions

.idea/workspace.xml
shopInShop.iml 3 additions, 0 deletions

shopInShop.iml
src/main/java/org/s4s/gui/views/SucheView.java 22 additions, 24 deletions

src/main/java/org/s4s/gui/views/SucheView.java
src/main/java/org/s4s/gui/views/WelcomeView.java 125 additions, 1 deletion

src/main/java/org/s4s/gui/views/WelcomeView.java
src/main/java/org/s4s/modell/dto/ShopwithProducts.java 8 additions, 1 deletion

src/main/java/org/s4s/modell/dto/ShopwithProducts.java
src/main/java/org/s4s/process/control/LandingPageControl.java 32 additions, 40 deletions

...main/java/org/s4s/process/control/LandingPageControl.java
src/main/webapp/VAADIN/themes/mytheme/mytheme.scss 18 additions, 1 deletion

src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
src/main/webapp/VAADIN/themes/mytheme/styles.css 20 additions, 0 deletions

src/main/webapp/VAADIN/themes/mytheme/styles.css

with 419 additions and 251 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