Commit graph

61 commits

Author SHA1 Message Date
Matan Bar Yosef
e9845d29b6 - in progress 2015-08-03 02:42:24 +03:00
35ecdd1f60 Tasks... 2015-08-02 23:53:20 +03:00
233e1dbc69 Still Tasks... Controller stuff 2015-08-02 22:34:05 +03:00
0ad5385359 FIxed some Tasks Issues 2015-08-02 19:53:35 +03:00
842c57f3d2 Merge pull request #141 from sagidayan/UI
Ui
2015-08-02 17:53:45 +03:00
Matan Bar Yosef
6d73b98d6a -remove project - fixed
-remove user from project - in progress
2015-08-02 17:51:08 +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
Matan Bar Yosef
ec3dc29024 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-08-02 15:39:52 +03:00
ad3a34d6ee Changed task route in app js. task fill gets real task 2015-08-02 14:55:39 +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
5c4ca0eea1 Create Task works. 2015-08-02 13:44:15 +03:00
Matan Bar Yosef
dfd141229c -getAllfutureCampusTasks - fixed
-messages in dashboard - fixed
2015-08-02 12:55:43 +03:00
Matan Bar Yosef
dbfaf90972 - joinProject - added
-team members - fixed
2015-08-01 17:51:13 +03:00
e666a1b042 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-07-02 21:45:02 +03:00
14483a939f Campus (In Explore) Looks and Feel 2015-07-02 21:38:37 +03:00
a3b4be7e2e Merge pull request #116 from sagidayan/UI
- dashboard - new layout (Still In Progress!)
2015-07-02 21:37:50 +03:00
Matan Bar Yosef
15a6d7e2e0 - dashboard - new layout (Still In Progress!)
- tab system in dashboard is working with scroll

-  createMessage - logic fixed (display in progress)
2015-07-02 21:24:01 +03:00
c13b726cbb AngularJS: apiServices: Added Get Campus By ID 2015-07-02 17:31:33 +03:00
Matan Bar Yosef
c154b37973 - home page new pattern added (work in progress)
- task page - improvements for layout (api func under progress)

- campuses (loading circle - under progress)
2015-07-01 07:05:13 +03:00
Matan Bar Yosef
5201634551 - project Page - Commits - added (work in progress..)
- createMessage API - fixed (still need to check retrieve data from server)

-  theme.css - removed some unneccesary methods, tabDesign overflow - added (work in progress)
2015-07-01 02:35:23 +03:00
Matan Bar Yosef
e38cecb7e4 - project - Show graphs - Added ! 2015-06-29 22:31:32 +03:00
Matan Bar Yosef
2df580da28 -create project - working and talking with server!
-loadingData on wait for projects - added!
2015-06-29 17:57:32 +03:00
Matan Bar Yosef
a80df36fcb Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-06-29 15:21:08 +03:00
Matan Bar Yosef
ab3f4737ba - createCourse - changed to create
-create project function - added (work in progress)
2015-06-29 15:20:57 +03:00
2ce04b34d9 Merge branch 'master' into UI
Conflicts:
	templates/js/services/apiService.js
2015-06-29 14:45:37 +03:00
Matan Bar Yosef
0cc88bc9b9 - joinCourse - fixed (user can't join twice)
- createCourse - added (work in progress)
2015-06-29 14:41:17 +03:00
f0031dca16 Fix to the GetCoursesByUserId in Profile 2015-06-29 14:25:20 +03:00
edac533f2b AngularJS Service getCoursesByUserID 2015-06-29 14:21:17 +03:00
Matan Bar Yosef
cddc5483ce - create class is working again #2 2015-06-29 13:06:13 +03:00
Matan Bar Yosef
2819fd12a2 - create class is working again 2015-06-29 12:57:07 +03:00
Matan Bar Yosef
eb1240f3c4 - Main menu nav - My Projects reference fixed to user projects
- Main menu nav - click on Courses -> Campuses -> Courses -> Projects (all class users)

- API function getProjectsByUser - Added
2015-06-27 14:20:21 +03:00
Matan Bar Yosef
380228947b -Bugs fixing
- Create class bug - fixed

- Work in progress (classes, projects) - need to check API
2015-06-27 12:45:44 +03:00
Matan Bar Yosef
18ca8df227 - campuses fixed
- Work in progress (classes, projects)
2015-06-26 21:56:41 +03:00
Matan Bar Yosef
91ac400452 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
# Conflicts:
#	templates/js/services/apiService.js
2015-06-26 16:58:55 +03:00
Matan Bar Yosef
5ec2ed20bd Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
# Conflicts:
#	templates/js/services/apiService.js
2015-06-26 16:55:26 +03:00
Matan Bar Yosef
f3226e0896 - work in progress 2015-06-26 16:49:46 +03:00
43de4f9b80 apiServices: Added GetUserById & get GetCampusByUserId 2015-06-26 15:06:59 +03:00
9ddc035443 apiServices - Added token Param in to getCamusesByUser 2015-06-26 14:53:40 +03:00
Matan Bar Yosef
559d235bc9 - thisProject Added
- Tasks tab system - Added
2015-06-24 22:43:02 +03:00
Matan Bar Yosef
0cce80ed98 - Campuses -> Courses -> Projects
-* waiting for merge to get API from server
2015-06-24 21:35:21 +03:00
Matan Bar Yosef
1b3aaea1ff Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-06-24 14:26:13 +03:00
Matan Bar Yosef
ba5939c437 - Create course api -fixed 2015-06-24 14:01:08 +03:00
522a71d9c4 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-06-24 13:18:09 +03:00
23d287e59a POST -> PUT in update user 2015-06-24 13:16:19 +03:00
Matan Bar Yosef
38ae45aa95 - add choose project from dashboard 2015-06-24 13:13:58 +03:00
Matan Bar Yosef
1d5655b056 - create course - added
- show my classes - added
2015-06-23 19:04:41 +03:00
Matan Bar Yosef
1e6e3f24f2 -DashBoard pattern and messages - fixed
-Project evaluation pattern - added
2015-06-22 13:06:56 +03:00