Matan Bar Yosef
|
ab35e946c0
|
- goldMINE!!!
-location reference fixed
|
2015-06-29 21:01:30 +03:00 |
|
Matan Bar Yosef
|
8aae6ab869
|
- myProject - location path fixed
|
2015-06-29 20:28:20 +03:00 |
|
Matan Bar Yosef
|
e19f4fd03a
|
-Graphs - fixed
|
2015-06-29 20:04:33 +03:00 |
|
Matan Bar Yosef
|
252f4440c6
|
-Class added
-project Added
|
2015-06-29 19:23:14 +03:00 |
|
Matan Bar Yosef
|
42a5e8b108
|
- myProjects (work in progress)
|
2015-06-29 19:20:56 +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
|
e66ac5852f
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
|
2015-06-29 16:39:31 +03:00 |
|
|
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 |
|
|
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
|
3486581b8f
|
- myClasses display - (python work in progress)
- layout patterns fixed and adjusted
|
2015-06-28 15:27:06 +03:00 |
|
|
699be13137
|
Explorer Layout Fixed + Init() Function that splits to 3 sized array
|
2015-06-27 17:01:16 +03:00 |
|
|
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 |
|
|
bfbf4cf355
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-06-27 15:08:23 +03:00 |
|
|
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
|
c64b865f3d
|
- Fixed reference in thisProject/:projectId
|
2015-06-27 12:48:11 +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 |
|
|
1d5cbb18cd
|
Profile - Edit And Delete Buttons Visible Only If Permitted
|
2015-06-26 15:34:07 +03:00 |
|
|
cc3d65037d
|
First Step Of Independed Profile. ID oriented. Needs Classes List
|
2015-06-26 15:13:26 +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 |
|
|
9d49ba5f0a
|
#72 - cleand up main menu & added ID to routes
|
2015-06-26 14:08:23 +03:00 |
|
|
2f870ba050
|
#68 Added Link & RadioButtons components to Task generator
|
2015-06-25 22:40:26 +03:00 |
|
|
e135ee020a
|
Changed settings into profile. + in controller
|
2015-06-25 00:10:08 +03:00 |
|
|
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 |
|
|
049c36c916
|
Fixed HRef
|
2015-06-24 13:42:32 +03:00 |
|
|
5f53e3ff85
|
Fixing Register POPUP
|
2015-06-24 13:28:27 +03:00 |
|
|
522a71d9c4
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-06-24 13:18:09 +03:00 |
|
|
ad45ee787d
|
Merge pull request #66 from sagidayan/UI
- add choose project from dashboard
|
2015-06-24 13:17:58 +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 |
|
|
d32b09b712
|
Fixed Token Issue in Register Controller
|
2015-06-24 13:07:17 +03:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
44aaa5c08f
|
Fixing A BAAAD Commit
|
2015-06-22 13:04:21 +03:00 |
|
|
0be52f2b0a
|
Merged Conflict FIX API_Dev -> MASTER
|
2015-06-21 22:29:47 +03:00 |
|
|
94a9c3dbb0
|
Begining of add new tesk
|
2015-06-21 22:27:48 +03:00 |
|
|
3f272dc304
|
garbage commit
|
2015-06-21 22:22:13 +03:00 |
|
Matan Bar Yosef
|
badcf43151
|
- Lecturer / Student Mode added
- TODO fix previous text input from (add message by lecturer)
|
2015-06-20 14:58:30 +03:00 |
|
Matan Bar Yosef
|
3c48e3fbe9
|
- Add message for lecturer - ADDED
- Clear all messages for lecturer - ADDED
- Overflow - FIXED
|
2015-06-20 14:21:32 +03:00 |
|
|
4221439085
|
Added a js chart lib + example in settings
|
2015-06-19 00:02:06 +03:00 |
|
|
5b6e6e9298
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-06-18 23:26:58 +03:00 |
|
|
da224b25d8
|
Settings: Now Updating the user via API call
|
2015-06-18 23:26:51 +03:00 |
|
Matan Bar Yosef
|
94cf0447e4
|
- tasks.html added
- tasksController added
- app.js updated when '/tasks'
- mainController updated '/tasks'
|
2015-06-18 23:21:09 +03:00 |
|
Matan Bar Yosef
|
a2b763e00d
|
- feed design Fixed
|
2015-06-18 21:13:31 +03:00 |
|
|
af608da379
|
Home Animation Only Once fix
|
2015-06-18 00:04:36 +03:00 |
|
Matan Bar Yosef
|
ee7e023d56
|
- removed md-list "no style" and other styling
- feed pattern Added
|
2015-06-17 23:16:49 +03:00 |
|
|
42f8d27b94
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-06-17 22:46:32 +03:00 |
|
|
51d11cac93
|
More Setings UI Tweaks
|
2015-06-17 22:46:26 +03:00 |
|
Matan Bar Yosef
|
998bba0e29
|
- updateUser service and implement added
|
2015-06-17 22:38:07 +03:00 |
|
|
d736cb021a
|
Merge branch 'se-hub-43'
|
2015-06-17 21:00:52 +03:00 |
|
|
46f374430d
|
missing js File
|
2015-06-17 21:00:37 +03:00 |
|
|
c264d908fb
|
Added New dataService - to sync mainController data with other scopes
|
2015-06-17 20:59:45 +03:00 |
|
|
3465ff3465
|
Added Logout Function
|
2015-06-17 20:14:53 +03:00 |
|
|
f258856102
|
#43 - Settings Page: Some More UI
Thinking About UI and Implementing it
|
2015-06-17 00:07:21 +03:00 |
|
|
f1561f025f
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-06-16 23:40:24 +03:00 |
|
|
492a3e9ce1
|
Merge pull request #44 from sagidayan/UI
- fixed mdDialog on email error
|
2015-06-16 23:36:39 +03:00 |
|
|
f5be224cb2
|
Menu is usable (issue #42) and starting settings
|
2015-06-16 23:32:10 +03:00 |
|
Matan Bar Yosef
|
37880d649a
|
- fixed mdDialog on email error
|
2015-06-16 23:29:34 +03:00 |
|
|
001d931b12
|
Merge branch 'se-hub-33'
|
2015-06-16 22:46:05 +03:00 |
|
|
06f9425928
|
issue #33 - Main Menu
Done
|
2015-06-16 22:45:06 +03:00 |
|
|
b3dc506d49
|
Merge UI - Conflict Fixed
|
2015-06-16 20:38:26 +03:00 |
|
|
45f59dcbcb
|
se-hub-33 #33 - Main Menu - More Skeleton
|
2015-06-16 20:34:37 +03:00 |
|
Matan Bar Yosef
|
51fa91d601
|
- email validation for lecturer in campus now working!
|
2015-06-16 20:24:09 +03:00 |
|
|
11b7aef006
|
AngularJS: Added Home Route + Home Controller + Home View
|
2015-06-16 14:15:59 +03:00 |
|
Matan Bar Yosef
|
12552e9ca5
|
-create campus as lecturer added
|
2015-06-16 11:34:04 +03:00 |
|
|
daf39d81cd
|
Merge pull request #30 from sagidayan/UI
Ui
|
2015-06-15 19:13:46 +03:00 |
|
Matan Bar Yosef
|
06a883e103
|
documentation added
alpha test for userPrivilege
|
2015-06-15 19:12:54 +03:00 |
|
|
5c2fd67e20
|
Cleaning
|
2015-06-15 19:10:26 +03:00 |
|
|
73d9a65dab
|
AngularJS: Fixed Scope Issue & more
Starting to work on the mailController
|
2015-06-15 18:41:44 +03:00 |
|
Matan Bar Yosef
|
fd11a512bd
|
changing branch name to UI
|
2015-06-15 17:46:02 +03:00 |
|
|
cf5bb8e1ab
|
Merge pull request #28 from sagidayan/matanBranch
Matan branch
|
2015-06-15 16:54:24 +03:00 |
|
|
1ec45d107c
|
API & AngularJS: Updating API Routes - API_Dev Merge
and Service Update
|
2015-06-15 16:51:13 +03:00 |
|
|
d0c91b0c70
|
AngularJS: Updating Services to the new API scheme
|
2015-06-15 16:23:42 +03:00 |
|