Commit graph

501 commits

Author SHA1 Message Date
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
7118bab598 Fixing A posible Bug in the API getting User Stats 2015-08-01 13:45:05 +03:00
222fb2cab0 Cleaning 2015-08-01 13:36:28 +03:00
c36a4041b6 User Profile - Now Getting Real Stats (commits, issues, messages) 2015-08-01 13:35:59 +03:00
35df7cd3e3 Tasks: More Improvements 2015-07-25 18:25:45 +03:00
fcaa93a713 Changed app color theme & fix to mainController 2015-07-25 18:25:26 +03:00
e9dab54c2c Added invalid Token redirection to Welcome app.js 2015-07-25 14:20:29 +03:00
33003c0486 Begining of the Task filling/viewing controller and html view 2015-07-24 00:57:14 +03:00
85c8af1f74 API Hot Fix - #Error On login without email 2015-07-07 21:05:41 +03:00
ea1a6a4649 Merge pull request #118 from sagidayan/API_Dev
Api dev
2015-07-03 14:12:50 +03:00
44f0d1705a added doc 2015-07-03 01:26:08 +03:00
8a579cfb83 added TaskGrade model and getAllUserTasks function 2015-07-03 01:19:21 +03:00
55593a6542 copying an object instead of re-requesting from db 2015-07-02 23:52:22 +03:00
0c6af92021 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev 2015-07-02 23:47:36 +03:00
57f944c2c7 API: New Message /api/messages/getAllUserMessages/<token> 2015-07-02 23:12:14 +03:00
2c646b289a fix create Task issues 2015-07-02 22:48:01 +03:00
beb044013a Merge pull request #117 from sagidayan/UI
- createClass - endDate is before startDate fixed
2015-07-02 22:43:41 +03:00
Matan Bar Yosef
36fab377b5 - sendMessage course in msg added
((still in progress - at the moment showing the course u select on drop down))
2015-07-02 22:33:31 +03:00
fd8b7ed7e7 doc change 2015-07-02 22:16:06 +03:00
Matan Bar Yosef
f540f02d22 - createClass - endDate is before startDate fixed 2015-07-02 22:15:50 +03:00
e666a1b042 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-07-02 21:45:02 +03:00
259479cbee Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev 2015-07-02 21:42:55 +03:00