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

37751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Albert (AJ) St. Aubin
c25dd2ee1d Merge pull request #12960 from edx/staubina/TNL-4723_indexOfBug 
Updated to check and ensure the progress Detail is a string before lo…
 2016-07-08 15:05:04 -04:00
Albert St. Aubin
4df50e9008 Updated to check and ensure the progress Detail is a string before looking for the index of / 
TNL-4723

Added basic JS test to check for progress with integer detail

Added another test with a non-string value to force the failure state with data returns a non-string value

Removed test with unrealistic int input for progress_detail

Cleaned up duplicate code in renderProgress tests
 2016-07-08 11:44:09 -04:00
Calen Pennington
0aceb231ef Merge pull request #12961 from cpennington/fix-xunit-commands 
[TE-1511] Make --with-xunit(mp)? and --xunit(mp)?-file match in all test suites
 2016-07-08 10:52:35 -04:00
Calen Pennington
2e5936f0f5 [TE-1511] Make --with-xunit(mp)? and --xunit(mp)?-file match in all test suites 2016-07-08 09:48:51 -04:00
Ned Batchelder
bb9a6283ef Merge pull request #12956 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-07-07 21:57:51 -04:00
Ned Batchelder
9132b7d555 Update translations (autogenerated message) 2016-07-07 21:02:43 -04:00
Peter Pinch
cf572af191 Merge pull request #12889 from mitocw/fix/aq/caoch_dashboard_navigation_issues 
Fixed CCX coach dashboard access issues
 2016-07-07 20:29:24 -04:00
Amir Qayyum Khan
0d3f96d4b5 Fixed CCX coach dashboard access issues. 2016-07-08 04:24:19 +05:00
Braden MacDonald
7c3d902ff6 Merge pull request #11286 from open-craft/omar/remove-s3 
Add OpenStack Swift support
 2016-07-07 11:05:28 -07:00
John Eskew
5d196afce7 Merge pull request #12944 from edx/jeskew/fix_for_wiki_deprecation_msg 
Update the django-wiki version number.
 2016-07-07 11:36:46 -04:00
Joyce Zhu
470cfc1109 Merge pull request #12958 from edx/JoyceZhu/revert_erroneous_commit 
Revert "Remove receipt page links' bottom borders"
 2016-07-07 11:21:27 -04:00
Joyce Zhu
afa9a2cd3a Revert "Remove receipt page links' bottom borders" 
This reverts commit 01e2104979.
 2016-07-07 11:17:01 -04:00
Adam
f7c45cf47d Merge pull request #12952 from edx/adam/quiet-logs 
quiet some noisy logs
 2016-07-07 11:02:21 -04:00
Joyce Zhu
01e2104979 Remove receipt page links' bottom borders 2016-07-07 09:42:10 -04:00
Albert (AJ) St. Aubin
07eb59c331 Merge pull request #12942 from edx/add_author_aj 
Added author
 2016-07-07 07:53:40 -04:00
Chris
e4db0e39d0 Merge pull request #12915 from edx/clrux/ac-520 
AC-520 fixes `section` ignores
 2016-07-07 03:20:14 -07:00
Ned Batchelder
bcf1925b17 Merge pull request #12948 from edx/ned/no-irc 
Change IRC references to Slack
 2016-07-06 18:22:33 -04:00
Adam Palay
a19d2e76ff quiet some noisy logs 2016-07-06 16:32:27 -04:00
John Eskew
d7db6e9d22 Bump the django-wiki version number. 2016-07-06 15:48:04 -04:00
Chris Rodriguez
4cf0e19af2 AC-520 fixing section ignores 2016-07-06 15:01:44 -04:00
Ned Batchelder
7523fb2e07 Change IRC references to Slack 2016-07-06 13:56:58 -04:00
Albert St. Aubin
fc7cee0cad Added author 2016-07-06 13:08:50 -04:00
Chris
933fdae5ba Merge pull request #12903 from edx/clrux/ac-518 
AC-518 updates `button-name` todo; needs TinyMCE work
 2016-07-06 09:58:58 -07:00
Chris Rodriguez
5b31e4d67f AC-518 - button-name - test_lms_instructor_dashboard.py 2016-07-06 10:32:00 -04:00
Brian Jacobel
39c2abdf28 Merge pull request #12941 from edx/bjacobel/npm-502 
Bump UI Toolkit version to 1.4.1
 2016-07-06 09:57:16 -04:00
Brian Jacobel
c89c3a2043 Bump UI Toolkit version to 1.4.1 
Required for the breadcrumbs work I will be doing later this week. Also should issues we are seeing with NPM this morning.
 2016-07-06 08:50:31 -04:00
E. Kolpakov
0dddc2e3d4 Bumped Django SWIFT storage version 2016-07-06 11:50:38 +03:00
Renzo Lucioni
f91da141e1 Merge pull request #12937 from edx/renzo/detail-page-touchups 
Program detail page touchups
 2016-07-05 23:12:04 -04:00
Toby Lawrence
bc990d5d75 Merge pull request #12911 from edx/PERF-344 
[PERF-344] Add versioning of cached course assets to allow graceful cache invalidation
 2016-07-05 19:34:27 -04:00
Toby Lawrence
4e22affb24 [PERF-344] Add versioning of cached course assets to allow graceful cache invalidation 
When releasing the versioned assets work, we stumbled on a problem with old pickled
versions of the StaticContent objects residing in cache, which triggered a bug in the
code. Not wanting to blow away all cached items, we ended up having to revert and add
in some backwards-compatible helper code to ease the transition.

With this, we'll now utilize the version argument that Django's caching interface
allows, in conjunction with a constant value that can be modified when breaking changes
are being made, to let us gracefully ignore older cached course assets.
 2016-07-05 15:15:47 -04:00
Kevin Kim
82c612f13e Merge pull request #12888 from edx/kkim/convert_date_tz 
Convert Dates for Time Zone
 2016-07-05 14:48:23 -04:00
Kevin Kim
0bf8fc4b44 Converts the dates on the dashboard, sidebar navigation, and important course dates to user specified time zone. 2016-07-05 17:45:13 +00:00
Renzo Lucioni
af1c560210 Program detail page touchups 
Center cards and add padding around logos. ECOM-4871.
 2016-07-05 13:38:07 -04:00
Diana Huang
4bc81ac016 Merge pull request #12907 from edx/diana/truncation-cleanup 
Fix issues with topic truncation.
 2016-07-05 11:36:00 -04:00
Diana Huang
6e538e1304 Fix issues with truncation. 2016-07-05 10:39:37 -04:00
Omar Khan
2faab97eea Add OpenStack Swift support 
Refactor all S3 code to use the django storage API and add swift
settings for openstack deployments
 2016-07-05 17:31:59 +03:00
Adam
99709035d1 Merge pull request #12930 from edx/release 
Release
 2016-07-05 09:59:12 -04:00
Ben Patterson
27499d1456 Merge pull request #12892 from eduNEXT/jfavellar90/TE-1194-1 
Replacing relative imports by absolute imports for all files into com…
 2016-07-05 08:38:57 -04:00
Saleem Latif
b89bb7e6b3 Merge pull request #12933 from edx/saleem-latif/fix-footer-test-failure 
Fix footer test failures
 2016-07-03 01:12:38 +05:00
Renzo Lucioni
1210d3fcc2 Merge pull request #12908 from edx/renzo/course-card-upgrade-cta 
Add upgrade section to program detail course cards.
 2016-07-02 16:10:32 -04:00
Saleem Latif
5ccc80b42f Fix footer test failures 2016-07-03 00:11:45 +05:00
Renzo Lucioni
d738188550 Add upgrade section to program detail course cards. 
Displays a message and link when a user is enrolled in a program's course run but must upgrade in order to be eligible for the program certificate. ECOM-4220.
 2016-07-02 01:23:20 -04:00
Adam
faadafee74 Merge pull request #12928 from edx/hotfix/2016-07-01 
Fix `bulk_change_enrollment` command to emit event
 2016-07-01 15:39:28 -04:00
Awais Jibran
438f10b087 Fix bulk_change_enrollment command to emit event 
ECOM-4775
 2016-07-01 13:09:20 -04:00
Nimisha Asthagiri
69410948c9 Reduce number of transformer traversals (#12881) 
This change improves grading performance by combining what had previously been
multiple course tree traversals into a single traversal with combined
filtering logic.
 2016-07-01 12:28:33 -04:00
Ned Batchelder
b918b4da43 Merge pull request #12919 from edx/ned/make-messages-the-same 
Make this message the same as another almost identical message
 2016-07-01 09:41:57 -04:00
Ned Batchelder
b6a6600a49 Merge pull request #12920 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-07-01 09:41:32 -04:00
Mark Sadecki
9fc25cd7eb Merge pull request #12851 from edx/cptvitamin/AC-516-focusgrabber 
removes text value from span that is intended only to receive focus
 2016-07-01 09:37:26 -04:00
Chris
a561029463 Merge pull request #12904 from edx/clrux/ac-519 
AC-519 removing list from ignored a11y check
 2016-07-01 06:34:12 -04:00
Ned Batchelder
102fcd620c Make this message the same as another almost identical message 2016-06-30 18:32:28 -04:00