Commit graph

Select branches

Hide pull requests

API_Dev

QA

UI

master

#100

#102

#103

#104

#105

#108

#109

#114

#115

#116

#117

#118

#128

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#170

#19

#20

#21

#22

#26

#27

#28

#29

#30

#31

#32

#34

#38

#40

#41

#44

#45

#47

#48

#49

#50

#51

#53

#55

#56

#57

#58

#59

#60

#65

#66

#67

#73

#77

#78

#80

#82

#83

#84

#85

#86

#87

#88

#89

#90

#91

#93

#94

#95

#96

#97

#98

#99

Mono Color

• 163a711f0f - Create Class reference - fixed Matan Bar Yosef 2015-06-27 14:52:49 +0300
• 191924a732 - work in progress (creating course - reference) Matan Bar Yosef 2015-06-27 14:36:20 +0300
• eb1240f3c4 - Main menu nav - My Projects reference fixed to user projects Matan Bar Yosef 2015-06-27 14:20:21 +0300
• b630f0d696 - Main menu nav - Project reference fixed Matan Bar Yosef 2015-06-27 12:58:04 +0300
• c64b865f3d - Fixed reference in thisProject/:projectId Matan Bar Yosef 2015-06-27 12:48:11 +0300
• 380228947b -Bugs fixing Matan Bar Yosef 2015-06-27 12:45:44 +0300
• 18ca8df227 - campuses fixed Matan Bar Yosef 2015-06-26 21:56:41 +0300
• 91ac400452 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI Matan Bar Yosef 2015-06-26 16:58:55 +0300
• 5ec2ed20bd Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI Matan Bar Yosef 2015-06-26 16:55:26 +0300
• f3226e0896 - work in progress Matan Bar Yosef 2015-06-26 16:49:46 +0300
• 1d5cbb18cd Profile - Edit And Delete Buttons Visible Only If Permitted Sagi Dayan 2015-06-26 15:34:07 +0300
• cc3d65037d First Step Of Independed Profile. ID oriented. Needs Classes List Sagi Dayan 2015-06-26 15:13:26 +0300
• 1c32ed9e56 API: Added /api/campuses/getCampusesByUserID/ Sagi Dayan 2015-06-26 15:07:26 +0300
• 43de4f9b80 apiServices: Added GetUserById & get GetCampusByUserId Sagi Dayan 2015-06-26 15:06:59 +0300
• 0e37e51b4d API: Added Get User By ID Sagi Dayan 2015-06-26 14:55:08 +0300
• 0ccc8ba1dd API Hot Fix. fixed syntax Error Sagi Dayan 2015-06-26 14:54:16 +0300
• 9ddc035443 apiServices - Added token Param in to getCamusesByUser Sagi Dayan 2015-06-26 14:53:40 +0300
• 42210f73d5 API Docs - index UI Sagi Dayan 2015-06-26 14:52:33 +0300
• 9d49ba5f0a #72 - cleand up main menu & added ID to routes Sagi Dayan 2015-06-26 14:08:23 +0300
• 2f870ba050 #68 Added Link & RadioButtons components to Task generator Sagi Dayan 2015-06-25 22:40:26 +0300
• 2a55d7f898 API Doc Fix Sagi Dayan 2015-06-25 20:45:43 +0300
• e135ee020a Changed settings into profile. + in controller Sagi Dayan 2015-06-25 00:10:08 +0300
• e3fe428900 API: getUserByToken returs user id now Sagi Dayan 2015-06-25 00:04:04 +0300
• b3e5ce4716 Merge pull request #67 from sagidayan/UI Sagi Dayan 2015-06-24 22:47:40 +0300
• 73eef42871 Merge pull request #73 from sagidayan/API_Dev Sagi Dayan 2015-06-24 22:43:52 +0300
• 559d235bc9 - thisProject Added Matan Bar Yosef 2015-06-24 22:43:02 +0300
• 18ad25f18d MERGE WARNING!! deleted CourseAPI_test from my rep. i think this file doesnt exist in @etyemy rep aswell aranzaiger 2015-06-24 21:57:31 +0300
• 695d052cf0 change in function name aranzaiger 2015-06-24 21:54:02 +0300
• e2bd575ca7 - Campuses -> Courses -> Projects (Addition) Matan Bar Yosef 2015-06-24 21:35:55 +0300
• 0cce80ed98 - Campuses -> Courses -> Projects Matan Bar Yosef 2015-06-24 21:35:21 +0300
• 4b89432520 added: - memberId list property aranzaiger 2015-06-24 20:23:50 +0300
• 7c5115869c change delete campus name aranzaiger 2015-06-24 20:23:22 +0300
• af98c69723 added getProjectsByUser and joinProject function aranzaiger 2015-06-24 20:09:13 +0300
• 0ae7101e30 added projects_id_list propery aranzaiger 2015-06-24 20:01:55 +0300
• b7b44df479 added getCoursesByUser function, some added parameters to Messages, and now adding a student to a created course aranzaiger 2015-06-24 20:00:30 +0300
• 330304cd4c added getCampusesByUser function aranzaiger 2015-06-24 19:57:40 +0300
• b19b60b58b Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI Matan Bar Yosef 2015-06-24 19:11:44 +0300
• a942f7e486 New Task UI Tweak Sagi Dayan 2015-06-24 17:27:20 +0300
• 1b3aaea1ff Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI Matan Bar Yosef 2015-06-24 14:26:13 +0300
• ba5939c437 - Create course api -fixed Matan Bar Yosef 2015-06-24 14:01:08 +0300
• 049c36c916 Fixed HRef Sagi Dayan 2015-06-24 13:42:32 +0300
• 5f53e3ff85 Fixing Register POPUP Sagi Dayan 2015-06-24 13:28:27 +0300
• 522a71d9c4 Merge branch 'master' of github.com:sagidayan/SE-Hub Sagi Dayan 2015-06-24 13:18:09 +0300
• ad45ee787d Merge pull request #66 from sagidayan/UI Sagi Dayan 2015-06-24 13:17:58 +0300
• 23d287e59a POST -> PUT in update user Sagi Dayan 2015-06-24 13:16:19 +0300
• 38ae45aa95 - add choose project from dashboard Matan Bar Yosef 2015-06-24 13:13:58 +0300
• d32b09b712 Fixed Token Issue in Register Controller Sagi Dayan 2015-06-24 13:07:17 +0300
• f26472ba5b #64 #35 New Task Tweaks Sagi Dayan 2015-06-24 12:52:44 +0300
• c9c54dd3f0 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into QA etyemyer 2015-06-24 12:44:34 +0300
• 1f74a88db1 Updated tests and added deleted tests etyemyer 2015-06-24 12:42:55 +0300
• 21060e7e5f Merge pull request #65 from sagidayan/API_Dev Sagi Dayan 2015-06-24 12:41:43 +0300
• 72d3036c2a fix #62 aranzaiger 2015-06-24 01:20:53 +0300
• 90909c7c2f fix #61 aranzaiger 2015-06-24 01:16:51 +0300
• dc6070fe29 added functions: addUserToCampus, addUserToCourse also, getUserByToken now returns the campuses themselfs aranzaiger 2015-06-24 00:54:55 +0300
• 868b7fad8a some organizing aranzaiger 2015-06-24 00:50:59 +0300
• 3c8c262fe6 Merge pull request #60 from sagidayan/UI Sagi Dayan 2015-06-23 20:36:37 +0300
• 88906c30a8 - my classes fixed buttons Matan Bar Yosef 2015-06-23 20:34:26 +0300
• 7a4f669f90 Typo in projectsController Sagi Dayan 2015-06-23 20:32:29 +0300
• 811593dbb1 Crate New Task UI Tweaks Sagi Dayan 2015-06-23 20:26:05 +0300
• 89c16b8ecc Merge pull request #59 from sagidayan/UI Sagi Dayan 2015-06-23 19:56:10 +0300
• 0a02aaf692 Reverting Arans commit on testing Sagi Dayan 2015-06-23 19:55:58 +0300
• cace7be507 Merge pull request #58 from sagidayan/API_Dev Sagi Dayan 2015-06-23 19:55:08 +0300
• ff9ea86131 - Files Added: myClasses, newcourse, projects, tasks Matan Bar Yosef 2015-06-23 19:40:30 +0300
• 1d5655b056 - create course - added Matan Bar Yosef 2015-06-23 19:04:41 +0300
• 41b62be4ec added deleteTask and deleteTaskComponents functions aranzaiger 2015-06-23 00:28:29 +0300
• 6b8debec47 MERGE WARNING! didnt touch it but it wants commit... aranzaiger 2015-06-23 00:13:03 +0300
• 0460d9b666 added function: getAllFutureTasks aranzaiger 2015-06-23 00:10:39 +0300
• 87135a1ec2 added Doc path aranzaiger 2015-06-22 23:28:21 +0300
• 5a118075c4 Merge branch 'master' of github.com:sagidayan/SE-Hub Sagi Dayan 2015-06-22 22:38:06 +0300
• 3f73ec2563 Merge pull request #57 from sagidayan/QA Sagi Dayan 2015-06-22 22:37:58 +0300
• 454c81d16b Create New Task Page - Fully functional. need submit button Sagi Dayan 2015-06-22 22:37:47 +0300
• 71ef085662 Merge pull request #56 from sagidayan/UI Sagi Dayan 2015-06-22 20:35:24 +0300
• eb5391cb82 - Projects controller and page - added Matan Bar Yosef 2015-06-22 14:45:50 +0300
• e7e34bcbbd - Create Task button reference to tasks/new Matan Bar Yosef 2015-06-22 14:23:03 +0300
• a702ae9df2 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI Matan Bar Yosef 2015-06-22 13:19:38 +0300
• 4deeb3084f Merge branch 'master' into UI Sagi Dayan 2015-06-22 13:16:38 +0300
• dae9fee0a4 -DashBoard pattern and messages - fixed Matan Bar Yosef 2015-06-22 13:14:06 +0300
• 1e6e3f24f2 -DashBoard pattern and messages - fixed Matan Bar Yosef 2015-06-22 13:06:56 +0300
• 44aaa5c08f Fixing A BAAAD Commit Sagi Dayan 2015-06-22 13:04:21 +0300
• b1de4f2875 Merge pull request #53 from sagidayan/API_Dev Sagi Dayan 2015-06-22 08:18:39 +0300
• f1d73aab64 some doc aranzaiger 2015-06-22 01:38:14 +0300
• 346d5b4aaa added 'id' key in JSON response aranzaiger 2015-06-22 01:38:01 +0300
• e9e10bd980 added delete functions + doc to campus, course, project aranzaiger 2015-06-22 01:26:23 +0300
• 431a36760d fix auto.doc bug aranzaiger 2015-06-22 01:25:35 +0300
• c6c175ca29 #52 bug fix. change in documentation aranzaiger 2015-06-21 23:56:49 +0300
• cd0fb3cf4f Task Rework - chaged parameters added components module and creation in create task added getTaskComponents function aranzaiger 2015-06-21 23:53:39 +0300
• d601f7ffb4 Merge remote-tracking branch 'origin/QA' into QA etyemyer 2015-06-21 23:27:06 +0300
• 09a64f9bdb Merge branch 'master' of https://github.com/sagidayan/SE-Hub into QA etyemyer 2015-06-21 23:25:11 +0300
• dbf160a7b9 Updated tests and added deleted tests etyemyer 2015-06-21 23:19:44 +0300
• 7729b3d884 taskComponents aranzaiger 2015-06-21 22:34:07 +0300
• 0be52f2b0a Merged Conflict FIX API_Dev -> MASTER Sagi Dayan 2015-06-21 22:29:47 +0300
• 94a9c3dbb0 Begining of add new tesk Sagi Dayan 2015-06-21 22:27:48 +0300
• 3f272dc304 garbage commit aranzaiger 2015-06-21 22:22:13 +0300
• 7bb9bb9bfb Added get_campus_by_campusName function aranzaiger 2015-06-21 22:19:49 +0300
• 5678fa7a9b Added Task module and functions aranzaiger 2015-06-21 22:19:24 +0300
• fa12024197 Added messages functions aranzaiger 2015-06-21 22:18:48 +0300
• 19aa25de2a Merge pull request #50 from sagidayan/UI Sagi Dayan 2015-06-20 16:25:07 +0300
• badcf43151 - Lecturer / Student Mode added Matan Bar Yosef 2015-06-20 14:58:30 +0300
• 3c48e3fbe9 - Add message for lecturer - ADDED Matan Bar Yosef 2015-06-20 14:21:32 +0300
• 9d5cc26abd Merge branch 'master' of https://github.com/sagidayan/SE-Hub into QA etyemyer 2015-06-19 07:48:15 +0300