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
Syed Hasan raza
cdd5a6f8fb
Merge pull request #7016 from edx/shr/bug/TNL-1355-Studio-username-field-area-alignment
...
set max width for nav-account-user for long characters
2015-11-02 06:30:33 -08:00
Syed Hassan Raza
f582d1a832
adjusment for long usernames
2015-11-02 16:14:53 -08: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
Christina Roberts
3382a955c9
Merge pull request #10378 from edx/christina/fix-mathjax-preview
...
Disable Fast Preview for version 2.5.
2015-10-29 12:41:30 -04:00
cahrens
deb4e35f92
Disable Fast Preview for version 2.5.
...
Except for the Discussion Tab.
TNL-3693, TNL-3365
2015-10-29 11:56:08 -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
cahrens
87f0df3501
Revert to version 2.4 of MathJax.
...
TNL-3693
2015-10-26 11:28:40 -04:00
asadiqbal
0f394656c9
SOL-1312 changes
2015-10-21 20:50:28 +05:00
cahrens
90b61f8ef8
Upgrade to MathJax 2.5.
...
TNL-3495
2015-10-20 11:54:09 -04:00
Saleem Latif
5f766f3806
Changes after testing on staging
2015-10-16 10:19:43 +05:00
frances botsford
a2bb8ed96c
Merge pull request #10120 from edx/frances/fix/repo-cert-template-bugs
...
Platform Web Cert template fixes
2015-10-13 16:51:56 -04:00
Frances Botsford
06df341f56
web cert template rendering - adjust signature image sizing
2015-10-09 15:12:50 -04:00
Saleem Latif
9799d15373
course-number and override course-number added in Certificate Editor View
2015-10-08 11:29:14 +05: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
Matt Drayer
63ac2f1457
Merge pull request #9860 from edx/saleem-latif/SOL-1189
...
SOL-1189: when a signature image file is uploaded, the preview image looks distorted
2015-09-28 10:05:28 -04:00
Jesse Zoldak
1aa181c90a
Update sinon to version 1.17.0
2015-09-24 10:55:48 -04: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
Matt Drayer
5de93a3ad1
Merge pull request #9850 from edx/asadiqbal08/SOL-1188-fix
...
asadiqbal08/SOL-1188-fix
2015-09-22 11:38:00 -04:00
Saleem Latif
66283252e6
image stretched issue resolved in signatories
2015-09-22 11:41:52 +05:00
David Baumgold
03aeae4bd7
Merge pull request #8271 from edx/sass-theming
...
Comprehensive Theming
2015-09-21 10:55:18 -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
Matt Drayer
ffb7f9b9a0
Merge pull request #9804 from edx/asadiqbal08/SOL-1224
...
SOL-1224 Verified Preview not showing
2015-09-20 22:50:00 -04:00
Bill DeRusha
271bc54071
Merge pull request #9765 from edx/bderusha/readonly-enrollment
...
Readonly for enrollment end date/time on edX (for non-global-staff)
2015-09-18 10:14:15 -04:00
Bill DeRusha
c6b54aa61f
Readonly for enrollment end date/time on edX (for non-global-staff)
...
TNL-2694
Add accessibility aria-readonly attributes
2015-09-18 09:39:18 -04:00
asadiqbal
287cc843df
SOL-1224
2015-09-18 11:19:12 +05:00
Peter Fogg
0a2cfbe31c
Merge pull request #9738 from edx/peter-fogg/change-studio-help-links
...
Remove Tender and change Studio help links.
2015-09-17 22:42:57 -04:00
Peter Fogg
fec5129a49
Remove Tender and change Studio help links.
...
TNL-2695
2015-09-17 16:30:40 -04:00
Ned Batchelder
c0856232e1
Use sass interpolation instead of concatenation for -path
2015-09-17 15:39:04 -04:00
Ned Batchelder
5d64f9a80b
Minor changes, responding to pull request comments
2015-09-17 15:39:03 -04:00
David Baumgold
6ebf2515f4
Comprehensive theming
...
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
2015-09-17 15:39:03 -04:00
John Eskew
6b12ec97cc
Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release
2015-09-16 16:23:52 -04:00
