Commit Graph

75 Commits

Author SHA1 Message Date
Matt Drayer
a8f909fe77 Merge pull request #8659 from edx/ziafazal/SOL-1006
ziafazal/SOL-1006: Disable course 'start date' for inactive web-enabled certificates
2015-07-06 16:45:24 -04:00
Peter Fogg
46ea862f04 Fix not being able to set course passing grades above 80%. 2015-07-01 09:08:39 -04:00
Zia Fazal
bcbd1464d4 New course cannot be started till web certificate is active
fixed broken test

changes based on feedback on 6/24

fixed broken unit test after feedback changes

added more checks and updated tests

fixed broken bok choy test

Fixed pylint quality error

trying to fix pylint quality error
2015-06-29 12:53:21 +05:00
zubair-arbi
3204c8b3fe show credit eligibility requirements in studio
ECOM-1591
2015-06-12 13:19:57 +05:00
Davorin Sego
176b1c8962 Course Discovery - Language Filtering
Filter by Language:
Designation for course language(s) in Studio
allows for filtering of courses based on their language in the sidebar
Reuses active filter view UI/IA from find courses page on edx.org
view for clearing individual or all filters, as with edx.org filtering
2015-06-01 10:45:51 +02:00
David Baumgold
2159d34128 Added a simple XBlockMixin for courseware licenses
This allows course authors to choose between two difference licenses for their
course content: All Rights Reserved, or Creative Commons. In the backend, XBlocks
that wish to allow custom licenses need only inherit from LicenseMixin, which
adds a `license` field as a string.

License information is displayed in the Studio editor view, and just below the
rendered XBlock in the LMS. In addition, if the course block itself has a custom
license set, this license will display just below the main body of the page
on courseware pages.

This entire feature is gated behind the LICENSING feature flag.
2015-05-18 14:34:28 -04:00
louyihua
7a45d6e471 i18n fix in studio
1. Fix the broken `gettext()` call in `courde_detail.js`
2. Change the string to avoid Transifex misunderstand the pattern '% o' in `checklist.underscore`.
3. Embed the `{filename}` part inside the string in `transcripts-choose.underscore` to provide better i18n flexibililty.
4. Remove all the call of `gettext()` and `${_()}` inside the `mock` directory to aovid mis-extraction by pybabel. (It seems that the `mock` directory is soly used in test? So the strings in this directory need not to be extracted and translated?)
5. The unicode char `\u2014` will trigger a bug inside pybabel which makes the extracted string untranslatable, so remove this char.
2015-04-13 19:00:52 +08:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
zubair-arbi
f62e5347e1 round-off weight, min_count and drop_count values while returing grading policy
TNL-884
2014-12-11 12:27:01 +05:00
polesye
b6d8291996 TNL-772: Fix course time settings. 2014-11-20 14:56:12 +02:00
Oleg Marshev
f020d1c584 Show date and time on Schedules and Details in UTC (TNL-85). 2014-10-03 11:17:00 +03:00
cahrens
a4b172d9d8 Display names, help text, and "deprecated" for Advanced Settings.
STUD-302, STUD-303
2014-06-26 16:54:22 -04:00
Ali Reza Sharafat
85058ec460 Course short descriptions -- couple of more asserts and pep8 fixes 2014-02-12 20:24:26 +00:00
zubiar-arbi
2f1e696621 add validation for grading types (allow only integers)
STUD-988
2013-12-31 14:35:25 +05:00
zubiar-arbi
4cb03f43a2 Grading types should not allow empty field for "Total Number" and "Number of Droppable"
STUD-988
2013-12-26 13:51:53 +05:00
Don Mitchell
17864353a5 Restful course settings
STUD-946
STUD-947
2013-11-22 10:55:35 -05:00
cahrens
8c080b6fb6 Acceptance test for fixing rounding error on weight. 2013-10-10 12:02:21 -04:00
cahrens
3ed2fcbb31 Parse floats to ints in CourseGrader model.
Fixes STUD-826.
2013-10-10 12:02:21 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Peter Fogg
7fc8fcde7b Merge pull request #752 from edx/peter-fogg/unlimited-graceperiod
Allow grace periods of > 24 hours.
2013-08-21 13:00:15 -07:00
Peter Fogg
eb5b6cc6ea Allow grace periods of > 24 hours. 2013-08-21 14:37:12 -04:00
Peter Fogg
e4302e62d2 Allow course image uploads in the settings page.
Authors can upload an image (or choose an existing one) from the
settings page, using the in-context uploader from PDF
textbooks. Includes tests for backwards compatibility with XML courses
-- they used a magic filename (images/course_image.jpg) which is
mapped to a location in the Mongo contentstore.

Still needs some UX work, though the backend plumbing is there.
2013-08-21 09:42:00 -04:00
Giulio Gratta
464141c72a changing http:// to // on intro video urls to prevent browsers from blocking video embeds 2013-08-09 14:13:41 -07:00
David Baumgold
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -04:00
Peter Fogg
6e94960488 Fix many validation bugs and failing tests. 2013-07-11 16:09:59 -04:00
Peter Fogg
c2f0b7d4e9 Fix validation in many cases, and ensure that the notification bar pops up correctly. 2013-07-11 15:53:51 -04:00
Peter Fogg
ec13349ae3 Remove outdated deleteKeys from advanced settings. 2013-07-11 09:11:59 -04:00
Peter Fogg
9094f1890b Change course settings to require explicit save.
Rather than asynchronously saving when a setting is updated, we now
prompt the user to confirm their changes and only persist the data if
they hit the save button. Lettuce tests are updated to expect this
behavior and some new ones are added.
2013-07-11 09:11:07 -04:00
David Baumgold
c6c5e50d86 Hook up notification framework to default AJAX error callback
And delete `CMS.ServerError`
2013-05-22 15:55:49 -04:00
David Baumgold
7f69e45b9e whitespace changes 2013-05-08 09:29:20 -04:00
cahrens
fa63bcce94 Allow clearing of dates (except for course start date).
https://edx.lighthouseapp.com/projects/102637/tickets/231
2013-03-25 17:25:49 -04:00
cahrens
99f55266f5 Do not need to pass blacklist keys to client. 2013-03-12 09:27:46 -04:00
cahrens
7e8fcb85ff Updated Selenium test, deleted dead code related to Advanced Settings. 2013-03-11 16:56:24 -04:00
Don Mitchell
de3a75d29d Don't prepopulate models which may have script tags in their payloads
but fetch async via json get.
2013-03-04 12:54:58 -05:00
Don Mitchell
e55bb845b2 Fix for script tags w/in json objects being oddly evaluated on html page
load by doing load separately. In process, upgraded backbone which
necessitated changing getByCid to get and got rid of obsolete
course_settings master object.
2013-03-01 16:05:58 -05:00
Carlos Andrés Rocha
2ca303c95d Merge pull request #1526 from MITx/feature/cas/manual-policy-merged
Feature/cas/manual policy merged
2013-02-27 09:02:07 -08:00
Don Mitchell
bb0ad61f81 Somehow the saves changed to just sets w/ don't send data to the server. 2013-02-25 12:13:50 -05:00
Don Mitchell
116c74c075 Highlighting of field labels and smarter decision as to when to show the
save cancel bar.
2013-02-21 13:27:36 -05:00
Brian Talbot
ad770a5ec8 studio - manual policy editor: converting to new page layout - WIP 2013-02-20 14:24:13 -05:00
cahrens
6981ba4e3f Get Save and Cancel working. 2013-02-19 17:08:10 -05:00
cahrens
f91060d197 Merge branch 'master' into feature/cas/manual-policy
Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py
2013-02-19 13:27:35 -05:00
Don Mitchell
c9c026be62 Fixed urls 2013-02-12 12:15:07 -05:00
Brian Talbot
7ca267fd78 studio - debugging grading settings JS errors WIP 2013-02-12 11:56:54 -05:00
Don Mitchell
773dfce68d Try to make server and validation errors work together. Getting double
errors when there are parent and child views both defining on error
handlers still.
2013-02-11 12:04:45 -05:00
Don Mitchell
9cd1162a60 Grading and details split out. Put the unimplemented tabs into a single
file not used.
2013-02-07 14:45:24 -05:00
Don Mitchell
7b3c81ca53 blacklist violations now properly trigger violation error
delete keys only after save completes
2013-02-06 17:25:12 -05:00
cahrens
c243eec604 Move to view file. 2013-02-06 15:29:17 -05:00
cahrens
08ce212bd5 Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy
Conflicts:
	cms/static/js/models/settings/advanced.js
2013-02-06 10:35:12 -05:00
cahrens
8093de1d93 Set size of ACE Editor. 2013-02-06 09:49:27 -05:00