Arthur Barrett
cd4bec8750
merged master branch into feature/abarrett/lms-notes-app
2013-05-07 12:32:22 -04:00
Arthur Barrett
ceefdf0161
user must be authenticated to view notes tab
2013-05-06 15:52:32 -04:00
Greg Price
00729a8c13
Add an omnipresent help tab to the LMS
...
The help tab opens a modal dialog that directs the user at various resources
(e.g. the site FAQ and course forums) and allows the user to submit feedback
to the feedback endpoint (which will ultimately create a ticket for the
student support team).
2013-05-06 13:35:52 -04:00
Arthur Barrett
7120998938
refactoring notes js
2013-03-21 17:18:45 -04:00
Arthur Barrett
0710bbd70c
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-03-19 13:43:45 -04:00
Arthur Barrett
20767d5cc7
create notes djangoapp for annotator.js
2013-03-15 12:41:52 -04:00
Calen Pennington
6b64b4214f
Make relative imports explicitly relative
2013-03-15 11:23:22 -04:00
Calen Pennington
2113541632
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
.ruby-version
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/models/settings/course_metadata.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/modulestore/tests/factories.py
2013-03-12 07:23:28 -04:00
Brian Wilson
aee7d85694
fix bug in tabs
2013-03-07 02:01:42 -05:00
Brian Wilson
b5ab766092
initial framework for htmlbook
2013-03-06 17:57:33 -05:00
Calen Pennington
1bfb933518
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
cms/templates/edit_subsection.html
cms/templates/overview.html
cms/templates/unit.html
cms/templates/widgets/header.html
common/djangoapps/course_groups/tests/tests.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/js/src/.gitignore
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml_exporter.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/views.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-04 16:33:40 -05:00
Brian Wilson
f0258b8dd0
first pass at pdfbook
2013-02-13 18:01:44 -05:00
Calen Pennington
bd822b9d2f
Fix tests post-merge
2013-02-13 14:13:22 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Calen Pennington
4d8165b2b6
Remove bad import of replace_urls
2013-02-05 11:06:46 -05:00
Calen Pennington
04879a83d3
Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible
2013-02-05 11:06:45 -05:00
Vik Paruchuri
b22bad7fa1
Add in some removed imports (fix tests)
2013-01-31 17:11:44 -05:00
Vik Paruchuri
01f218b7f8
Fix some tab issues from the rebase
2013-01-29 21:36:55 -05:00
Vik Paruchuri
fde370bd92
Fix notification issue, sanitize input html
2013-01-29 21:24:04 -05:00
Vik Paruchuri
bd0b933ff2
Highlight the correct tab
2013-01-29 21:24:04 -05:00
Vik Paruchuri
665fb707b1
Cache notifications for 5 mins so that we don't hit the grading server on every web request
2013-01-29 21:24:03 -05:00
Vik Paruchuri
6412eb4080
Fix naming for overall need to check
2013-01-29 19:39:24 -05:00
Vik Paruchuri
d3d4e557d6
Fix notification display
2013-01-29 19:31:03 -05:00
Vik Paruchuri
457afaaeda
Making tab render properly for open ended notifications
2013-01-29 19:31:03 -05:00
Vik Paruchuri
0f212cc8f2
Fix course id passing, template rendering
2013-01-29 19:31:02 -05:00
Vik Paruchuri
22a2bdaa3d
Disable student problem list caching, build out notifications
2013-01-29 19:30:04 -05:00
Vik Paruchuri
4112f8ad8e
Pass back dictionaries where needed from notifications functions
2013-01-29 19:30:04 -05:00
Vik Paruchuri
68db8b0d77
Refactor tab logic, start adding in combined notifications view
2013-01-29 19:30:04 -05:00
Vik Paruchuri
693337593e
Properly parse url for grading controller
2013-01-29 19:30:03 -05:00
Vik Paruchuri
b0599ea133
Fix queries and some controller query stuff
2013-01-29 19:30:03 -05:00
Vik Paruchuri
2191f3e228
Add in open ended problems view
2013-01-29 19:30:03 -05:00
Vik Paruchuri
fe77bb00c4
Fix naming for overall need to check
2013-01-29 19:25:56 -05:00
Vik Paruchuri
5e63a4690b
Work on getting combined notifications
2013-01-29 19:25:56 -05:00
Vik Paruchuri
d28228639e
Add in controller query stuff
2013-01-29 19:25:56 -05:00
Chris Dodge
22695d80c7
Merge branch 'master' into feature/cdodge/cms-master-merge4
...
Conflicts:
common/djangoapps/student/models.py
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/xml_module.py
jenkins/test.sh
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/django_comment_client/models.py
requirements.txt
2013-01-17 09:15:37 -05:00
Vik Paruchuri
ef2b069409
Add staff grading notifications
2013-01-15 15:34:09 -05:00
Vik Paruchuri
301293f8b0
Remove debug statement, fix active page issue on problem page
2013-01-15 14:33:38 -05:00
Vik Paruchuri
7b1262f667
Fix up authentication, other things
2013-01-15 14:31:02 -05:00
Vik Paruchuri
4353c4ab05
Clean up some logic
2013-01-14 15:16:06 -05:00
Vik Paruchuri
cc56e47633
Fix active page issue
2013-01-14 15:12:54 -05:00
Vik Paruchuri
4ffa00b400
Add in notifications, peer grading tab, tab image
2013-01-14 15:00:13 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
Victor Shnayder
f5d9e963cc
Initial wiring of a staff grading tab.
...
- no actual functionality, but have a tab that renders static html via a view
2012-11-30 09:51:33 -05:00
Victor Shnayder
6b5125c4df
fix typos, logger configs
2012-11-30 09:51:33 -05:00
Victor Shnayder
793354a0dc
remove (almost) all references to askbot.
2012-10-30 18:23:07 -04:00
Chris Dodge
f0b4371c90
addressed Cale's feedback
2012-10-30 16:01:28 -04:00
Chris Dodge
ba15735214
implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff
2012-10-25 14:27:26 -04:00
Calen Pennington
b52ed48221
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/xmodule/js/src/html/display.coffee
lms/envs/common.py
2012-10-23 13:38:11 -04:00
Carlos Andrés Rocha
f1120a1139
Removed unused import
2012-10-12 17:39:05 -04:00
Carlos Andrés Rocha
e8cd125701
Fix to read utf-8 enconded html files for custom course tabs
2012-10-12 17:36:19 -04:00
