Commit Graph

343 Commits

Author SHA1 Message Date
zubair-arbi
40f270c945 add couse key verification decorator in common for use in both studio and lms
PLAT-88
2014-09-29 13:26:43 +05:00
Stephen Sanchez
3fd3bd4e43 Crude solution to allowing new styles on White Label about pages. 2014-09-25 20:31:18 +00:00
Waheed Ahmed
3c8eacd440 Disabled student view if course is not yet released for students.
LMS-6617
2014-09-22 12:50:46 +05:00
Adam Palay
1b06edb6ff display banner on course info page if user is not enrolled (TNL-286)
write failing tests for info page banner
2014-09-18 11:35:18 -04:00
Adam Palay
e569e090c2 redirect users from about page to info page when there is a marketing site (TNL-286) 2014-09-18 11:35:17 -04:00
Waheed Ahmed
5fd1ade766 Fixed 404 on courseware when users last visited subsection becomes unpublished.
LMS-6492
2014-09-11 18:35:58 +05:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic
Updating EX-60 logic
2014-09-02 13:03:24 -04:00
Waheed Ahmed
2e88e33847 Refactor verify course id decorator and fixed tests. 2014-08-29 16:05:33 +05:00
Don Mitchell
24cdd7a481 Assume any non-xml modulestore is r/w
LMS-11235
2014-08-21 12:11:27 -04:00
Waheed Ahmed
e26efea26f Fixed 500 error on views with incomplete course id in url.
LMS-11217
2014-08-20 18:30:58 +05:00
Will Daly
88ebac4faf Use English for the marketing site buttons in an edx-controlled domain 2014-08-14 16:00:44 -04:00
Julia Hansbrough
b9a285f1e7 Merge pull request #4756 from edx/flowerhack/prof-ed-reg-button
Redirect to show_reqs for prof ed
2014-08-08 17:03:29 -04:00
Julia Hansbrough
91e90b3673 Update redirect and wording for prof ed
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
2014-08-08 21:02:16 +00:00
Nimisha Asthagiri
d2b59cb6e0 get_items API: have qualifiers be a separate parameter instead of assuming kwargs. 2014-08-08 12:38:42 -04:00
Usman Khalid
9599c31aa0 Catch InvalidKeyError in static_tab view.
LMS-11189
2014-08-07 15:41:07 +05:00
Jason Bau
e1fcac93c5 fix shib reg from course about page 2014-07-17 10:51:32 -04:00
Sarina Canelake
666f563ee6 Merge pull request #4418 from Stanford-Online/dcadams/make_registration_button_conditional
Make text on register button on About page conditional.
2014-07-15 16:37:00 -04:00
David Adams
aa1b623904 Make text on register button on About page conditional.
Added a new advanced setting; invitation_only

 If invitation_only display "Enrollment in this course is by invitation only"
 Otherwise, if outside of enrollment period display "Enrollment is Closed"

 This issue is logged at LMS-2670

 Also fixed in this PR is issue LMS-2717; even though the Register button was greyed out,
 clicking it sent one to the registration page.
2014-07-15 12:51:12 -07:00
Calen Pennington
4ded4be700 Fix calls to get_module to not pass course ids as positions 2014-07-15 09:22:04 -04:00
Piotr Mitros
4eb234e79f Merge pull request #4174 from edx/pmitros/chromeless-xblocks
XBlocks can disable navigation chrome.

This allows for full-screen XBlocks (such as code IDEs), as well as allowing us to somewhat hackishly build top-level XBlocks. This is the first step on the path to non-hackish top-level XBlocks.
2014-06-23 11:56:05 -04:00
cahrens
73e7ced6f9 Introduce constants for studio_view, student_view, and author_view. 2014-06-20 11:41:23 -04:00
Piotr Mitros
e644f641ac Explicit disable_accordion 2014-06-20 10:29:17 -04:00
Piotr Mitros
4f303a623b XBlocks can disable navigation chrome.
There is an option to:
* Enable/disable accordion navigation
* Enable/disable/repoint tab navigation

This allows for full-screen XBlocks (e.g. a code IDE, or large video
player). It is also the first pass at allowing top-level XBlocks. It's
also now possible to make a chromeless XBlock, point a tab to it, and
make it point back to that tab.

Next steps down that path would be:
* Fix up how tabs are handled. The current version is a hack.
* Create appropriate XBlocks for courseware, tabbed navigation,
  etc. to reach feature parity
* Invert/rejigger the XML format.
2014-06-19 21:06:08 -04:00
Mat Peterson
c86cbe466c 404 error for unwanted unicode in url
LMS-2488
2014-06-17 16:10:45 +00:00
Mat Peterson
06dbb68e75 courseware/views.py index function position value integer error correction and test
LMS-2844
2014-06-16 20:30:06 +00:00
Sarina Canelake
2aea261d48 Merge branch 'release'
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
2014-06-10 16:59:23 -04:00
Don Mitchell
2c6437a279 Fix performance regression
Remove course_from_id
don't fetch whole course when the root will do
don't fetch even the root if the id will do
check for definition.data == null
2014-06-09 15:10:47 -04:00
Sarina Canelake
0a30f24e26 Merge pull request #3754 from theJohnnyBrown/empty-course-error
show a friendly message for an empty course rather than an error page
2014-05-29 21:07:42 -04:00
Johnny Brown
0bd2286e5b show a friendly message for an empty course rather than an error page 2014-05-29 16:55:40 -05:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library
[LMS-2757]
2014-05-29 17:03:35 -04:00
Sarina Canelake
d1672e31f7 Opaque-keys: fix pylint violations 2014-05-24 19:36:09 -04:00
Sarina Canelake
265fa826ca Opaque-keys: fix pylint violations 2014-05-23 14:23:12 -04:00
Calen Pennington
8699a13b09 Use old deprecated form for instructor api calls, and in staff debug info 2014-05-22 11:24:05 -04:00
Calen Pennington
77b895cb98 Merge pull request #3673 from cpennington/opaque-keys-merge-master
Merge master into opaque-keys
2014-05-15 13:24:50 -04:00
Julia Hansbrough
542dff194e Fix improper parsing of location string 2014-05-13 21:29:30 +00:00
Calen Pennington
94c8d86a42 Fix failing tests from merge with master 2014-05-12 11:34:39 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
2014-05-09 15:29:32 -04:00
Don Mitchell
7be81341d7 Revert StudentModule.module_state_key to field rather than computed property 2014-05-09 10:41:12 -04:00
Calen Pennington
9811926d97 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates lms/djangoapps/courseware.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-06 10:08:32 -04:00
Jason Bau
f8c062b6ce lti 2.0 result service rest endpoint 2014-04-29 12:01:12 -07:00
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
Usman Khalid
e1afbe5011 Merge pull request #3058 from edx/usman/lms2429-unicode-error-fixes
Unicode support fixes
2014-03-28 20:08:27 +05:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Usman Khalid
76e592634a Some more str->unicode fixes in instructor and courseware apps.
LMS-2429
2014-03-26 18:57:02 +05:00
Waheed Ahmed
94af663683 Submission history view not internationalized.
LMS-2167
2014-03-26 13:14:02 +05:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
2014-03-21 13:58:01 -04:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Don Mitchell
16f0d12a1f Merge pull request #2356 from edx/dhm/mixed_ms_wrapper
MixedModulestore wraps most getters, update_item, delete_item
2014-02-10 16:01:50 -05:00
Ned Batchelder
1bd213beba Remove unused imports. 2014-02-10 14:07:50 -05:00
Don Mitchell
b8ea7f3c43 update_item and other refactorings continued 2014-02-05 10:24:24 -05:00