sagi/se-hub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
329 commits 4 branches 0 tags 3.4 MiB
Commit graph

96 commits

Author SHA1 Message Date
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
e66ac5852f Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-06-29 16:39:31 +03:00
Sagi Dayan
3db75de9b0 Sorted Project imfo API 2015-06-29 16:38:39 +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
Sagi Dayan
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
Sagi Dayan
f0031dca16 Fix to the GetCoursesByUserId in Profile 2015-06-29 14:25:20 +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
3486581b8f - myClasses display - (python work in progress) 
- layout patterns fixed and adjusted
 2015-06-28 15:27:06 +03:00
Sagi Dayan
699be13137 Explorer Layout Fixed + Init() Function that splits to 3 sized array 2015-06-27 17:01:16 +03:00
Sagi Dayan
33c016a43c Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-06-27 15:12:46 +03:00
Matan Bar Yosef
3e696b86f8 - Main menu nav - Project reference fixed 2015-06-27 15:10:03 +03:00
Sagi Dayan
bfbf4cf355 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-06-27 15:08:23 +03:00
Sagi Dayan
bd9fef0061 Campuses -> Explore in main Menu 2015-06-27 15:08:17 +03:00
Matan Bar Yosef
163a711f0f - Create Class reference - fixed 2015-06-27 14:52:49 +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
b630f0d696 - Main menu nav - Project reference fixed 2015-06-27 12:58:04 +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
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
Sagi Dayan
1d5cbb18cd Profile - Edit And Delete Buttons Visible Only If Permitted 2015-06-26 15:34:07 +03:00
Sagi Dayan
cc3d65037d First Step Of Independed Profile. ID oriented. Needs Classes List 2015-06-26 15:13:26 +03:00
Sagi Dayan
9d49ba5f0a #72 - cleand up main menu & added ID to routes 2015-06-26 14:08:23 +03:00
Sagi Dayan
2f870ba050 #68 Added Link & RadioButtons components to Task generator 2015-06-25 22:40:26 +03:00
Sagi Dayan
e135ee020a Changed settings into profile. + in controller 2015-06-25 00:10:08 +03:00
Sagi Dayan
e3fe428900 API: getUserByToken returs user id now 2015-06-25 00:04:04 +03:00
Matan Bar Yosef
559d235bc9 - thisProject Added 
- Tasks tab system - Added
 2015-06-24 22:43:02 +03:00
Matan Bar Yosef
e2bd575ca7 - Campuses -> Courses -> Projects (Addition) 
-* waiting for merge to get API from server
 2015-06-24 21:35:55 +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
Sagi Dayan
049c36c916 Fixed HRef 2015-06-24 13:42:32 +03:00
Sagi Dayan
5f53e3ff85 Fixing Register POPUP 2015-06-24 13:28:27 +03:00
Sagi Dayan
ad45ee787d Merge pull request #66 from sagidayan/UI 
- add choose project from dashboard
 2015-06-24 13:17:58 +03:00
Matan Bar Yosef
38ae45aa95 - add choose project from dashboard 2015-06-24 13:13:58 +03:00
Sagi Dayan
d32b09b712 Fixed Token Issue in Register Controller 2015-06-24 13:07:17 +03:00
Sagi Dayan
3c8c262fe6 Merge pull request #60 from sagidayan/UI 
- my classes fixed buttons
 2015-06-23 20:36:37 +03:00
Matan Bar Yosef
88906c30a8 - my classes fixed buttons 2015-06-23 20:34:26 +03:00
Sagi Dayan
7a4f669f90 Typo in projectsController 2015-06-23 20:32:29 +03:00
Matan Bar Yosef
ff9ea86131 - Files Added: myClasses, newcourse, projects, tasks 2015-06-23 19:40:30 +03:00
Matan Bar Yosef
1d5655b056 - create course - added 
- show my classes - added
 2015-06-23 19:04:41 +03:00
Sagi Dayan
454c81d16b Create New Task Page - Fully functional. need submit button 2015-06-22 22:37:47 +03:00
Matan Bar Yosef
eb5391cb82 - Projects controller and page - added 
- project zoom and open in another page - added
 2015-06-22 14:45:50 +03:00
Sagi Dayan
4deeb3084f Merge branch 'master' into UI 2015-06-22 13:16:38 +03:00
Matan Bar Yosef
1e6e3f24f2 -DashBoard pattern and messages - fixed 
-Project evaluation pattern - added
 2015-06-22 13:06:56 +03:00
Sagi Dayan
44aaa5c08f Fixing A BAAAD Commit 2015-06-22 13:04:21 +03:00
Sagi Dayan
0be52f2b0a Merged Conflict FIX API_Dev -> MASTER 2015-06-21 22:29:47 +03:00