Commit graph

315 commits

Author SHA1 Message Date
7cfe2f527d Hot Fix Stat API 2015-06-29 16:52:25 +03:00
f514686442 Hot Fix Stat API 2015-06-29 16:50:16 +03:00
f465c73c22 Fix Stat API 2015-06-29 16:47:57 +03:00
3db75de9b0 Sorted Project imfo API 2015-06-29 16:38:39 +03:00
75d385a477 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-06-29 14:46:41 +03:00
518c0c36ef Merge pull request #88 from sagidayan/API_Dev
Api dev
2015-06-29 14:46:34 +03:00
710bbb38eb Merge branch 'UI' 2015-06-29 14:46:10 +03:00
2ce04b34d9 Merge branch 'master' into UI
Conflicts:
	templates/js/services/apiService.js
2015-06-29 14:45:37 +03:00
58ee4f4da5 Extended Github API request calls with ID+Secret 2015-06-29 14:41:21 +03:00
Matan Bar Yosef
0cc88bc9b9 - joinCourse - fixed (user can't join twice)
- createCourse - added (work in progress)
2015-06-29 14:41:17 +03:00
2064e19d2b fix big allowing to add user to project/course/campus more then once 2015-06-29 14:28:48 +03:00
f0031dca16 Fix to the GetCoursesByUserId in Profile 2015-06-29 14:25:20 +03:00
edac533f2b AngularJS Service getCoursesByUserID 2015-06-29 14:21:17 +03:00
bd224fb7d8 added project data from github to GET function 2015-06-29 14:10:46 +03:00
5b87b0a4d0 Merge pull request #86 from sagidayan/API_Dev
Api dev
2015-06-29 13:55:01 +03:00
d5465aa5d5 fix 2015-06-29 13:42:06 +03:00
4794771b15 updated task functions 2015-06-29 13:40:11 +03:00
57b08c2ff1 removed campusName in user module 2015-06-29 13:32:01 +03:00
47bcfecb00 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-06-29 13:31:07 +03:00
3ce9ece42f Added Github Connection for fetching repo data 2015-06-29 13:30:59 +03:00
3954855a65 Merge pull request #85 from sagidayan/UI
- create class is working again #2
2015-06-29 13:07:03 +03:00
Matan Bar Yosef
cddc5483ce - create class is working again #2 2015-06-29 13:06:13 +03:00
02a10aba63 Merge pull request #84 from sagidayan/UI
- create class is working again
2015-06-29 13:00:23 +03:00
d77f0c9a1b Merge pull request #83 from sagidayan/API_Dev
small changes
2015-06-29 13:00:03 +03:00
953af4d3f5 small changes 2015-06-29 12:57:37 +03:00
Matan Bar Yosef
2819fd12a2 - create class is working again 2015-06-29 12:57:07 +03:00
ffa767fccd API Hot Fix - Renaming Function 2015-06-28 21:27:01 +03:00
83627788bd Merge branch 'API_Dev' 2015-06-28 21:14:44 +03:00
805b952281 Merge branch 'master' into API_Dev
Conflicts:
	Testing/CoursesAPI_test.py
2015-06-28 21:14:09 +03:00
2a64f940af Merge pull request #80 from sagidayan/UI
- myClasses display -  (python work in progress)
2015-06-28 21:10:49 +03:00
b5ba1fbbb8 added getUsersByCampus/Course/Project functions 2015-06-28 18:08:05 +03:00
9d323c4422 added join campus function 2015-06-28 17:53:37 +03:00
f9190f73d2 function name fix 2015-06-28 17:43:08 +03:00
6452dbd66a fix #79 2015-06-28 17:30:22 +03:00
ec1eacb3cd Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev 2015-06-28 17:18:51 +03:00
93078f4f18 fix #46 - added delete user from project, course, campus 2015-06-28 17:16:36 +03:00
1574b7e19e IMPORTANT: alot of function name changes and new Doc 2015-06-28 16:48:01 +03:00
664fcedca0 added Message routes. create, get and delete function are available.
doc should be updated
2015-06-28 15:48:39 +03:00
e07deaddb2 removed messages from course 2015-06-28 15:47:39 +03:00
Matan Bar Yosef
3486581b8f - myClasses display - (python work in progress)
- layout patterns fixed and adjusted
2015-06-28 15:27:06 +03:00
fe397a2443 Fixed API Syntax Error Causing 500 Fix #74 2015-06-27 17:18:59 +03:00
699be13137 Explorer Layout Fixed + Init() Function that splits to 3 sized array 2015-06-27 17:01:16 +03:00
33c016a43c Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-06-27 15:12:46 +03:00
6417e76761 Merge pull request #78 from sagidayan/UI
- Main Menu Last Commit
2015-06-27 15:12:32 +03:00
Matan Bar Yosef
3e696b86f8 - Main menu nav - Project reference fixed 2015-06-27 15:10:03 +03:00
bfbf4cf355 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-06-27 15:08:23 +03:00
bd9fef0061 Campuses -> Explore in main Menu 2015-06-27 15:08:17 +03:00
2ddbc1719e Merge pull request #77 from sagidayan/UI
Ui
2015-06-27 15:07:46 +03:00
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