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

36578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
clrux
15fc53c779 Merge pull request #12279 from edx/clrux/ac-448 
AC-448 removing tabindex from canvas elements
 2016-05-02 14:20:36 -04:00
Ned Batchelder
a03ab9944c Merge pull request #12328 from edx/ned/openedx-is-an-adjective 
Reduce the use of 'Open edX' as a noun
 2016-05-02 14:10:41 -04:00
Douglas Hall
1fc703805a Merge pull request #12332 from edx/merge_patch-2016-05-02_into_master 
Merge patch 2016 05 02 into master
 2016-05-02 13:55:43 -04:00
Douglas Hall
735d82ba46 Merge remote-tracking branch 'origin/release' into merge_patch-2016-05-02_into_master 2016-05-02 12:54:51 -04:00
Ned Batchelder
1a2ba1a533 Reduce the use of 'Open edX' as a noun 2016-05-02 12:44:28 -04:00
Douglas Hall
2d6604a00d Merge pull request #12318 from edx/hotfix/2016-05-02 
Patch Release 2016-05-02 WL Studio Course Details Fields
 2016-05-02 12:42:56 -04:00
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
Ahsan Ulhaq
dde18c7e5f Merge pull request #12290 from edx/zub/ecom-4281-add-receipt-page-analytics-event-js-test 
Add js test for analytics event on LMS receipt page
 2016-05-02 19:14:26 +05:00
Ayub khan
7a6278e69b Merge pull request #12321 from edx/revert-10705-mrehan/SUST-22 
Revert "Implement 'from_string_or_404' in utils"
 2016-05-02 17:25:32 +05:00
Chris Rodriguez
817449c761 AC-448 updating tabindex from 1 to 0 (zero) 2016-05-02 08:03:37 -04:00
Ayub khan
d45c4d8caf Revert "Implement 'from_string_or_404' in utils" 2016-05-02 14:23:39 +05:00
Ahsan Ulhaq
f995114d11 Add js test for analytics event on LMS receipt page 
ECOM-4281
 2016-05-02 13:15:18 +05:00
asadiqbal
59f70cf85d WL-399 Course Details List Fields 2016-05-01 22:20:24 -04:00
Douglas Hall
a6b9ba7d21 Merge pull request #12203 from edx/asadiqbal08/WL-399 
WL-399 Studio Course Details List Fields
 2016-05-01 22:13:52 -04:00
Ibrahim
a13e531042 WL-398 Add Course Background Image and Video Thumbnail Image Fields to Studio 2016-05-01 20:33:40 -04:00
Ibrahim
357a9f8080 add new text fields to schedule and details settings page 2016-05-01 20:31:07 -04:00
asadiqbal
a4197eded5 WL-399 Course Details List Fields 2016-05-01 20:02:09 -04:00
Douglas Hall
b34b7cbc6f Merge pull request #12317 from edx/douglashall/decorate_flaky_studio_settings_image_upload_tests 
Fix flaky Studio settings page image upload acceptance tests
 2016-05-01 13:53:00 -04:00
Douglas Hall
c896e491ae Fix flaky Studio settings page image upload acceptance tests 2016-05-01 11:48:44 -04:00
Douglas Hall
f73421863e Merge pull request #12256 from edx/ibrahimahmed443/WL-398-image-fields-in-studio 
WL-398 Add hero image and thumbnail image fields to Studio schedule and details settings page for WL site courses
 2016-04-30 17:06:00 -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
Peter Desjardins
61f48de382 Merge pull request #12298 from edx/pdesjardins/DOC-2854 
Mocking some modules that were missing during platform API doc builds.
 2016-04-29 14:00:26 -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
Renzo Lucioni
a77e6ea247 Merge pull request #12304 from edx/alasdair/ECOM-3968-program-card-link-alt-text-update 
ECOM-3968 updated program card link alt text
 2016-04-29 10:47:54 -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
M. Rehan
bc28df903a Merge pull request #12261 from edx/jibsheet/html-escape-email-settings-edx-dashboard 
TNL-4396 Apply same fix to edx dashboard
 2016-04-29 18:10:53 +05: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
AlasdairSwan
294e1782f6 ECOM-3968 updated program card link alt text 2016-04-29 08:03:40 -04: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
6c26715a14 Make hashes unique so that they do not conflict with hashes from module_edit_spec.coffee. 2016-04-29 15:54:48 +05:00
Usman Khalid
8f79d8013f Turn off global ajaxError handler in afterEach in teams tab factory specs. 2016-04-29 15:54:48 +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
Kevin Falcone
ea522a1797 Merge pull request #12288 from edx/jibsheet/paver-migrate-multiple-dbs 
Switch to using the standard edxapp-migrate-(lms|cms) tools
 2016-04-28 21:50:41 -04:00
Robert Raposa
1dfe0e8a4e Merge pull request #12254 from edx/robrap/linter-javascript-context 
TNL-4427: Add additional JavaScript context tags
 2016-04-28 18:00:20 -04:00
Robert Raposa
17a920b3a6 Merge pull request #12246 from edx/robrap/safe-commit 
TNL-4317: Add helper for checking git commit is safe
 2016-04-28 16:54:38 -04:00
Qubad786
a3adaa96c4 add imports and fix html 2016-04-29 01:14:55 +05:00
Kevin Falcone
b61d9b9d09 TNL-4396 Apply same fix to edx dashboard 
This was fixed on the openedx dashboard, but missed on the edx.org theme
for the dashboard.
 2016-04-29 01:14:54 +05:00
Peter Desjardins
09aae6e72c Mocking some modules that were missing during platform API doc builds. 2016-04-28 13:54:14 -04: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
Eric Fischer
ecfd953e80 Updated edx-proctoring requirement 
Contains latest release, changes for TNL-4366
 2016-04-28 13:27:18 -04:00
Ned Batchelder
4cc4e6559c Merge pull request #12295 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-04-28 12:22:33 -04:00
Robert Raposa
b67c133910 Add additional JavaScript context tags 2016-04-28 12:16:10 -04:00
Ben Patterson
a61707b8e6 Merge pull request #12272 from edx/benp/shard4-lms 
Create a 4th shard for lms unit tests
 2016-04-28 11:18:43 -04:00
AlasdairSwan
265f2490a1 Merge pull request #12294 from edx/alasdair/ECOM-3200-resolve-id-issue 
Renamed 'programId' to use 'id'
 2016-04-28 11:04:33 -04:00
Ned Batchelder
861e8a0e9e Update translations (autogenerated message) 2016-04-28 14:55:52 +00:00
Robert Raposa
ac935e02a6 Add script for checking git commit is safe 2016-04-28 10:52:43 -04:00