Commit graph

522 commits

Author SHA1 Message Date
b6f4fbc9e0 Merge pull request #140 from sagidayan/API_Dev
Api dev
2015-08-02 17:43:50 +03:00
cc8e07bc17 added crone jobs 2015-08-02 17:42:49 +03:00
9a17e14201 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev 2015-08-02 17:35:05 +03:00
482e6daf09 added chrone job 2015-08-02 17:34:52 +03:00
e4302df638 Added send_task_reminder (Email_Utils.py) 2015-08-02 17:27:17 +03:00
100b37e243 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-02 16:57:50 +03:00
8c1f919b99 Submit task 2015-08-02 16:57:46 +03:00
96744a81a6 Merge pull request #139 from sagidayan/UI
Ui
2015-08-02 16:57:19 +03:00
Matan Bar Yosef
083c27267c -student/lecturer mode of dashboard - fixed 2015-08-02 16:51:18 +03:00
cf0114c5ac Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-02 16:47:40 +03:00
54350c8450 Merge pull request #138 from sagidayan/API_Dev
added value to componenets and submitTask method
2015-08-02 16:47:12 +03:00
71939c1b1c added value to componenets and submitTask method 2015-08-02 16:43:56 +03:00
2b558e83d6 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-02 16:34:04 +03:00
f2d646d596 Merge pull request #137 from sagidayan/API_Dev
added value to componenets and submitTask method
2015-08-02 16:33:54 +03:00
e558b9e238 added value to componenets and submitTask method 2015-08-02 16:33:28 +03:00
f746965507 favicons 2015-08-02 16:14:11 +03:00
Matan Bar Yosef
ec3dc29024 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-08-02 15:39:52 +03:00
Matan Bar Yosef
965e6949e7 - tasks - fixed 2015-08-02 15:39:39 +03:00
ad3a34d6ee Changed task route in app js. task fill gets real task 2015-08-02 14:55:39 +03:00
1def744997 Merge pull request #136 from sagidayan/API_Dev
added getTaskById
2015-08-02 14:43:09 +03:00
275b668459 added getTaskById 2015-08-02 14:42:41 +03:00
Matan Bar Yosef
f330e3a3fb Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-08-02 13:45:52 +03:00
Matan Bar Yosef
1fa62cad31 -updates in progress 2015-08-02 13:45:42 +03:00
65dabcad87 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-02 13:44:50 +03:00
7173647f96 Merge pull request #135 from sagidayan/UI
Ui
2015-08-02 13:44:43 +03:00
3c19cbe613 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-02 13:44:20 +03:00
5c4ca0eea1 Create Task works. 2015-08-02 13:44:15 +03:00
Matan Bar Yosef
1ec0a41463 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-08-02 13:12:12 +03:00
a3e0183391 Merge pull request #134 from sagidayan/API_Dev
Api dev
2015-08-02 13:11:51 +03:00
b853793bbb fix 2015-08-02 13:11:22 +03:00
Matan Bar Yosef
dfd141229c -getAllfutureCampusTasks - fixed
-messages in dashboard - fixed
2015-08-02 12:55:43 +03:00
2b0fc51b8b fix 2015-08-02 12:53:10 +03:00
dc41da5007 removing all users from project when it is deleted by creator 2015-08-02 12:35:06 +03:00
c826b06f02 added getAllFutureTasks 2015-08-02 12:34:20 +03:00
Matan Bar Yosef
9bede4b399 -loadingData - in progress 2015-08-01 18:18:21 +03:00
448a9e66f7 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-01 18:01:46 +03:00
a3e97009ff For Matan - Random Avatar 2015-08-01 18:01:14 +03:00
9cca1e44da Merge pull request #128 from sagidayan/API_Dev
Api dev
2015-08-01 17:52:05 +03:00
Matan Bar Yosef
7e3eeb104c Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-08-01 17:51:35 +03:00
Matan Bar Yosef
dbfaf90972 - joinProject - added
-team members - fixed
2015-08-01 17:51:13 +03:00
3a97a0474e Fixed Syntax error in Project.html 2015-08-01 17:49:01 +03:00
0778941850 Project Info Cron Job - Fixing Bad data requests 2015-08-01 17:34:53 +03:00
ad3b232f5d added: when user is removed from course he is also removed from projects inside course #126 2015-08-01 17:17:53 +03:00
aade478e5f UI removed option in profile to remove the campus 2015-08-01 16:53:16 +03:00
4b08085d63 added update foe user project list when joining 2015-08-01 16:52:33 +03:00
fd32392b42 bug fix 2015-08-01 16:52:11 +03:00
c5edf92078 aded Progect logo to project page 2015-08-01 15:38:45 +03:00
69d757554f added some comments 2015-08-01 15:25:20 +03:00
5627ad7f5d Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev 2015-08-01 14:17:52 +03:00
8e47d2ff0a change in get user task by id 2015-08-01 14:17:33 +03:00