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

36509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton Blackburn
d6f68ca5ff Merge pull request #12307 from edx/rc/2016-05-03 
Release Candidate rc/2016-05-03
 2016-05-04 12:44:10 -04: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
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
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
Chris Rodriguez
3b81e73e2e Removing nav_skip block from template 2016-05-03 11:18:41 -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
Douglas Hall
f5b232a733 Fix release branch rebase 2016-05-02 15:33:56 -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
Eric Fischer
58b6175580 Updated edx-proctoring requirement 
Contains latest release, changes for TNL-4366
 2016-05-02 13:09:30 -04:00
Robert Raposa
723575021f Add additional JavaScript context tags 2016-05-02 13:09:30 -04:00
Ned Batchelder
b125922e65 Update translations (autogenerated message) 2016-05-02 13:09:29 -04:00
Robert Raposa
ed8cf696f9 Add script for checking git commit is safe 2016-05-02 13:09:28 -04:00
Kevin Falcone
8d2357b0b3 Switch to using the edxapp-migrate-(lms|cms) tools 
edxapp-migrate-lms figures out at system build time what databases
it needs to migrate (just default, or default + student_module_history).
This avoids paver needing to be clever about figuring out if a user has
enabled the split CSMHE databases flag and permits this to merge early
and safely.

We can turn the CSMHE flag on from configuration at the same time we
enable all of the database config and ensure that the new database is
created.  Until a devstack is provisioned using that version of
configuration, it'll continue to have 1 DB and migrate 1 DB.  This
allows us to better control deployment.
 2016-05-02 13:09:28 -04:00
Ben Patterson
e6493d609c Additional shard balancing changes for unit tests. 2016-05-02 13:09:28 -04:00
Ben Patterson
66793f9173 Designate 4th shard. 2016-05-02 13:09:27 -04:00
Ben Patterson
d76f50d93b Create a 3rd explicit shard for unit tests. 
More accurately, this creates a 4th shard because the
last shard is always the default.
 2016-05-02 13:09:27 -04:00
AlasdairSwan
afc5b47ebe Renamed 'programId' to use 'id' 2016-05-02 13:09:27 -04:00
Ayub khan
c601e9fc48 Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404" 2016-05-02 13:09:27 -04:00
muzaffaryousaf
872d225921 Replace backbone-min to actual file. 2016-05-02 13:09:27 -04:00
Robert Raposa
ec6dc57c99 Add Python linting 2016-05-02 13:09:27 -04:00
Waheed Ahmed
2ec3bcd22e Added Kosovo in django country list. 
ECOM-4292
 2016-05-02 13:09:26 -04:00
Chris Rodriguez
8b068d9449 Removing the focus outline for the main container in LMS 2016-05-02 13:09:26 -04:00
AlasdairSwan
70fec21347 Adding program progress bar to program cards 2016-05-02 13:09:26 -04:00
Kevin Falcone
f02b3f829d Come up to a newer New Relic version. 
This supports a number of their new Error features.
 2016-05-02 13:09:26 -04:00
Brian Jacobel
b98a361250 Use unminified picturefill in development 2016-05-02 13:09:26 -04:00
John Eskew
7eff0eaa5c Fix quality issue. 2016-05-02 13:09:26 -04:00
Ahsan Ulhaq
e08a26039f Revert "Add js test for analytics event on LMS receipt page" 
This reverts commit 785b752d19.
 2016-05-02 13:09:25 -04:00
muhammad-ammar
762a6657fe LMS fixes required to upgrade BackboneJS 2016-05-02 13:09:25 -04:00
Ehtesham
eed09cc001 CMS event fixes required to upgrade backbonejs 2016-05-02 13:09:25 -04:00
Ehtesham
861406a1e3 CMS fixes required to upgrade backbonejs 2016-05-02 13:09:25 -04:00
muzaffaryousaf
2c35cde0de Common, squire fixes required to upgrade backbonejs 
TNL-4358
 2016-05-02 13:09:25 -04:00
muzaffaryousaf
95952d9b21 Upgrade backbone via npm. 
TNL-4335
 2016-05-02 13:09:25 -04:00
Nimisha Asthagiri
3be03d4677 Fix Next Button's 404 error 
MA-2305
 2016-05-02 13:09:24 -04:00
Douglas Hall
04cf9ae8b0 Upgrade xblock_lti_consumer to 1.0.6 2016-05-02 13:09:24 -04:00
Ahsan Ulhaq
764f068452 Add js test for analytics event on LMS receipt page 
ECOM-4281
 2016-05-02 13:09:24 -04:00
Renzo Lucioni
a74885331b 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-05-02 13:09:24 -04:00
Robert Raposa
9168789668 Add Jenkins support for Safe Templates Linter 2016-05-02 13:09:23 -04:00
John Eskew
0d5e504c8d Upgrade pillow. 2016-05-02 13:09:23 -04:00
Chris Rodriguez
39e60a7b1a AC-400 removing tabindex from bookmark 2016-05-02 13:09:23 -04:00
Clinton Blackburn
e344bb6cd8 Updated access token view to return a JWT as an access token 
The JWT includes the user email and username, along with details pulled from the original access token (e.g. scope, expiration).

ECOM-4221
 2016-05-02 13:09:23 -04:00