Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,279 Commits 1 Branch 0 Tags
ca1f76cedb030dac503aa7a2d5ccd8dcaf187cfd
Commit Graph

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Usman Khalid
d99978870a Merge pull request #12312 from edx/usman/tnl4398-fix-tests 
Re-enable spec files that were disabled during the Jasmine upgrade.
 2016-05-04 17:16:58 +05:00
clrux
0bf5a3d7b7 Merge pull request #12355 from edx/clrux/rc-2016-05-03-progress_fix 
Moving main element up higher to not conflict with chart
 2016-05-03 22:28:10 -04:00
Chris Rodriguez
cf0b80984b Moving main element up higher to not conflict with chart 2016-05-03 21:35:27 -04:00
Douglas Hall
da5b97284e Merge pull request #12322 from edx/malikshahzad228/additional_course_fields 
WL-401 Add CourseDetails model to course_about template context
 2016-05-03 17:21:26 -04:00
Robert Raposa
24ad0059f3 Merge pull request #12352 from edx/robrap/linter-false-positives-3 
Fix Python false positives with AST.
 2016-05-03 17:03:32 -04:00
Douglas Hall
e14004599d Merge pull request #12337 from edx/douglashall/SOL-1777/fix_gating_with_library_content 
SOL-1777 Allow content gating to work with library_content blocks
 2016-05-03 16:21:18 -04:00
Robert Raposa
60d11bf2fd Fix Python false positives with AST. 
- Use AST to parse Python.
- Refactor Mako to use Python linting.
- Add optional verbose script argument.
- Skip tests.py files when linting.
 2016-05-03 15:17:09 -04:00
Douglas Hall
f5223a36d3 Merge branch 'master' into malikshahzad228/additional_course_fields 2016-05-03 15:03:46 -04:00
tasawernawaz
6d315a9a50 Merge pull request #12324 from edx/tasawer/story/ecom-3731-update-browse-new-courses-area 
Update browser new course area
 2016-05-04 00:01:42 +05:00
Douglas Hall
c7b2d9870c Allow content gating to work with library_content blocks 2016-05-03 14:54:58 -04:00
Christina Roberts
5b26a2f73f Merge pull request #12350 from edx/christina/instructor-dashboard-xss 
Clean up HTML encoding.
 2016-05-03 14:41:19 -04:00
AlasdairSwan
bd2859977d Merge pull request #12316 from edx/alasdair/ECOM-4315-edx.org-pattern-library-page-footer 
ECOM-4313 Styled footer on pattern library pages
 2016-05-03 14:12:30 -04:00
Malik Shahzad
d64e4b064c Add CourseDetails model to course_about template context. 2016-05-03 14:00:35 -04:00
Chris Rodriguez
0723b98283 AC-452 removing unnecessary and incorrect aria-label 2016-05-03 13:53:35 -04:00
Christina Roberts
ce53392ae5 Merge pull request #12335 from edx/christina/tnl-4193 
HTML-encode string values in keyword substitution.
 2016-05-03 13:45:31 -04:00
John Eskew
b5ab64505a Merge pull request #11331 from CredoReference/invalid-studio-user-permissions 
Invalid StudioPermissionsService object in API to show/save xblock settings in CMS
 2016-05-03 13:16:43 -04:00
Christina Roberts
04b80f0404 Merge pull request #12326 from edx/christina/delete-old-jasmine-jquery 
Jasmine-jquery was moved to npm.
 2016-05-03 12:54:30 -04:00
clrux
a5237c1b28 Merge pull request #12349 from edx/clrux/rc-2016-05-03-display_issue 
Overriding display table-cell on instructor dashboard
 2016-05-03 12:40:36 -04:00
cahrens
76545ef49c HTML-encode string values in keyword substitution. 
TNL-4193
 2016-05-03 12:36:44 -04:00
cahrens
f0f7cf4d33 Clean up HTML encoding. 2016-05-03 12:32:48 -04:00
clrux
b4f3398b83 Merge pull request #12348 from edx/clrux/rc-2016-05-03-nav_skip 
Removing nav_skip block from template
 2016-05-03 12:30:08 -04:00
Chris Rodriguez
433a9deff6 Overriding display table-cell on instructor dashboard 2016-05-03 11:50:28 -04:00
Nimisha Asthagiri
0b6da4cd5a Merge pull request #12267 from edx/tnl/refactor_courseware_index 
Refactor courseware index
 2016-05-03 11:22:17 -04:00
Chris Rodriguez
3b81e73e2e Removing nav_skip block from template 2016-05-03 11:18:41 -04:00
Tasawer
4a18ec8041 ECOM-3731 update browser new course area 2016-05-03 15:14:32 +00:00
John Eskew
b73576ada3 Upgrade to Django 1.8.13 2016-05-03 11:11:26 -04:00
AlasdairSwan
2c8f3c8046 Styled footer on pattern library pages 2016-05-03 10:32:35 -04:00
Christina Roberts
f0f0645007 Merge pull request #12278 from edx/christina/cohort-messages 
Add messaging when verified track content MVP is enabled.
 2016-05-03 10:14:15 -04:00
Nimisha Asthagiri
c6954902e3 Create courseware/views folder 2016-05-03 09:02:45 -04:00
Nimisha Asthagiri
2f581448da Refactor Courseware Index 
MA-2189
 2016-05-03 09:02:44 -04:00
Afzal Wali
15b113b657 Bumped the proctoring version. 2016-05-03 17:48:53 +05:00
Usman Khalid
78af4100cd Fixes for course updates date validation. 
If the first date the user selects is invalid it is not set on the
model. This is because jQuery datepicker's getDate returns the
current date when an invalid value is put in the field and the
model's initial value is also the current date. So always update
the date.
 2016-05-03 15:41:22 +05:00
Jonathan Piacenti
82f43b1135 Bump SAML version. 2016-05-02 20:37:09 -04:00
cahrens
0f8b24523c Remove second page tag. 2016-05-02 16:56:52 -04:00
Clinton Blackburn
45088db8ba Fixed quality issue 2016-05-02 16:06:15 -04:00
Clinton Blackburn
4bbdc4b83c Merge pull request #12336 from edx/douglashall/fix_release_rebase 
Fix rc/2016-05-03 rebase with release branch
 2016-05-02 16:04:48 -04:00
Robert Raposa
b1313671e3 Merge pull request #12319 from edx/robrap/linter-move-mako 
Move MakoTemplateLinter.
 2016-05-02 15:42:47 -04:00
Douglas Hall
f5b232a733 Fix release branch rebase 2016-05-02 15:33:56 -04:00
cahrens
9b28afb7bd Add messaging when verified track content MVP is enabled. 
TNL-4393
 2016-05-02 14:25:25 -04:00
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
Chris Rodriguez
1711feb670 TNL-4444 correcting fullscreen transcript skip links 2016-05-02 13:09:31 -04:00
AlasdairSwan
e894797ee9 ECOM-3968 updated program card link alt text 2016-05-02 13:09:31 -04:00
Usman Khalid
c21b86ce7d Make hashes unique so that they do not conflict with hashes from module_edit_spec.coffee. 2016-05-02 13:09:31 -04:00
Usman Khalid
a6635bb884 Turn off global ajaxError handler in afterEach in teams tab factory specs. 2016-05-02 13:09:31 -04:00
Usman Khalid
d851b2c951 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-05-02 13:09:30 -04:00
Qubad786
e8c1d82a26 add imports and fix html 2016-05-02 13:09:30 -04:00
Kevin Falcone
d04d0cc34b 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-05-02 13:09:30 -04:00
Eric Fischer
d48e88ba8a 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-05-02 13:09:30 -04:00