Commit graph

531 commits

Author SHA1 Message Date
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
Aran Zaiger 482e6daf09 added chrone job 2015-08-02 17:34:52 +03:00
Sagi Dayan e4302df638 Added send_task_reminder (Email_Utils.py) 2015-08-02 17:27:17 +03:00
Sagi Dayan 100b37e243 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-02 16:57:50 +03:00
Sagi Dayan 8c1f919b99 Submit task 2015-08-02 16:57:46 +03:00
Sagi Dayan 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
Sagi Dayan cf0114c5ac Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-02 16:47:40 +03:00
Sagi Dayan 54350c8450 Merge pull request #138 from sagidayan/API_Dev
added value to componenets and submitTask method
2015-08-02 16:47:12 +03:00
Aran Zaiger 71939c1b1c added value to componenets and submitTask method 2015-08-02 16:43:56 +03:00
Sagi Dayan 2b558e83d6 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-02 16:34:04 +03:00
Sagi Dayan f2d646d596 Merge pull request #137 from sagidayan/API_Dev
added value to componenets and submitTask method
2015-08-02 16:33:54 +03:00
Aran Zaiger e558b9e238 added value to componenets and submitTask method 2015-08-02 16:33:28 +03:00
Sagi Dayan 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
Sagi Dayan ad3a34d6ee Changed task route in app js. task fill gets real task 2015-08-02 14:55:39 +03:00
Sagi Dayan 1def744997 Merge pull request #136 from sagidayan/API_Dev
added getTaskById
2015-08-02 14:43:09 +03:00
Aran Zaiger 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
Sagi Dayan 65dabcad87 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-02 13:44:50 +03:00
Sagi Dayan 7173647f96 Merge pull request #135 from sagidayan/UI
Ui
2015-08-02 13:44:43 +03:00
Sagi Dayan 3c19cbe613 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-02 13:44:20 +03:00
Sagi Dayan 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
Sagi Dayan a3e0183391 Merge pull request #134 from sagidayan/API_Dev
Api dev
2015-08-02 13:11:51 +03:00
Aran Zaiger 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
Aran Zaiger 2b0fc51b8b fix 2015-08-02 12:53:10 +03:00
Aran Zaiger dc41da5007 removing all users from project when it is deleted by creator 2015-08-02 12:35:06 +03:00
Aran Zaiger 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
Sagi Dayan 448a9e66f7 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-08-01 18:01:46 +03:00
Sagi Dayan a3e97009ff For Matan - Random Avatar 2015-08-01 18:01:14 +03:00
Sagi Dayan 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
Sagi Dayan 3a97a0474e Fixed Syntax error in Project.html 2015-08-01 17:49:01 +03:00