Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,515 Commits 1 Branch 0 Tags
209ddc700dfce5bb0aa151c19dafbac8ae7de2d2
Commit Graph

1069 Commits

Author SHA1 Message Date
Dmitry Viskov
209ddc700d Difficulty selectbox in Studio (based on new XBlockAside functionality). Include: 
- adaptation asides to be imported from the XML
- updating SplitMongo to handle XBlockAsides (CRUD operations)
- updating Studio to handle XBlockAsides handler calls
- updating xblock/core.js to properly init XBlockAsides JavaScript
 2016-03-02 03:37:13 +03:00
Braden MacDonald
cfa7cd3d87 Revert "Pass DOM element, not jQuery object to XBlock initialisation." 2016-02-26 09:06:13 -08:00
Mushtaq Ali
78b6983666 Merge pull request #11597 from edx/mushtaq/ECOM-3760-fix-self-paced-subsection-config 
Fix subsection config for self-paced course
 2016-02-25 20:50:07 +05:00
Ned Batchelder
d8fbdafd90 Update translations (autogenerated message) 2016-02-24 17:59:51 +00:00
Mushtaq Ali
2da452b839 ECOM-3760 fix editors not showing up on subsection config popup for self-paced course 2016-02-24 00:35:05 +05:00
Ned Batchelder
6c3ae8245f Update translations (autogenerated message) 2016-02-17 20:12:36 +00:00
Robert Raposa
b69c6d62bf Make base.html Mako template safe by default 
Make base.html Mako template safe by default by:
1. Add page-level default of html escaping
2. Fix escaping of all variables in base.html
3. Fix escaping of all dependent underscore templates
Also includes additional best practices for certificates and
textbooks JavaScript/Underscore in order to complete that work.

TNL-3425
 2016-02-16 13:19:24 -05:00
Sven Marnach
8280e224f5 Merge pull request #11433 from open-craft/smarnach/studio-add-xblock 
Pass DOM element, not jQuery object to XBlock initialisation.
 2016-02-15 17:24:10 +01:00
Ned Batchelder
4b7dcb2bdd Update translations (autogenerated message) 2016-02-11 12:23:55 +00:00
cahrens
30c42e724d Ensure that window.course is avaiable before anyone accesses it. 
TNL-4106
 2016-02-10 15:59:45 -05:00
Sven Marnach
982c3e623b Pass DOM element, not jQuery object to XBlock initialisation. 
The function initializeXBlock() expects a DOM element, and is passed one in most
cases.  However, when adding a new XBlock component in Studio, the function is
passed a jQuery object, which ends up being forwarded to the actual
initialisation function of the XBlock.
 2016-02-10 18:54:30 +01:00
asadiqbal
64778cdf69 WL-272 2016-02-10 14:33:38 +05:00
Ned Batchelder
bd377587ac Update translations (autogenerated message) 2016-02-04 15:50:17 +00:00
Ned Batchelder
3dcb4b0793 Update translations (autogenerated message) 2016-02-04 14:51:33 +00:00
Diana Huang
1e1f5abe10 Check in new static i18n JS files. 2016-02-01 15:54:14 -05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
J. Cliff Dyer
90493ac3a2 Track push notification activity in analytics 
When a course is updated, track whether or not a push notification is
sent.
 2016-01-27 20:33:21 +00:00
asadiqbal
7f38c1a3c9 WL-270 used gettext in javascript files 2016-01-07 18:08:15 +05:00
Syed Hasan raza
6a24fd66cc Merge pull request #11005 from edx/shr/bug/TNL-2622-course_import_status_message_fix_test 
Shr/bug/tnl 2622 course import status message fix test
 2016-01-04 12:33:45 +05:00
Syed Hasan raza
482e0e457f Merge pull request #10978 from edx/shr/bug/TNL-3809-Sign-in-mutiple-clicks 
Shr/bug/tnl-3809-sign-in-mutiple-clicks
 2016-01-04 12:32:45 +05:00
Syed Hassan Raza
912e012bb7 Add Disabled class to Sign In button 2015-12-31 15:21:29 +05:00
Syed Hassan Raza
fe0740b91e set path explicitly for storing cookie 2015-12-31 15:19:40 +05:00
ibrahimahmed443
f3d43ab5db SOL-1479 set max time limit to 99:59 hours; add jasmine tests to validate time limit 2015-12-21 19:30:49 +05:00
Muhammad Shoaib
788cece45e PHX-161 
- added the new field review_rules for software secure
- added a new tab name "Additional Settings" for the proctored/timed exams
 2015-12-15 14:27:29 -05:00
Jesse Zoldak
83f7ffd743 Revert "set path explicitly for storing cookie" 2015-12-15 13:26:51 -05:00
Syed Hasan raza
920fc0e7de Merge pull request #10506 from edx/shr/bug/TNL-2622-course_import_status_message 
set path explicitly for storing cookie
 2015-12-15 16:44:58 +05:00
Andy Armstrong
5b9e0e9dcf Merge pull request #10957 from edx/andya/studio-xblock-debugging 
Support local debugging of XBlock JavaScript
 2015-12-14 13:05:23 -05:00
Andy Armstrong
cc24ca55e6 Support local debugging of XBlock JavaScript 
It turns out that loading JavaScript with $.getScript
causes Chrome to treat the file as an XHR request
and not JS. I've switched over to using RequireJS
to load the URL which already has the ability to
dynamically load files and have the browser
recognize them.
 2015-12-11 15:50:38 -05:00
Sarina Canelake
ade863e994 Remove CMS Course Checklists feature 2015-12-11 10:32:14 -05:00
Zia Fazal
2cb2233dde initial change set. add org autocomplete 
added unit tests and fixed JS tests

added bok choy tests

fixed broken botchoy tests

fixed course discovery broken test

removed monkey patch at class level

changes after feedback from matte
 2015-12-11 18:39:55 +05:00
Mariana
34faf1b1ab Release/due times no longer round to half hours. 
Changed 'forceRoundTime' to 'false' in BaseDateEditor
Updated bok choy acceptance test 'studio.test_studio_outline.py:EditingSectionsTest.test_can_edit_subsections' to check times aren't rounded to the nearest half hour after saving

Also added myself to AUTHORS
 2015-12-08 19:30:43 +00:00
Syed Hassan Raza
36db063566 set path explicitly for storing cookie 2015-12-07 14:10:58 +05:00
Nimisha Asthagiri
4a530690e1 Remove unused "has_cert_config" field on CourseDetails. 2015-12-04 16:03:06 -05:00
Jillian Vogel
6fd5ba5a69 MA-240 Added window beforeunload handler to the ActiveVideoUploadList view, 
which shows a notification if there are any "Queued" or "Uploading" videos still in progress.
 2015-12-04 07:38:22 +10:30
Zia Fazal
46150800c0 Merge pull request #10737 from edx/ziafazal/SOL-1433 
SOL-1433:remove audit course mode
 2015-11-26 13:46:33 +05:00
Renzo Lucioni
70d57327eb Add Programs tab to Studio 
Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.
 2015-11-25 14:56:50 -05:00
Zia Fazal
aa529fe0b6 remove audit course mode 
removed print statement
 2015-11-25 17:58:30 +05:00
asadiqbal
88ae4ce257 SOL-1416 2015-11-18 11:56:49 +05:00
cahrens
37cf46728d Correct the remove icon. 2015-11-16 12:29:42 -05:00
Andy Armstrong
a3ff4d50e8 Merge pull request #10534 from edx/andya/fix-studio-videos 
Fix optimizing of draggabilly and json2
 2015-11-06 12:12:44 -05:00
Andy Armstrong
7a1469633f Fix optimizing of draggabilly and json2 2015-11-06 09:40:20 -05:00
asadiqbal
13508c7681 SOL-1379 2015-11-06 18:45:36 +05:00
Andy Armstrong
0785aeb959 Merge pull request #10426 from edx/andya/update-draggabilly 
Upgrade draggabilly.js to fix Firefox iframe bug
 2015-11-05 11:01:35 -05:00
Andy Armstrong
18dabc3312 Upgrade draggabilly.js to fix Firefox iframe bug 
TNL-3627
 2015-11-05 10:10:39 -05:00
Robert Raposa
b76981234d Merge pull request #10484 from edx/robrap/TNL-2646 
TNL-2646: Escape json in Studio
 2015-11-04 14:28:25 -05:00
Robert Raposa
3682fac832 Add json escaping to Studio 
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates

TNL-2646: Escape json.dumps
 2015-11-04 13:34:42 -05:00
Peter Fogg
b98c89117c Course pacing template changes. 
Instructor-led is changed to instructor-paced. Adds a label to the
course outline page to show the course pacing.

ECOM-2794
ECOM-2800
 2015-11-04 09:59:58 -05:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams 
Timed Exams
 2015-10-30 11:03:59 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
Peter Fogg
505b2aa4d9 Disable setting course pacing during course run. 
Also adds improved styling for course pacing settings, and unit tests
around query counts for self-paced courses.

ECOM-2650
 2015-10-28 16:44:36 -04:00