-
- Downloads
Merge branch 'master' of https://github.com/juliandehne/fltrail
# Conflicts: # .idea/workspace.xml # studentview/.idea/workspace.xml # studentview/assets/js/Projekte.js # studentview/assets/js/myGroupsInit.js # studentview/assets/js/newProject.js # studentview/assets/js/overview.js # studentview/database/getProjects.php # studentview/pages/Projekte.html # studentview/pages/projects.php
No related branches found
No related tags found
Showing
- .idea/workspace.xml 946 additions, 0 deletions.idea/workspace.xml
- studentview/.idea/workspace.xml 202 additions, 234 deletionsstudentview/.idea/workspace.xml
- studentview/assets/js/Projekte.js 134 additions, 6 deletionsstudentview/assets/js/Projekte.js
- studentview/assets/js/myGroupsInit.js 8 additions, 11 deletionsstudentview/assets/js/myGroupsInit.js
- studentview/assets/js/newProject.js 42 additions, 46 deletionsstudentview/assets/js/newProject.js
- studentview/assets/js/overview.js 20 additions, 65 deletionsstudentview/assets/js/overview.js
- studentview/database/getProjects.php 2 additions, 9 deletionsstudentview/database/getProjects.php
- studentview/database/putTagsAndPW.php 35 additions, 0 deletionsstudentview/database/putTagsAndPW.php
- studentview/pages/MeineGruppen.php 98 additions, 0 deletionsstudentview/pages/MeineGruppen.php
- studentview/pages/Projekte.html 140 additions, 0 deletionsstudentview/pages/Projekte.html
- studentview/pages/Projekte.php 128 additions, 0 deletionsstudentview/pages/Projekte.php
- studentview/pages/getProjects.php 25 additions, 0 deletionsstudentview/pages/getProjects.php
- studentview/pages/neuesProjekt.php 80 additions, 0 deletionsstudentview/pages/neuesProjekt.php
- studentview/pages/projects.php 41 additions, 36 deletionsstudentview/pages/projects.php
- studentview/register.php 44 additions, 0 deletionsstudentview/register.php
Loading
Please register or sign in to comment