Commit graph

569 commits

Author SHA1 Message Date
Matan Bar Yosef 163a711f0f - Create Class reference - fixed 2015-06-27 14:52:49 +03:00
Matan Bar Yosef 191924a732 - work in progress (creating course - reference) 2015-06-27 14:36:20 +03:00
Matan Bar Yosef eb1240f3c4 - Main menu nav - My Projects reference fixed to user projects
- Main menu nav - click on Courses -> Campuses -> Courses -> Projects (all class users)

- API function getProjectsByUser - Added
2015-06-27 14:20:21 +03:00
Matan Bar Yosef b630f0d696 - Main menu nav - Project reference fixed 2015-06-27 12:58:04 +03:00
Matan Bar Yosef c64b865f3d - Fixed reference in thisProject/:projectId 2015-06-27 12:48:11 +03:00
Matan Bar Yosef 380228947b -Bugs fixing
- Create class bug - fixed

- Work in progress (classes, projects) - need to check API
2015-06-27 12:45:44 +03:00
Matan Bar Yosef 18ca8df227 - campuses fixed
- Work in progress (classes, projects)
2015-06-26 21:56:41 +03:00
Matan Bar Yosef 91ac400452 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
# Conflicts:
#	templates/js/services/apiService.js
2015-06-26 16:58:55 +03:00
Matan Bar Yosef 5ec2ed20bd Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
# Conflicts:
#	templates/js/services/apiService.js
2015-06-26 16:55:26 +03:00
Matan Bar Yosef f3226e0896 - work in progress 2015-06-26 16:49:46 +03:00
Sagi Dayan 1d5cbb18cd Profile - Edit And Delete Buttons Visible Only If Permitted 2015-06-26 15:34:07 +03:00
Sagi Dayan cc3d65037d First Step Of Independed Profile. ID oriented. Needs Classes List 2015-06-26 15:13:26 +03:00
Sagi Dayan 1c32ed9e56 API: Added /api/campuses/getCampusesByUserID/ 2015-06-26 15:07:26 +03:00
Sagi Dayan 43de4f9b80 apiServices: Added GetUserById & get GetCampusByUserId 2015-06-26 15:06:59 +03:00
Sagi Dayan 0e37e51b4d API: Added Get User By ID 2015-06-26 14:55:08 +03:00
Sagi Dayan 0ccc8ba1dd API Hot Fix. fixed syntax Error 2015-06-26 14:54:16 +03:00
Sagi Dayan 9ddc035443 apiServices - Added token Param in to getCamusesByUser 2015-06-26 14:53:40 +03:00
Sagi Dayan 42210f73d5 API Docs - index UI 2015-06-26 14:52:33 +03:00
Sagi Dayan 9d49ba5f0a #72 - cleand up main menu & added ID to routes 2015-06-26 14:08:23 +03:00
Sagi Dayan 2f870ba050 #68 Added Link & RadioButtons components to Task generator 2015-06-25 22:40:26 +03:00
Sagi Dayan 2a55d7f898 API Doc Fix 2015-06-25 20:45:43 +03:00
Sagi Dayan e135ee020a Changed settings into profile. + in controller 2015-06-25 00:10:08 +03:00
Sagi Dayan e3fe428900 API: getUserByToken returs user id now 2015-06-25 00:04:04 +03:00
Sagi Dayan b3e5ce4716 Merge pull request #67 from sagidayan/UI
- Create course api -fixed
2015-06-24 22:47:40 +03:00
Sagi Dayan 73eef42871 Merge pull request #73 from sagidayan/API_Dev
Api dev
2015-06-24 22:43:52 +03:00
Matan Bar Yosef 559d235bc9 - thisProject Added
- Tasks tab system - Added
2015-06-24 22:43:02 +03:00
Aran Zaiger 18ad25f18d MERGE WARNING!!
deleted CourseAPI_test from my rep. i think this file doesnt exist in @etyemy rep aswell
2015-06-24 21:57:31 +03:00
Aran Zaiger 695d052cf0 change in function name 2015-06-24 21:54:02 +03:00
Matan Bar Yosef e2bd575ca7 - Campuses -> Courses -> Projects (Addition)
-* waiting for merge to get API from server
2015-06-24 21:35:55 +03:00
Matan Bar Yosef 0cce80ed98 - Campuses -> Courses -> Projects
-* waiting for merge to get API from server
2015-06-24 21:35:21 +03:00
Aran Zaiger 4b89432520 added: - memberId list property 2015-06-24 20:23:50 +03:00
Aran Zaiger 7c5115869c change delete campus name 2015-06-24 20:23:22 +03:00
Aran Zaiger af98c69723 added getProjectsByUser and joinProject function 2015-06-24 20:09:13 +03:00
Aran Zaiger 0ae7101e30 added projects_id_list propery 2015-06-24 20:01:55 +03:00
Aran Zaiger b7b44df479 added getCoursesByUser function, some added parameters to Messages, and now adding a student to a created course 2015-06-24 20:00:30 +03:00
Aran Zaiger 330304cd4c added getCampusesByUser function 2015-06-24 19:57:40 +03:00
Matan Bar Yosef b19b60b58b Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-06-24 19:11:44 +03:00
Sagi Dayan a942f7e486 New Task UI Tweak 2015-06-24 17:27:20 +03:00
Matan Bar Yosef 1b3aaea1ff Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-06-24 14:26:13 +03:00
Matan Bar Yosef ba5939c437 - Create course api -fixed 2015-06-24 14:01:08 +03:00
Sagi Dayan 049c36c916 Fixed HRef 2015-06-24 13:42:32 +03:00
Sagi Dayan 5f53e3ff85 Fixing Register POPUP 2015-06-24 13:28:27 +03:00
Sagi Dayan 522a71d9c4 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-06-24 13:18:09 +03:00
Sagi Dayan ad45ee787d Merge pull request #66 from sagidayan/UI
- add choose project from dashboard
2015-06-24 13:17:58 +03:00
Sagi Dayan 23d287e59a POST -> PUT in update user 2015-06-24 13:16:19 +03:00
Matan Bar Yosef 38ae45aa95 - add choose project from dashboard 2015-06-24 13:13:58 +03:00
Sagi Dayan d32b09b712 Fixed Token Issue in Register Controller 2015-06-24 13:07:17 +03:00
Sagi Dayan f26472ba5b #64 #35 New Task Tweaks 2015-06-24 12:52:44 +03:00
etyemyer c9c54dd3f0 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into QA 2015-06-24 12:44:34 +03:00
etyemyer 1f74a88db1 Updated tests and added deleted tests 2015-06-24 12:42:55 +03:00