Commit graph

569 commits

Author SHA1 Message Date
Matan Bar Yosef 7d6e78fa5a Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-06-29 22:15:16 +03:00
Aran Zaiger 2d75c01090 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev 2015-06-29 21:48:50 +03:00
Sagi Dayan d86404c3ae API: Projects - more info in returning JSON 2015-06-29 21:48:28 +03:00
Aran Zaiger bd8d8e0e41 fix4 2015-06-29 21:38:47 +03:00
Matan Bar Yosef bc2c8aa1f0 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-06-29 21:34:10 +03:00
Matan Bar Yosef 82f616051c - project (work in progress) 2015-06-29 21:33:57 +03:00
Sagi Dayan d540fc013c Merge pull request #104 from sagidayan/API_Dev
fix3
2015-06-29 21:32:17 +03:00
Aran Zaiger 1c1a2f7b54 fix3 2015-06-29 21:31:47 +03:00
Sagi Dayan 3833ff397c Merge pull request #103 from sagidayan/API_Dev
fix2
2015-06-29 21:29:15 +03:00
Aran Zaiger 83d8420dcb fix2 2015-06-29 21:28:59 +03:00
Sagi Dayan e3481118a3 Merge pull request #102 from sagidayan/API_Dev
fix
2015-06-29 21:23:25 +03:00
Aran Zaiger c8dd5cd327 fix 2015-06-29 21:22:41 +03:00
Sagi Dayan 4b8a67d208 API_Github Conecctor HOT fix - weekly 2015-06-29 21:03:04 +03:00
Sagi Dayan 15172f9687 Merge pull request #100 from sagidayan/UI
Ui
2015-06-29 21:01:51 +03:00
Matan Bar Yosef ab35e946c0 - goldMINE!!!
-location reference fixed
2015-06-29 21:01:30 +03:00
Sagi Dayan 7f9f8841f6 Merge pull request #99 from sagidayan/API_Dev
added getProjectById function
2015-06-29 21:01:26 +03:00
Aran Zaiger 1d166d0226 added getProjectById function 2015-06-29 20:59:42 +03:00
Matan Bar Yosef 23e8780dd6 - patterns in explor - fixed 2015-06-29 20:33:23 +03:00
Matan Bar Yosef 8aae6ab869 - myProject - location path fixed 2015-06-29 20:28:20 +03:00
Sagi Dayan ef92b56490 Merge pull request #98 from sagidayan/UI
-student mode fixed
2015-06-29 20:21:32 +03:00
Matan Bar Yosef 55fb0cbc0d -student mode fixed 2015-06-29 20:21:05 +03:00
Sagi Dayan 5e39cd1bb8 Merge pull request #94 from sagidayan/QA
Qa
2015-06-29 20:21:05 +03:00
Sagi Dayan 4dda9175d9 Merge pull request #97 from sagidayan/API_Dev
added data verification
2015-06-29 20:20:51 +03:00
Aran Zaiger cbde856845 fix 2015-06-29 20:19:36 +03:00
Aran Zaiger 8912ca07fa Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev 2015-06-29 20:14:10 +03:00
Aran Zaiger e8647534ac added data verification 2015-06-29 20:11:09 +03:00
Sagi Dayan 9fec73008c Merge pull request #96 from sagidayan/UI
-Graphs - fixed
2015-06-29 20:05:30 +03:00
Matan Bar Yosef e19f4fd03a -Graphs - fixed 2015-06-29 20:04:33 +03:00
Sagi Dayan 7065a645ce Merge pull request #95 from sagidayan/API_Dev
added schedualed project updates
2015-06-29 19:54:11 +03:00
Aran Zaiger ec01ac7a94 added schedualed project updates 2015-06-29 19:53:22 +03:00
etyemyer a6c162fc92 Updated User Tests. 2015-06-29 19:24:41 +03:00
Sagi Dayan d0ec66a192 Merge pull request #93 from sagidayan/UI
Ui
2015-06-29 19:23:55 +03:00
Matan Bar Yosef 252f4440c6 -Class added
-project Added
2015-06-29 19:23:14 +03:00
Matan Bar Yosef 61d40b4b25 -Class added
-project Added
2015-06-29 19:22:52 +03:00
Sagi Dayan 27ee77deed Merge pull request #91 from sagidayan/API_Dev
fix function
2015-06-29 19:22:44 +03:00
Aran Zaiger b1f1400628 fix function 2015-06-29 19:21:18 +03:00
Matan Bar Yosef 42a5e8b108 - myProjects (work in progress) 2015-06-29 19:20:56 +03:00
Sagi Dayan 82dd89ce8f Merge pull request #90 from sagidayan/API_Dev
only lecturer can join other campus
2015-06-29 17:58:57 +03:00
Aran Zaiger c02926d6b4 only lecturer can join other campus 2015-06-29 17:58:12 +03:00
Sagi Dayan 7d6050d775 Merge pull request #89 from sagidayan/UI
Ui
2015-06-29 17:58:08 +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
Sagi Dayan 6bc9420038 API_Github Conecctor finished 2015-06-29 17:56:58 +03:00
etyemyer ddfbbc04fe Merge branch 'master' of https://github.com/sagidayan/SE-Hub into QA 2015-06-29 17:50:31 +03:00
etyemyer d0d6ed3851 Courses API changes added 2015-06-29 17:45:02 +03:00
etyemyer ad0451e721 Courses API changes added 2015-06-29 17:44:46 +03:00
etyemyer 66197ad816 added tests 2015-06-29 17:14:36 +03:00
Matan Bar Yosef d45bdb534b Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-06-29 16:52:43 +03:00
Sagi Dayan 7cfe2f527d Hot Fix Stat API 2015-06-29 16:52:25 +03:00
Matan Bar Yosef 87c67584f4 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-06-29 16:50:30 +03:00
Sagi Dayan f514686442 Hot Fix Stat API 2015-06-29 16:50:16 +03:00