|
|
805b952281
|
Merge branch 'master' into API_Dev
Conflicts:
Testing/CoursesAPI_test.py
|
2015-06-28 21:14:09 +03:00 |
|
|
|
2a64f940af
|
Merge pull request #80 from sagidayan/UI
- myClasses display - (python work in progress)
|
2015-06-28 21:10:49 +03:00 |
|
|
|
b5ba1fbbb8
|
added getUsersByCampus/Course/Project functions
|
2015-06-28 18:08:05 +03:00 |
|
|
|
9d323c4422
|
added join campus function
|
2015-06-28 17:53:37 +03:00 |
|
|
|
f9190f73d2
|
function name fix
|
2015-06-28 17:43:08 +03:00 |
|
|
|
6452dbd66a
|
fix #79
|
2015-06-28 17:30:22 +03:00 |
|
|
|
ec1eacb3cd
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev
|
2015-06-28 17:18:51 +03:00 |
|
|
|
93078f4f18
|
fix #46 - added delete user from project, course, campus
|
2015-06-28 17:16:36 +03:00 |
|
|
|
1574b7e19e
|
IMPORTANT: alot of function name changes and new Doc
|
2015-06-28 16:48:01 +03:00 |
|
|
|
664fcedca0
|
added Message routes. create, get and delete function are available.
doc should be updated
|
2015-06-28 15:48:39 +03:00 |
|
|
|
e07deaddb2
|
removed messages from course
|
2015-06-28 15:47:39 +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 |
|
|
|
fe397a2443
|
Fixed API Syntax Error Causing 500 Fix #74
|
2015-06-27 17:18:59 +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 |
|
|
|
6417e76761
|
Merge pull request #78 from sagidayan/UI
- Main Menu Last Commit
|
2015-06-27 15:12:32 +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 |
|
|
|
2ddbc1719e
|
Merge pull request #77 from sagidayan/UI
Ui
|
2015-06-27 15:07:46 +03:00 |
|
Matan Bar Yosef
|
163a711f0f
|
- Create Class reference - fixed
|
2015-06-27 14:52:49 +03:00 |
|
Matan Bar Yosef
|
191924a732
|
- work in progress (creating course - reference)
|
2015-06-27 14:36:20 +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 |
|
|
|
1c32ed9e56
|
API: Added /api/campuses/getCampusesByUserID/
|
2015-06-26 15:07:26 +03:00 |
|
|
|
43de4f9b80
|
apiServices: Added GetUserById & get GetCampusByUserId
|
2015-06-26 15:06:59 +03:00 |
|
|
|
0e37e51b4d
|
API: Added Get User By ID
|
2015-06-26 14:55:08 +03:00 |
|
|
|
0ccc8ba1dd
|
API Hot Fix. fixed syntax Error
|
2015-06-26 14:54:16 +03:00 |
|
|
|
9ddc035443
|
apiServices - Added token Param in to getCamusesByUser
|
2015-06-26 14:53:40 +03:00 |
|
|
|
42210f73d5
|
API Docs - index UI
|
2015-06-26 14:52:33 +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 |
|
|
|
2a55d7f898
|
API Doc Fix
|
2015-06-25 20:45:43 +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 |
|
|
|
b3e5ce4716
|
Merge pull request #67 from sagidayan/UI
- Create course api -fixed
|
2015-06-24 22:47:40 +03:00 |
|
|
|
73eef42871
|
Merge pull request #73 from sagidayan/API_Dev
Api dev
|
2015-06-24 22:43:52 +03:00 |
|
Matan Bar Yosef
|
559d235bc9
|
- thisProject Added
- Tasks tab system - Added
|
2015-06-24 22:43:02 +03:00 |
|
|
|
18ad25f18d
|
MERGE WARNING!!
deleted CourseAPI_test from my rep. i think this file doesnt exist in @etyemy rep aswell
|
2015-06-24 21:57:31 +03:00 |
|
|
|
695d052cf0
|
change in function name
|
2015-06-24 21:54: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 |
|
