Commit Graph

1031 Commits

Author SHA1 Message Date
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
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
Matt Drayer
05a2b54b5a hotfix/2015-09-16-1: Removed signatory org char limit 2015-09-16 14:24:57 -04:00
Zia Fazal
5effbf14f2 scroll to top after saving
fixed broken bok choy tests
2015-09-16 20:10:16 +05:00
asadiqbal
5ae0562e53 SOL-1188 2015-09-16 14:40:30 +05:00
Matt Drayer
60a8531348 mattdrayer/signatory-title-length: Bump to 106 characters
* Fix typo
* Fix odd test inputs
2015-09-14 17:19:02 -04:00
Braden MacDonald
7647fd9ff1 Fix add component buttons to be backward compatible 2015-09-11 13:18:19 -07:00
asadiqbal
3e4d4504ff SOL-1157 -- moving buttons from top to bottom and also using the standard save/cancel buttons in signatory edit view.
and update the bokchoy test
2015-09-03 15:32:52 +05:00
Christine Lytwynec
e807cbd589 Merge pull request #9402 from edx/clytwynec/TNL-2153
Change component types and template links to buttons
2015-09-01 12:48:46 -04:00
Christine Lytwynec
3470e180fc Change component types and template links to buttons 2015-09-01 10:31:35 -04:00
muhammad-ammar
5e67933175 fix flaky
TNL-3166
2015-09-01 10:56:25 +05:00
Jesse Zoldak
d3754af2f4 Skip flaky JS test TNL-3166 2015-08-28 14:51:59 -04:00
muhammad-ammar
6134e8b5ed Move studio dialog code into common 2015-08-26 20:26:27 +05:00
zubair-arbi
ec28a75f14 In-course reverification access control
* Automatically create user partitions on course publish for each ICRV checkpoint.
* Disable partitions for ICRV checkpoints that have been deleted.
* Skip partitions that have been disabled when checking access.
* Add verification access control UI to visibility settings.
* Add verification access control UI to sequential and vertical settings.
* Add partition scheme for verification partition groups.
* Cache information used by verification partition scheme and invalidate the cache on update.
* Add location parameter to UserPartition so the partition scheme can find the associated checkpoint.
* Refactor GroupConfiguration to allow multiple user partitions.
* Add special messaging to ICRV for students in the honor track.

Authors: Zubair Arbi, Awais Qureshi, Aamir Khan, Will Daly
2015-08-20 08:43:55 -07:00
Tasawer
58b088e109 Fixing minimum grade value error
ECOM-2109
2015-08-17 10:20:40 +00:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Matt Drayer
e1ee5ac6df mattdrayer/SOL-981: Integrate edx-organizations application
* asadiqbal08/SOL-1058: Add edx-organizations to certificate web view
  * Support organization logo asset management
  * Remove organization fields from Studio certificate configuration model

* SOL-981 pull request feedback fixes
2015-08-10 10:29:45 -04:00
tasawernawaz
96779dfe52 Merge pull request #9214 from edx/tasawer/bugfix/ecom-1987-fixing-validation-error-in-minimum-grade
Fixing course settings page for change in minimum grade
2015-08-10 12:41:18 +05:00
Zia Fazal
97c3bd1cfd on clicking Edit of certificate config show prompt 2015-08-06 13:48:28 -04:00
Matt Drayer
3570d08856 Merge pull request #9197 from edx/ziafazal/SOL-1077-fix
SOL-1077: certificate config edit/delete is only allowed if user is edX PM or for those certificate configs not active
2015-08-06 11:36:03 -04:00
Tasawer
80b0edf082 Fixing course settings page for change in minimum grade
ECOM-1987
2015-08-06 14:07:03 +00:00
Zia Fazal
e11c1d120c certificate edit/delete is only allowed if user is edX PM or certificate is not active
removed org helper
2015-08-05 13:45:43 +05:00
asadiqbal
10d4d0ba06 SOL-1035 2015-08-04 18:23:21 +05:00
Zia Fazal
614baab35a Merge pull request #9111 from edx/ziafazal/SOL-1077
SOL-1077: hide certificate configuration activate/deactivate and delete buttons if user is not global staff
2015-07-31 11:12:24 +05:00