|
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 |
|
|
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 |
|
|
44aaa5c08f
|
Fixing A BAAAD Commit
|
2015-06-22 13:04:21 +03:00 |
|
|
b1de4f2875
|
Merge pull request #53 from sagidayan/API_Dev
Api dev
|
2015-06-22 08:18:39 +03:00 |
|
|
f1d73aab64
|
some doc
|
2015-06-22 01:38:14 +03:00 |
|
|
346d5b4aaa
|
added 'id' key in JSON response
|
2015-06-22 01:38:01 +03:00 |
|
|
e9e10bd980
|
added delete functions + doc to campus, course, project
|
2015-06-22 01:26:23 +03:00 |
|
|
431a36760d
|
fix auto.doc bug
|
2015-06-22 01:25:35 +03:00 |
|
|
c6c175ca29
|
#52 bug fix. change in documentation
|
2015-06-21 23:56:49 +03:00 |
|
|
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 |
|
etyemyer
|
dbf160a7b9
|
Updated tests and added deleted tests
|
2015-06-21 23:19:44 +03:00 |
|
|
7729b3d884
|
taskComponents
|
2015-06-21 22:34:07 +03:00 |
|
|
0be52f2b0a
|
Merged Conflict FIX API_Dev -> MASTER
|
2015-06-21 22:29:47 +03:00 |
|
|
94a9c3dbb0
|
Begining of add new tesk
|
2015-06-21 22:27:48 +03:00 |
|
|
3f272dc304
|
garbage commit
|
2015-06-21 22:22:13 +03:00 |
|
|
7bb9bb9bfb
|
Added get_campus_by_campusName function
|
2015-06-21 22:19:49 +03:00 |
|
|
5678fa7a9b
|
Added Task module and functions
|
2015-06-21 22:19:24 +03:00 |
|
|
fa12024197
|
Added messages functions
|
2015-06-21 22:18:48 +03:00 |
|
|
19aa25de2a
|
Merge pull request #50 from sagidayan/UI
- Add message for lecturer - ADDED
|
2015-06-20 16:25:07 +03:00 |
|
Matan Bar Yosef
|
badcf43151
|
- Lecturer / Student Mode added
- TODO fix previous text input from (add message by lecturer)
|
2015-06-20 14:58:30 +03:00 |
|
Matan Bar Yosef
|
3c48e3fbe9
|
- Add message for lecturer - ADDED
- Clear all messages for lecturer - ADDED
- Overflow - FIXED
|
2015-06-20 14:21:32 +03:00 |
|
etyemyer
|
9d5cc26abd
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into QA
|
2015-06-19 07:48:15 +03:00 |
|
|
4221439085
|
Added a js chart lib + example in settings
|
2015-06-19 00:02:06 +03:00 |
|
|
5b6e6e9298
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-06-18 23:26:58 +03:00 |
|
|
da224b25d8
|
Settings: Now Updating the user via API call
|
2015-06-18 23:26:51 +03:00 |
|
|
c281a5963d
|
Merge pull request #49 from sagidayan/UI
Ui
|
2015-06-18 23:25:59 +03:00 |
|
Matan Bar Yosef
|
94cf0447e4
|
- tasks.html added
- tasksController added
- app.js updated when '/tasks'
- mainController updated '/tasks'
|
2015-06-18 23:21:09 +03:00 |
|
|
c03a3cef69
|
small fix
|
2015-06-18 21:30:25 +03:00 |
|
|
cfb2dbc4cd
|
small syntax fix
|
2015-06-18 21:30:09 +03:00 |
|
Matan Bar Yosef
|
a2b763e00d
|
- feed design Fixed
|
2015-06-18 21:13:31 +03:00 |
|
|
af608da379
|
Home Animation Only Once fix
|
2015-06-18 00:04:36 +03:00 |
|
|
83b252249d
|
Home Animation
|
2015-06-17 23:58:59 +03:00 |
|
|
300c1074f8
|
Merge pull request #48 from sagidayan/UI
Home Page - feed pattern added
|
2015-06-17 23:19:09 +03:00 |
|
etyemyer
|
faad6dae00
|
Added Tests CoursesApi - course create
UserApi - Fixed tests
|
2015-06-17 23:18:13 +03:00 |
|
Matan Bar Yosef
|
ee7e023d56
|
- removed md-list "no style" and other styling
- feed pattern Added
|
2015-06-17 23:16:49 +03:00 |
|
|
42f8d27b94
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-06-17 22:46:32 +03:00 |
|
|
51d11cac93
|
More Setings UI Tweaks
|
2015-06-17 22:46:26 +03:00 |
|
|
3756d8b2a6
|
Merge pull request #47 from sagidayan/UI
Ui
|
2015-06-17 22:45:52 +03:00 |
|