|
|
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 |
|
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 |
|
|
|
4b89432520
|
added: - memberId list property
|
2015-06-24 20:23:50 +03:00 |
|
|
|
7c5115869c
|
change delete campus name
|
2015-06-24 20:23:22 +03:00 |
|
|
|
af98c69723
|
added getProjectsByUser and joinProject function
|
2015-06-24 20:09:13 +03:00 |
|
|
|
0ae7101e30
|
added projects_id_list propery
|
2015-06-24 20:01:55 +03:00 |
|
|
|
b7b44df479
|
added getCoursesByUser function, some added parameters to Messages, and now adding a student to a created course
|
2015-06-24 20:00:30 +03:00 |
|
|
|
330304cd4c
|
added getCampusesByUser function
|
2015-06-24 19:57:40 +03:00 |
|
Matan Bar Yosef
|
b19b60b58b
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
|
2015-06-24 19:11:44 +03:00 |
|
|
|
a942f7e486
|
New Task UI Tweak
|
2015-06-24 17:27:20 +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 |
|
|
|
f26472ba5b
|
#64 #35 New Task Tweaks
|
2015-06-24 12:52:44 +03:00 |
|
|
|
21060e7e5f
|
Merge pull request #65 from sagidayan/API_Dev
Api dev
|
2015-06-24 12:41:43 +03:00 |
|
|
|
72d3036c2a
|
fix #62
|
2015-06-24 01:20:53 +03:00 |
|
|
|
90909c7c2f
|
fix #61
|
2015-06-24 01:16:51 +03:00 |
|
|
|
dc6070fe29
|
added functions: addUserToCampus, addUserToCourse
also, getUserByToken now returns the campuses themselfs
|
2015-06-24 00:54:55 +03:00 |
|
|
|
868b7fad8a
|
some organizing
|
2015-06-24 00:50:59 +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 |
|
|
|
811593dbb1
|
Crate New Task UI Tweaks
|
2015-06-23 20:26:05 +03:00 |
|
|
|
89c16b8ecc
|
Merge pull request #59 from sagidayan/UI
- create course - added
|
2015-06-23 19:56:10 +03:00 |
|
|
|
0a02aaf692
|
Reverting Arans commit on testing
|
2015-06-23 19:55:58 +03:00 |
|
|
|
cace7be507
|
Merge pull request #58 from sagidayan/API_Dev
Api dev
|
2015-06-23 19:55:08 +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 |
|
|
|
41b62be4ec
|
added deleteTask and deleteTaskComponents functions
|
2015-06-23 00:28:29 +03:00 |
|
|
|
6b8debec47
|
MERGE WARNING!
didnt touch it but it wants commit...
|
2015-06-23 00:13:03 +03:00 |
|
|
|
0460d9b666
|
added function: getAllFutureTasks
|
2015-06-23 00:10:39 +03:00 |
|
|
|
87135a1ec2
|
added Doc path
|
2015-06-22 23:28:21 +03:00 |
|
|
|
5a118075c4
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-06-22 22:38:06 +03:00 |
|
|
|
3f73ec2563
|
Merge pull request #57 from sagidayan/QA
Qa
|
2015-06-22 22:37:58 +03:00 |
|
|
|
454c81d16b
|
Create New Task Page - Fully functional. need submit button
|
2015-06-22 22:37:47 +03:00 |
|
|
|
71ef085662
|
Merge pull request #56 from sagidayan/UI
Ui - Create Task button reference to tasks/new
|
2015-06-22 20:35:24 +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 |
|
Matan Bar Yosef
|
e7e34bcbbd
|
- Create Task button reference to tasks/new
|
2015-06-22 14:23:03 +03:00 |
|
Matan Bar Yosef
|
a702ae9df2
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
|
2015-06-22 13:19:38 +03:00 |
|
