Commit Graph

1055 Commits

Author SHA1 Message Date
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
Peter Fogg
7f673604fb Allow setting self-paced on schedule & details page.
Currently unstyled.

ECOM-2462
2015-10-28 14:33:11 -04:00
Peter Fogg
15d77fda3f Hide due/release dates on course outline in Studio.
ECOM-2443
2015-10-28 14:33:11 -04:00
asadiqbal
0f394656c9 SOL-1312 changes 2015-10-21 20:50:28 +05:00
Frances Botsford
06df341f56 web cert template rendering - adjust signature image sizing 2015-10-09 15:12:50 -04:00
Afeef Janjua
ee203ed930 Merge pull request #10015 from edx/afeef/bugfix/tnl-3258-fix-confirm-navigation-popup-unmodified-group-configurations
TNL-3258 Reset group configuration model when a child content group i…
2015-10-07 11:13:46 +05:00
asadiqbal
0b28fd23f8 SOL-1225 2015-10-06 14:52:38 +05:00
asadiqbal
aec1b95945 SOL-1262 2015-10-05 16:28:28 +05:00
Afeef Janjua
6cc8c47ca0 TNL-3258 Reset group configuration model when a child content group is deleted (+5 squashed commits)
Squashed commits:
[450761c] found an alternative way to restore model when any of the nested model is deleted
[1b7eb85] passed the context to the inner functions
[c87dafd] refactored the model access using encapsulation instead of directly accessing it
[5d025ff] return the promise
[d8d1f50] fixup! quality (+1 squashed commit)
Squashed commits:
[daa7f81] reset the configuration when the model is deleted (+1 squashed commit)
Squashed commits:
[c7f41f7] reverted: skip test_can_delete_unused_content_group due to flakiness
2015-10-02 21:57:32 +05:00
asadiqbal
b09c20f02f SOL-1225 2015-10-01 15:12:13 +05:00
Andy Armstrong
b2a0b2f728 Improve response handling in AjaxHelpers
I've changed the logic so that AjaxHelpers keeps
track of which requests have not yet had mock
responses sent. This ensures that every response
is handled before moving on to the next one,
rather than always handling the last request.
My intention is that this won't allow bugs to creep
in where a request isn't fired and instead the test
responds to an old request. It also should ensure
that extra events aren't accidentally fired.
2015-09-23 20:23:09 -04:00
asadiqbal
3a2c97a02f SOL-1188 fix 2015-09-21 17:08:27 +05:00
Matt Drayer
58488eaa0b Merge pull request #9782 from edx/asadiqbal08/SOL-1188
SOL-1188 Cancel button Saving not Canceling
2015-09-20 23:01:34 -04:00
Matt Drayer
95da57ccf0 Merge pull request #9783 from edx/ziafazal/SOL-1226
SOL-1226: scroll to top after saving
2015-09-20 22:53:53 -04:00
asadiqbal
287cc843df SOL-1224 2015-09-18 11:19:12 +05:00