Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
36,569 Commits 1 Branch 0 Tags
268cb2ea17e467ba0af8d712f9c02fed98a4d9a4
Commit Graph

13194 Commits

Author SHA1 Message Date
David Ormsbee
f3b33ef14f Merge pull request #12275 from edx/ormsbee/video_state_opt_2 
Remove unnecessary VideoModule save_states.
 2016-05-02 10:54:40 -04:00
Ayub khan
d45c4d8caf Revert "Implement 'from_string_or_404' in utils" 2016-05-02 14:23:39 +05:00
asadiqbal
a4197eded5 WL-399 Course Details List Fields 2016-05-01 20:02:09 -04:00
Ibrahim
f7f281b65b WL-398 Add Course Background Image and Video Thumbnail Image Fields to Studio 2016-04-30 15:25:17 -04:00
David Ormsbee
f9d85e650c Remove unnecessary VideoModule save_states. 
Before this commit, roughly half the save_state AJAX calls for the
VideoModule were done at load time, in order to send information about
YouTube availability (the value for which was almost always true).

This commit sends the value for what the LMS already thinks YouTube
availability is for this user, so that the AJAX callback is only
used in the case where the client side sees something different.

[PERF-262]
 2016-04-29 16:32:17 -04:00
Muddasser
c283afccbc Merge pull request #12268 from edx/muddasser/bokchoy/chrome/test_badge_share_modal 
Fixed close button click issue
 2016-04-30 00:42:24 +05:00
clrux
b69fea7233 Merge pull request #12306 from edx/clrux/tnl-4444 
TNL-4444 correcting fullscreen transcript skip links
 2016-04-29 14:16:15 -04:00
Christina Roberts
2497f0a0eb WIP: xblock pipeline work (#10176) 
[PERF-303] Integer XBlocks/XModules into the static asset pipeline.

This PR, based on hackathon work from Christina/Andy, implements a way to discover all installed XBlocks and XModules and to enumerate their public assets, then pulling them in during the collectstatic phase and hashing them.  In turn, the methods for generating URLs to resources will then returned the hashed name for assets, allowing them to be served from nginx/CDNs, and cached heavily.
 2016-04-29 10:52:42 -04:00
Chris Rodriguez
b20414bdbc TNL-4444 correcting fullscreen transcript skip links 2016-04-29 10:04:54 -04:00
Eric Fischer
955282f9c7 Merge pull request #12165 from edx/efischer/hide_timed_exams 
TNL-4366 Hide Timed Exams
 2016-04-29 09:28:16 -04:00
Usman Khalid
09594d6305 Merge pull request #12243 from edx/usman/tnl4416-spec-nesting 
When using RequireJS load spec files one by one.
 2016-04-29 17:09:57 +05:00
Ehtesham Kafeel
8cf89d3a8e Merge pull request #12289 from edx/mzfr/backbone-cleanup 
Replace backbone-min.js to backbone.js
 2016-04-29 16:53:02 +05:00
Usman Khalid
4d228199d1 When using RequireJS load spec files one by one. 
Jasmine has a global stack for creating a tree of specs. We need to load
spec files one by one, otherwise some end up getting nested under others.
 2016-04-29 15:54:47 +05:00
Eric Fischer
ea77c3ec42 Hide After Due setting for Timed Exams 
TNL-4366
Changes in studio to allow the hide_after_due setting to be utilized.

Includes:
    -python changes to contentstore, where the data is stored.
    -refactoring of timed-examination-preference-editor.underscore, to add this
        setting and make the editor more accessible.
    -javascript changes to link the new setting to the correct data model.
    -sass updates to fix a11y issues on the editor modal.
    -addition of post-due visibility information to course outline in studio.
    -new tests: python, js, acceptance, and a11y
 2016-04-28 13:27:19 -04:00
Muddasser
048f73be6d Fixed close button click issue 2016-04-28 19:37:37 +05:00
Ben Patterson
b9558a90f1 Create a 3rd explicit shard for unit tests. 
More accurately, this creates a 4th shard because the
last shard is always the default.
 2016-04-28 10:09:32 -04:00
Ayub khan
986209669d Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404" 2016-04-28 15:50:17 +05:00
muzaffaryousaf
928d9a2694 Replace backbone-min to actual file. 2016-04-28 12:46:29 +05:00
AlasdairSwan
a6da71591a Merge pull request #12221 from edx/alasdair/ECOM-3200-program-card-learner-progress 
Adding program progress bar to program cards
 2016-04-27 15:06:39 -04:00
AlasdairSwan
cdb05c26a6 Adding program progress bar to program cards 2016-04-27 13:46:48 -04:00
Nimisha Asthagiri
036537f174 Merge pull request #12263 from edx/tnl/next-button-fix 
Fix Next Button's 404 error
 2016-04-27 13:18:39 -04:00
John Eskew
0899871958 Merge pull request #11042 from edx/jeskew/xml_removal 
Remove XML modulestore code from most tests.
 2016-04-27 11:20:02 -04:00
Renzo Lucioni
63b65ab035 Merge pull request #12231 from edx/renzo/program-progress 
Measuring program progress
 2016-04-27 09:24:09 -04:00
muhammad-ammar
4fd2a7d176 LMS fixes required to upgrade BackboneJS 2016-04-27 12:51:13 +05:00
muzaffaryousaf
a1cb7b8f39 Common, squire fixes required to upgrade backbonejs 
TNL-4358
 2016-04-27 12:48:45 +05:00
muzaffaryousaf
e89a32d5c6 Upgrade backbone via npm. 
TNL-4335
 2016-04-27 12:48:45 +05:00
Muddasser
d670f8c4da Merge pull request #12257 from edx/muddasser/bokchoy/chrome/test_if_captions_are_draggable 
branch out at assert based on chrome and firefox
 2016-04-27 12:03:55 +05:00
Muddasser
1220a0a98b Merge pull request #12259 from edx/muddasser/bokchoy/chrome/screenshots_test 
Changed screenshots to incorporate firefox and chrome
 2016-04-27 12:03:37 +05:00
Nimisha Asthagiri
2396cc493d Fix Next Button's 404 error 
MA-2305
 2016-04-26 20:21:08 -04:00
Brian Jacobel
90499e77f1 Merge pull request #12250 from edx/bjacobel/underscore.string-removal-v2 
remove usage of minifed Underscore.string
 2016-04-26 16:40:19 -04:00
Renzo Lucioni
5da6a598dd Measuring program progress 
Introduces a utility class for gauging a user's progress towards program completion. Progress data is passed to the ProgramListFactory. ECOM-3200.
 2016-04-26 13:36:58 -04:00
Brian Jacobel
b27c8f060f Merge pull request #12220 from edx/bjacobel/adaptive-hint-bug 
Math inputs _and_ adaptive hints are sized/positioned correctly
 2016-04-26 10:27:39 -04:00
Muddasser
2857e66239 Changed screenshots to incorporate firefox and chrome 2016-04-26 18:11:52 +05:00
Muddasser
99cbf18e96 branch out at assert based on chrome and firefox 2016-04-26 16:20:32 +05:00
Ben Patterson
d0b8f5d4fd Merge pull request #12253 from edx/benp/flaky-condition 
Fix flaky condition related to settings page.
 2016-04-26 05:39:34 -04:00
Ibrahim Ahmed
8b014f2650 Merge pull request #12107 from edx/ibrahimahmed443/WL-309-new-fields-in-studio 
WL-309 Add new text fields to Studio schedule and details settings page
 2016-04-26 14:30:43 +05:00
Ibrahim
720bde1da9 add new text fields to schedule and details settings page 2016-04-25 23:44:13 -04:00
Ben Patterson
6ee3ea68ba Fix flaky condition related to settings page. 2016-04-25 17:32:32 -04:00
Andy Armstrong
fe88402982 Merge branch 'master' into alasdair/fedx-118-pattern-library-styles-with-current-partials 2016-04-25 16:51:25 -04:00
Brian Jacobel
217ea5d074 remove usage of minifed Underscore.string 2016-04-25 16:24:51 -04:00
Ben Patterson
f53b900f06 Merge pull request #12248 from edx/benp/course-page-existence 
FEDX-88. Marking test as flaky.
 2016-04-25 16:14:53 -04:00
Ben Patterson
9efdda83b1 FEDX-88. Marking test as flaky. 2016-04-25 14:35:34 -04:00
Brian Jacobel
00fcb9ddc1 Fix FEDX-167: Both math inputs and adaptive hints are sized correctly 2016-04-25 14:31:53 -04:00
clrux
74db655ed9 Merge pull request #12239 from edx/clrux/ac-444 
AC-444 Adding legacy event_type for language menu events
 2016-04-25 13:58:44 -04:00
AlasdairSwan
a9971ef2ba FEDX-118 Adding header to test page 2016-04-25 10:56:28 -04:00
Chris Rodriguez
5137b9f8b6 Adding legacy event_type for language menu events 2016-04-25 08:58:43 -04:00
Chris Rodriguez
6ea7545cc3 AC-385 adding events for closed captions 2016-04-25 08:29:08 -04:00
Muddasser
216c83197a assertScreenshot for firefox 42 2016-04-24 08:32:34 -04:00
J. Clifford Dyer
001874c42e Update seq_* to edx.ui.lms.sequence.* format 
seq_next, seq_prev, and seq_goto events are all renamed, and maintain
legacy compatibility.

This PR also introduces new EventTransformer framework to shim events
based on name prefix.

MA-2221
 2016-04-22 13:38:41 -04:00
Ehtesham
5b12f7d3dd fixing quality 2016-04-22 19:09:36 +05:00