Commit graph

531 commits

Author SHA1 Message Date
383ecff2a1 Merge pull request #158 from sagidayan/API_Dev
fix in submitGrade
2015-08-03 00:25:44 +03:00
1b3e4b74b9 fix in submitGrade 2015-08-03 00:25:31 +03:00
46f598d98d Merge pull request #157 from sagidayan/API_Dev
fix in submitGrade
2015-08-03 00:24:43 +03:00
4a75efe8c4 fix in submitGrade 2015-08-03 00:24:12 +03:00
84d9b38cb6 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-03 00:22:16 +03:00
b1f8a6f4f3 Tasks Should Work... Maybe 2015-08-03 00:22:10 +03:00
b466cabf81 Merge pull request #156 from sagidayan/API_Dev
fix in submitGrade
2015-08-03 00:21:47 +03:00
043fb67b5a fix in submitGrade 2015-08-03 00:21:02 +03:00
35ecdd1f60 Tasks... 2015-08-02 23:53:20 +03:00
6437396125 Merge pull request #155 from sagidayan/UI
- team members in project - fixed
2015-08-02 23:52:58 +03:00
Matan Bar Yosef
df3f3d4ada - team members in project - fixed 2015-08-02 23:52:41 +03:00
9e52590fd2 Merge pull request #154 from sagidayan/API_Dev
fix
2015-08-02 23:52:32 +03:00
0663bf3786 fix 2015-08-02 23:52:08 +03:00
679c964485 Merge pull request #153 from sagidayan/API_Dev
fix
2015-08-02 22:49:29 +03:00
e7babed0eb fix 2015-08-02 22:48:08 +03:00
3adbeecc57 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-02 22:34:10 +03:00
233e1dbc69 Still Tasks... Controller stuff 2015-08-02 22:34:05 +03:00
3ed0240e65 Merge pull request #152 from sagidayan/API_Dev
Api dev
2015-08-02 22:33:41 +03:00
1856982dd0 added isTaskSubmitted function 2015-08-02 22:27:51 +03:00
32d7f40b06 added getUsersStateByTask function 2015-08-02 22:21:13 +03:00
87b19b2255 Tasks Page In The Making 2015-08-02 22:18:17 +03:00
Matan Bar Yosef
ed4a7e2568 - team members in project - fixed 2015-08-02 22:06:35 +03:00
54360f3782 Merge pull request #151 from sagidayan/API_Dev
Api dev
2015-08-02 21:56:57 +03:00
b2b740e97a fix 2015-08-02 21:55:37 +03:00
993e622f53 fix 2015-08-02 21:54:39 +03:00
908b0f1536 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-02 21:46:49 +03:00
1dafd10b72 New Task Layout 2015-08-02 21:46:42 +03:00
abfffb21f3 Merge pull request #150 from sagidayan/API_Dev
Api dev
2015-08-02 21:46:23 +03:00
9fc83eb0e7 updated getAllUserTasks function (more data) 2015-08-02 21:42:20 +03:00
da333764b6 not only lecturer can write msgs 2015-08-02 21:41:54 +03:00
f83aff5408 Merge pull request #149 from sagidayan/API_Dev
returning msg on creation
2015-08-02 20:38:35 +03:00
e475585e76 returning msg on creation 2015-08-02 20:38:23 +03:00
063f15bd1d Merge pull request #148 from sagidayan/UI
-messages (in progress)
2015-08-02 20:37:42 +03:00
Matan Bar Yosef
4fc5c9ba73 -messages (in progress) 2015-08-02 20:36:47 +03:00
414d3b7215 Task Grade Fix 2015-08-02 20:09:00 +03:00
f94bf35343 Merge pull request #147 from sagidayan/API_Dev
fix
2015-08-02 20:05:31 +03:00
6f521efadb fix 2015-08-02 20:05:14 +03:00
9ad25bff88 Merge branch 'UI' 2015-08-02 19:56:16 +03:00
1148b227c5 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-02 19:56:07 +03:00
6d0505fa28 Merge branch 'master' into UI 2015-08-02 19:54:04 +03:00
0ad5385359 FIxed some Tasks Issues 2015-08-02 19:53:35 +03:00
1e9f24834a Merge pull request #145 from sagidayan/API_Dev
fix
2015-08-02 19:52:36 +03:00
0714eb242b fix 2015-08-02 19:52:26 +03:00
Matan Bar Yosef
fbe3f81736 -classRoute - fixed
-joinProject - fixed

-joinClass - fixed
2015-08-02 19:51:29 +03:00
bbc37e734a Merge pull request #144 from sagidayan/API_Dev
added submitGrade
2015-08-02 19:38:36 +03:00
2107ca1aea added submitGrade 2015-08-02 19:37:58 +03:00
99d89cf198 Merge pull request #143 from sagidayan/API_Dev
Api dev
2015-08-02 19:35:57 +03:00
8bb73c7bc7 added submitGrade 2015-08-02 19:35:08 +03:00
23ebadc347 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev 2015-08-02 19:09:55 +03:00
9e5d6f9139 fix 2015-08-02 18:41:19 +03:00