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

231 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aran Zaiger 93078f4f18 fix #46 - added delete user from project, course, campus 2015-06-28 17:16:36 +03:00
Aran Zaiger 1574b7e19e IMPORTANT: alot of function name changes and new Doc 2015-06-28 16:48:01 +03:00
Aran Zaiger 664fcedca0 added Message routes. create, get and delete function are available. 
doc should be updated
 2015-06-28 15:48:39 +03:00
Aran Zaiger e07deaddb2 removed messages from course 2015-06-28 15:47:39 +03:00
Aran Zaiger 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
Aran Zaiger 695d052cf0 change in function name 2015-06-24 21:54:02 +03:00
Aran Zaiger 4b89432520 added: - memberId list property 2015-06-24 20:23:50 +03:00
Aran Zaiger 7c5115869c change delete campus name 2015-06-24 20:23:22 +03:00
Aran Zaiger af98c69723 added getProjectsByUser and joinProject function 2015-06-24 20:09:13 +03:00
Aran Zaiger 0ae7101e30 added projects_id_list propery 2015-06-24 20:01:55 +03:00
Aran Zaiger 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
Aran Zaiger 330304cd4c added getCampusesByUser function 2015-06-24 19:57:40 +03:00
Sagi Dayan 21060e7e5f Merge pull request #65 from sagidayan/API_Dev 
Api dev
 2015-06-24 12:41:43 +03:00
Aran Zaiger 72d3036c2a fix #62 2015-06-24 01:20:53 +03:00
Aran Zaiger 90909c7c2f fix #61 2015-06-24 01:16:51 +03:00
Aran Zaiger dc6070fe29 added functions: addUserToCampus, addUserToCourse 
also, getUserByToken now returns the campuses themselfs
 2015-06-24 00:54:55 +03:00
Aran Zaiger 868b7fad8a some organizing 2015-06-24 00:50:59 +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
Sagi Dayan 811593dbb1 Crate New Task UI Tweaks 2015-06-23 20:26:05 +03:00
Sagi Dayan 89c16b8ecc Merge pull request #59 from sagidayan/UI 
- create course - added
 2015-06-23 19:56:10 +03:00
Sagi Dayan 0a02aaf692 Reverting Arans commit on testing 2015-06-23 19:55:58 +03:00
Sagi Dayan 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
Aran Zaiger 41b62be4ec added deleteTask and deleteTaskComponents functions 2015-06-23 00:28:29 +03:00
Aran Zaiger 6b8debec47 MERGE WARNING! 
didnt touch it but it wants commit...
 2015-06-23 00:13:03 +03:00
Aran Zaiger 0460d9b666 added function: getAllFutureTasks 2015-06-23 00:10:39 +03:00
Aran Zaiger 87135a1ec2 added Doc path 2015-06-22 23:28:21 +03:00
Sagi Dayan 5a118075c4 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-06-22 22:38:06 +03:00
Sagi Dayan 3f73ec2563 Merge pull request #57 from sagidayan/QA 
Qa
 2015-06-22 22:37:58 +03:00
Sagi Dayan 454c81d16b Create New Task Page - Fully functional. need submit button 2015-06-22 22:37:47 +03:00
Sagi Dayan 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
Sagi Dayan 4deeb3084f Merge branch 'master' into UI 2015-06-22 13:16:38 +03:00
Matan Bar Yosef dae9fee0a4 -DashBoard pattern and messages - fixed 
-Project evaluation pattern - added
 2015-06-22 13:14:06 +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 b1de4f2875 Merge pull request #53 from sagidayan/API_Dev 
Api dev
 2015-06-22 08:18:39 +03:00
Aran Zaiger f1d73aab64 some doc 2015-06-22 01:38:14 +03:00
Aran Zaiger 346d5b4aaa added 'id' key in JSON response 2015-06-22 01:38:01 +03:00
Aran Zaiger e9e10bd980 added delete functions + doc to campus, course, project 2015-06-22 01:26:23 +03:00
Aran Zaiger 431a36760d fix auto.doc bug 2015-06-22 01:25:35 +03:00
Aran Zaiger c6c175ca29 #52 bug fix. change in documentation 2015-06-21 23:56:49 +03:00
Aran Zaiger cd0fb3cf4f Task Rework - chaged parameters 
added components module and creation in create task
                          added getTaskComponents function
 2015-06-21 23:53:39 +03:00
etyemyer d601f7ffb4 Merge remote-tracking branch 'origin/QA' into QA 
Conflicts:
	Testing/CampusAPI_Test.py
	Testing/UserAPI_Test.py
	Testing/config.py
 2015-06-21 23:27:06 +03:00
etyemyer 09a64f9bdb Merge branch 'master' of https://github.com/sagidayan/SE-Hub into QA 2015-06-21 23:25:11 +03:00