Merge branch 'feature/pages_improve' into 'master'
Feature/pages improve See merge request !4
Showing
- src/main/java/com/s3ai/controllers/cinemas/CinemaFill.java 1 addition, 1 deletionsrc/main/java/com/s3ai/controllers/cinemas/CinemaFill.java
- src/main/java/com/s3ai/controllers/tickets/TicketsEdit.java 15 additions, 0 deletionssrc/main/java/com/s3ai/controllers/tickets/TicketsEdit.java
- src/main/java/com/s3ai/controllers/users/UsersEdit.java 15 additions, 0 deletionssrc/main/java/com/s3ai/controllers/users/UsersEdit.java
- src/main/java/com/s3ai/entities/Ticket.java 4 additions, 0 deletionssrc/main/java/com/s3ai/entities/Ticket.java
- src/main/webapp/pages/index.jsp 70 additions, 60 deletionssrc/main/webapp/pages/index.jsp
- src/main/webapp/pages/tickets/list.jsp 8 additions, 8 deletionssrc/main/webapp/pages/tickets/list.jsp
- src/main/webapp/pages/users/edit.jsp 1 addition, 1 deletionsrc/main/webapp/pages/users/edit.jsp
- src/main/webapp/pages/users/list.jsp 2 additions, 2 deletionssrc/main/webapp/pages/users/list.jsp
- src/main/webapp/static/coffee/tickets.coffee 35 additions, 0 deletionssrc/main/webapp/static/coffee/tickets.coffee
- src/main/webapp/static/css/index.css 1 addition, 1 deletionsrc/main/webapp/static/css/index.css
- src/main/webapp/static/css/index.css.map 1 addition, 1 deletionsrc/main/webapp/static/css/index.css.map
- src/main/webapp/static/js/cinemas.js 6 additions, 1 deletionsrc/main/webapp/static/js/cinemas.js
- src/main/webapp/static/js/tickets.js 53 additions, 0 deletionssrc/main/webapp/static/js/tickets.js
- src/main/webapp/static/scss/index.scss 6 additions, 3 deletionssrc/main/webapp/static/scss/index.scss
Loading
Please register or sign in to comment