Matan Bar Yosef
|
252f4440c6
|
-Class added
-project Added
|
2015-06-29 19:23:14 +03:00 |
|
Matan Bar Yosef
|
61d40b4b25
|
-Class added
-project Added
|
2015-06-29 19:22:52 +03:00 |
|
|
|
27ee77deed
|
Merge pull request #91 from sagidayan/API_Dev
fix function
|
2015-06-29 19:22:44 +03:00 |
|
|
|
b1f1400628
|
fix function
|
2015-06-29 19:21:18 +03:00 |
|
Matan Bar Yosef
|
42a5e8b108
|
- myProjects (work in progress)
|
2015-06-29 19:20:56 +03:00 |
|
|
|
82dd89ce8f
|
Merge pull request #90 from sagidayan/API_Dev
only lecturer can join other campus
|
2015-06-29 17:58:57 +03:00 |
|
|
|
c02926d6b4
|
only lecturer can join other campus
|
2015-06-29 17:58:12 +03:00 |
|
|
|
7d6050d775
|
Merge pull request #89 from sagidayan/UI
Ui
|
2015-06-29 17:58:08 +03:00 |
|
Matan Bar Yosef
|
2df580da28
|
-create project - working and talking with server!
-loadingData on wait for projects - added!
|
2015-06-29 17:57:32 +03:00 |
|
|
|
6bc9420038
|
API_Github Conecctor finished
|
2015-06-29 17:56:58 +03:00 |
|
etyemyer
|
ddfbbc04fe
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into QA
|
2015-06-29 17:50:31 +03:00 |
|
etyemyer
|
d0d6ed3851
|
Courses API changes added
|
2015-06-29 17:45:02 +03:00 |
|
etyemyer
|
ad0451e721
|
Courses API changes added
|
2015-06-29 17:44:46 +03:00 |
|
etyemyer
|
66197ad816
|
added tests
|
2015-06-29 17:14:36 +03:00 |
|
Matan Bar Yosef
|
d45bdb534b
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
|
2015-06-29 16:52:43 +03:00 |
|
|
|
7cfe2f527d
|
Hot Fix Stat API
|
2015-06-29 16:52:25 +03:00 |
|
Matan Bar Yosef
|
87c67584f4
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
|
2015-06-29 16:50:30 +03:00 |
|
|
|
f514686442
|
Hot Fix Stat API
|
2015-06-29 16:50:16 +03:00 |
|
Matan Bar Yosef
|
e2eb22d0d4
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
|
2015-06-29 16:48:33 +03:00 |
|
|
|
f465c73c22
|
Fix Stat API
|
2015-06-29 16:47:57 +03:00 |
|
Matan Bar Yosef
|
e66ac5852f
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
|
2015-06-29 16:39:31 +03:00 |
|
|
|
3db75de9b0
|
Sorted Project imfo API
|
2015-06-29 16:38:39 +03:00 |
|
Matan Bar Yosef
|
a80df36fcb
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
|
2015-06-29 15:21:08 +03:00 |
|
Matan Bar Yosef
|
ab3f4737ba
|
- createCourse - changed to create
-create project function - added (work in progress)
|
2015-06-29 15:20:57 +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 |
|
