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

37716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ned Batchelder
1cb07a911c Update translations (autogenerated message) 2016-06-30 18:31:37 -04:00
Ned Batchelder
3b863de459 Update translations (autogenerated message) 2016-06-30 18:31:37 -04:00
Simon Chen
4fd7f2936a ECOM-4219 Add coming soon message styles to the course cards (#12890) 2016-06-30 15:39:24 -04:00
Tasawer Nawaz
ca56dadf97 Merge pull request #12897 from edx/tasawer/story/ecom-4797/show-msg-when-user-in-audit-mode 
Show message on progress page when user is in audit mode.
 2016-06-30 23:06:15 +05:00
tasawernawaz
860dabe4f6 show messge on progress page when user is in audit mode. ECOM-4797 2016-06-30 20:13:51 +05:00
Calen Pennington
0ea3a774cd Merge pull request #12899 from cpennington/fix-diff-cover-args 
Fix diff cover args
 2016-06-30 11:05:30 -04:00
hamzamunir7300
930e0375a5 Merge pull request #12898 from edx/hamzamunir/TNL-4141-problem_creation_empty_answer_not_allowed 
Hamzamunir/tnl 4141 problem creation empty answer not allowed
 2016-06-30 19:53:20 +05:00
Saleem Latif
fa0146c540 Merge pull request #12620 from edx/saleem-latif/WL-416 
WL-416: Multi-site comprehensive theming
 2016-06-30 17:49:55 +05:00
Chris Rodriguez
b0ede3f6f5 AC-519 - list - test_lms_instructor_dashboard.py 2016-06-30 08:01:38 -04:00
Matt Drayer
68312bdd2d Revert "Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"" 
2. Update COMPREHNSIVE_THEME_DIR to COMPREHENSIVE_THEME_DIRS
3. Update paver commands to support multi theme dirs
4. Updating template loaders
5. Add ENABLE_COMPREHENSIVE_THEMING flag to enable or disable theming via settings
6. Update tests
7. Add backward compatibility for COMPREHEHNSIVE_THEME_DIR
 2016-06-30 15:19:51 +05:00
Hamza Munir
3ad2f09233 tnl-4141 only whitespaces not allowed in answer and fixed the pep8 violation. 2016-06-30 14:34:31 +05:00
Diana Huang
d328328ff4 Merge pull request #12910 from edx/merge-release-into-master 
Merge release into master
 2016-06-29 20:47:27 -04:00
Diana Huang
f4cf618154 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-06-29 19:51:14 -04:00
Diana Huang
c5392cb8fc Merge pull request #12906 from edx/bjacobel-revert-12767-into-release 
Revert "Change topic name truncation."
 2016-06-29 19:32:37 -04:00
Diana Huang
48726b71de Make safe-linter happy. 2016-06-29 17:13:07 -04:00
alisan617
b3dc456133 Merge pull request #12894 from edx/alisan/tnl-4698-video-icons 
removed edx-icons fallback images for video icons and fully use Font Awesome
 2016-06-29 17:01:35 -04:00
alisan617
68587ade39 remove icon-fallback-img spans and safe commit templating 2016-06-29 15:12:33 -04:00
Brian Jacobel
3cca6046fa Revert "Change topic name truncation." 
This reverts commit d75e633508.
 2016-06-29 15:06:49 -04:00
Calen Pennington
88d826cfb2 Allow the diff_coverage command to share options with the coverage command 2016-06-29 10:31:33 -04:00
Brian Jacobel
628ec509cc Merge pull request #12859 from edx/bjacobel/TNL-4392 
Fix TNL-4392
 2016-06-29 10:16:42 -04:00
Calen Pennington
c3434d144d Remove another instance of self.pdb 2016-06-29 09:56:26 -04:00
Jillian Vogel
e19fb06e9d Merge pull request #12582 from open-craft/feature/discussion_xblock 
Convert Discussion Module to XBlock
 2016-06-29 20:49:35 +12:00
wajeeha-khalid
115c2ced4f Merge pull request #12798 from edx/jia/MA-2531 
MA-2531: fix unread_comment_count for 'read' patch
 2016-06-29 11:01:57 +05:00
Renzo Lucioni
5b4869cf02 Merge pull request #12887 from edx/renzo/program-details-date-format 
Make program details date formatting consistent with course dashboard
 2016-06-28 18:59:29 -04:00
Jhony Avella
7c0a04b631 Replacing relative imports by absolute imports for all files into common/test/acceptance/performance directory 2016-06-28 15:53:01 -05:00
Calen Pennington
b31d1cb8ab Merge pull request #12831 from cpennington/xunit-only-in-ci 
Clean up paver arguments
 2016-06-28 16:26:47 -04:00
Jeremy Bowman
2b7866bfc1 Merge pull request #12886 from edx/release-2016-06-28-conflict 
Merge release into master
 2016-06-28 16:19:50 -04:00
E. Kolpakov
33b3dfcc92 Converts Discussion XModule to Discussion XBlock 
* Renames discussion_module to discussion_xblock
* Moves common/lib/xmodule/xmodule_discussion to openedx/core/lib/xblock_builtin/xblock_discussion
 2016-06-29 06:47:04 +12:00
Eric Fischer
f22d673980 Remove MaxScoresCache (#12878) 
Performance improvement, this cache is no longer needed thanks
to block_structure caching data.

TNL-4874
 2016-06-28 14:04:00 -04:00
Calen Pennington
0e90567f37 Remove the --pdb option, because it was just a passthrough to nose 2016-06-28 13:33:33 -04:00
Renzo Lucioni
1b5a63a368 Make program details date formatting consistent with course dashboard 2016-06-28 13:18:28 -04:00
Kevin Kim
d0be769f1d Merge pull request #12667 from edx/kkim/tz_pref_AS 
Time Zone in Account Settings
 2016-06-28 13:10:10 -04:00
Jeremy Bowman
225768ac2d Merge remote-tracking branch 'origin/release' into release-2016-06-28-conflict 2016-06-28 13:04:26 -04:00
Simon Chen
4911bf805f ECOM-4219 - Add the course states to course cards and make sure the display follows course states (#12844) 
Please enter the commit message for your changes. Lines starting
 2016-06-28 12:57:25 -04:00
Jeremy Bowman
17fb156baa Merge pull request #12863 from edx/rc/2016-06-28 
Release Candidate rc/2016-06-28
 2016-06-28 12:46:57 -04:00