 Aran Zaiger
|
0663bf3786
|
fix
|
2015-08-02 23:52:08 +03:00 |
|
 Sagi Dayan
|
679c964485
|
Merge pull request #153 from sagidayan/API_Dev
fix
|
2015-08-02 22:49:29 +03:00 |
|
|
Aran Zaiger
|
e7babed0eb
|
fix
|
2015-08-02 22:48:08 +03:00 |
|
|
Sagi Dayan
|
3adbeecc57
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-08-02 22:34:10 +03:00 |
|
|
Sagi Dayan
|
233e1dbc69
|
Still Tasks... Controller stuff
|
2015-08-02 22:34:05 +03:00 |
|
|
Sagi Dayan
|
3ed0240e65
|
Merge pull request #152 from sagidayan/API_Dev
Api dev
|
2015-08-02 22:33:41 +03:00 |
|
|
Aran Zaiger
|
1856982dd0
|
added isTaskSubmitted function
|
2015-08-02 22:27:51 +03:00 |
|
|
Aran Zaiger
|
32d7f40b06
|
added getUsersStateByTask function
|
2015-08-02 22:21:13 +03:00 |
|
|
Sagi Dayan
|
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 |
|
|
Sagi Dayan
|
54360f3782
|
Merge pull request #151 from sagidayan/API_Dev
Api dev
|
2015-08-02 21:56:57 +03:00 |
|
|
Aran Zaiger
|
b2b740e97a
|
fix
|
2015-08-02 21:55:37 +03:00 |
|
|
Aran Zaiger
|
993e622f53
|
fix
|
2015-08-02 21:54:39 +03:00 |
|
|
Sagi Dayan
|
908b0f1536
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-08-02 21:46:49 +03:00 |
|
|
Sagi Dayan
|
1dafd10b72
|
New Task Layout
|
2015-08-02 21:46:42 +03:00 |
|
|
Sagi Dayan
|
abfffb21f3
|
Merge pull request #150 from sagidayan/API_Dev
Api dev
|
2015-08-02 21:46:23 +03:00 |
|
|
Aran Zaiger
|
9fc83eb0e7
|
updated getAllUserTasks function (more data)
|
2015-08-02 21:42:20 +03:00 |
|
|
Aran Zaiger
|
da333764b6
|
not only lecturer can write msgs
|
2015-08-02 21:41:54 +03:00 |
|
|
Sagi Dayan
|
f83aff5408
|
Merge pull request #149 from sagidayan/API_Dev
returning msg on creation
|
2015-08-02 20:38:35 +03:00 |
|
|
Aran Zaiger
|
e475585e76
|
returning msg on creation
|
2015-08-02 20:38:23 +03:00 |
|
|
Sagi Dayan
|
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 |
|
|
Sagi Dayan
|
414d3b7215
|
Task Grade Fix
|
2015-08-02 20:09:00 +03:00 |
|
|
Sagi Dayan
|
f94bf35343
|
Merge pull request #147 from sagidayan/API_Dev
fix
|
2015-08-02 20:05:31 +03:00 |
|
|
Aran Zaiger
|
6f521efadb
|
fix
|
2015-08-02 20:05:14 +03:00 |
|
|
Sagi Dayan
|
9ad25bff88
|
Merge branch 'UI'
|
2015-08-02 19:56:16 +03:00 |
|
|
Sagi Dayan
|
1148b227c5
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-08-02 19:56:07 +03:00 |
|
|
Sagi Dayan
|
6d0505fa28
|
Merge branch 'master' into UI
|
2015-08-02 19:54:04 +03:00 |
|
|
Sagi Dayan
|
0ad5385359
|
FIxed some Tasks Issues
|
2015-08-02 19:53:35 +03:00 |
|
|
Sagi Dayan
|
1e9f24834a
|
Merge pull request #145 from sagidayan/API_Dev
fix
|
2015-08-02 19:52:36 +03:00 |
|
|
Aran Zaiger
|
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 |
|
|
Sagi Dayan
|
bbc37e734a
|
Merge pull request #144 from sagidayan/API_Dev
added submitGrade
|
2015-08-02 19:38:36 +03:00 |
|
|
Aran Zaiger
|
2107ca1aea
|
added submitGrade
|
2015-08-02 19:37:58 +03:00 |
|
|
Sagi Dayan
|
99d89cf198
|
Merge pull request #143 from sagidayan/API_Dev
Api dev
|
2015-08-02 19:35:57 +03:00 |
|
|
Aran Zaiger
|
8bb73c7bc7
|
added submitGrade
|
2015-08-02 19:35:08 +03:00 |
|
|
Aran Zaiger
|
23ebadc347
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev
|
2015-08-02 19:09:55 +03:00 |
|
|
Aran Zaiger
|
9e5d6f9139
|
fix
|
2015-08-02 18:41:19 +03:00 |
|
|
Sagi Dayan
|
014fa602cb
|
Fix to task
|
2015-08-02 18:15:51 +03:00 |
|
|
Sagi Dayan
|
2ae4c6e048
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-08-02 17:59:24 +03:00 |
|
|
Sagi Dayan
|
ffd6b6a32d
|
Merge pull request #142 from sagidayan/API_Dev
fix mail to master of course
|
2015-08-02 17:58:21 +03:00 |
|
|
Aran Zaiger
|
1615963c15
|
fix mail to master of course
|
2015-08-02 17:55:45 +03:00 |
|
|
Sagi Dayan
|
336c8354a8
|
Fixed Email
|
2015-08-02 17:54:27 +03:00 |
|
|
Sagi Dayan
|
842c57f3d2
|
Merge pull request #141 from sagidayan/UI
Ui
|
2015-08-02 17:53:45 +03:00 |
|
|
Matan Bar Yosef
|
7a6d71edcd
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
|
2015-08-02 17:51:21 +03:00 |
|
|
Matan Bar Yosef
|
6d73b98d6a
|
-remove project - fixed
-remove user from project - in progress
|
2015-08-02 17:51:08 +03:00 |
|
|
Matan Bar Yosef
|
afcc8d889f
|
-remove project - fixed
-remove user from project - in progress
|
2015-08-02 17:47:31 +03:00 |
|
|
Sagi Dayan
|
b6f4fbc9e0
|
Merge pull request #140 from sagidayan/API_Dev
Api dev
|
2015-08-02 17:43:50 +03:00 |
|
|
Aran Zaiger
|
cc8e07bc17
|
added crone jobs
|
2015-08-02 17:42:49 +03:00 |
|
|
Aran Zaiger
|
9a17e14201
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev
|
2015-08-02 17:35:05 +03:00 |
|