Solved merge conflict, duplicate getter
Showing
- .htaccess 0 additions, 7 deletions.htaccess
- controller/edit-profile.php 80 additions, 0 deletionscontroller/edit-profile.php
- controller/orderController.php 66 additions, 0 deletionscontroller/orderController.php
- controller/profile.php 14 additions, 3 deletionscontroller/profile.php
- controller/register.php 57 additions, 0 deletionscontroller/register.php
- controller/transactionController.php 2 additions, 2 deletionscontroller/transactionController.php
- css/dashboard.css 10 additions, 4 deletionscss/dashboard.css
- css/edit-profile.css 57 additions, 8 deletionscss/edit-profile.css
- css/history.css 3 additions, 1 deletioncss/history.css
- css/order.css 151 additions, 0 deletionscss/order.css
- css/register.css 2 additions, 1 deletioncss/register.css
- data/projekers.sql 4 additions, 4 deletionsdata/projekers.sql
- img/gengar.png 0 additions, 0 deletionsimg/gengar.png
- js/edit-profile.js 30 additions, 4 deletionsjs/edit-profile.js
- js/order.js 52 additions, 0 deletionsjs/order.js
- js/profile.js 27 additions, 1 deletionjs/profile.js
- js/register.js 105 additions, 0 deletionsjs/register.js
- model/order.php 8 additions, 0 deletionsmodel/order.php
- model/user.php 72 additions, 10 deletionsmodel/user.php
- view/dashboard.php 18 additions, 23 deletionsview/dashboard.php
Please register or sign in to comment