-
- Downloads
Merge remote-tracking branch 'origin/master'
# Conflicts: # .gitignore # studentview/.idea/workspace.xml # studentview/assets/js/newProject.js # studentview/pages/newproject.php
Showing
- .gitignore 16 additions, 1 deletion.gitignore
- .idea/workspace.xml 726 additions, 168 deletions.idea/workspace.xml
- dbschema/createDummyUser.sql 34 additions, 0 deletionsdbschema/createDummyUser.sql
- dbschema/fltrail.sql 0 additions, 4 deletionsdbschema/fltrail.sql
- studentview/.idea/.name 1 addition, 0 deletionsstudentview/.idea/.name
- studentview/.idea/misc.xml 36 additions, 1 deletionstudentview/.idea/misc.xml
- studentview/.idea/modules.xml 1 addition, 1 deletionstudentview/.idea/modules.xml
- studentview/.idea/workspace.xml 496 additions, 788 deletionsstudentview/.idea/workspace.xml
- studentview/assets/css/Sidebar-Menu1.css 2 additions, 2 deletionsstudentview/assets/css/Sidebar-Menu1.css
- studentview/assets/css/projects.css 27 additions, 0 deletionsstudentview/assets/css/projects.css
- studentview/assets/css/styles.css 285 additions, 1 deletionstudentview/assets/css/styles.css
- studentview/assets/js/GETfile.js 0 additions, 29 deletionsstudentview/assets/js/GETfile.js
- studentview/assets/js/config.js 3 additions, 0 deletionsstudentview/assets/js/config.js
- studentview/assets/js/createPreferences.js 10 additions, 8 deletionsstudentview/assets/js/createPreferences.js
- studentview/assets/js/deleteProject.js 56 additions, 0 deletionsstudentview/assets/js/deleteProject.js
- studentview/assets/js/getProjects.js 31 additions, 0 deletionsstudentview/assets/js/getProjects.js
- studentview/assets/js/myGroupsInit.js 78 additions, 82 deletionsstudentview/assets/js/myGroupsInit.js
- studentview/assets/js/newProject.js 101 additions, 89 deletionsstudentview/assets/js/newProject.js
- studentview/assets/js/overview.js 54 additions, 26 deletionsstudentview/assets/js/overview.js
- studentview/assets/js/showProjects.js 0 additions, 0 deletionsstudentview/assets/js/showProjects.js
Loading
Please register or sign in to comment