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

37692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
PaulWattenberger
aa078dfda2 Pwattenberger/sailthru enroll (#12816) 
* Partial changes for purchase tracking

* Continued changes for purchase tracking

* Clean up code quality issues

* Clean up code quality issues

* Responses to code review

* Fix code quality flaged issues

* Fix code quality flaged issues

* Fix code quality flaged issues

* Fix problem processing sailthru_content cookie
 2016-06-28 11:13:21 -04:00
Calen Pennington
81d347d93f Push defaults up to option definition to limit option-parsing repetitiveness 2016-06-28 10:46:54 -04:00
Calen Pennington
2690c044c6 Only generate xunit files during CI builds, so that pudb works during development 2016-06-28 10:46:53 -04:00
Calen Pennington
6b61bc44d9 Covert all paver command manipulation to happen on lists of args/options, rather than strings 2016-06-28 10:46:35 -04:00
Kevin Kim
059985b9ec Added time zone field to user account settings, currently hidden behind a feature flag. 2016-06-28 14:33:56 +00:00
Eric Fischer
664cafc962 Combine get_course_blocks() calls for grading performance (#12877) 
When getting progress, we need these blocks in two locations. They
do not need to be individually fetched.
 2016-06-28 10:03:58 -04:00
Muddasser
acef4fa29a Merge pull request #12819 from edx/muddasser/acceptance/setup.py 
Changed setup.py to ensure page objects have all the files needed whe…
 2016-06-28 17:39:41 +05:00
Jesse Zoldak
1136a06872 Merge pull request #12884 from edx/revert-12833-hamzamunir/TNL-4141-problem_creation_empty_answer_not_allowed 
Revert "TNL 4141"
 2016-06-28 07:19:58 -04:00
Jesse Zoldak
fcfacf22c8 Revert "TNL 4141" 2016-06-28 07:19:25 -04:00
Chris Rodriguez
023147406e Adjusting thresholds 2016-06-28 06:05:40 -04:00
Chris Rodriguez
0d7bf1b78e Removing safe transcripts for now 2016-06-28 06:05:40 -04:00
Chris Rodriguez
fba37a129d AC-454 adding visual clarify for selected menu options 2016-06-28 06:05:40 -04:00
Douglas Hall
61d5fdcbd2 Bump safe template linter thresholds to fix failing builds 2016-06-28 06:05:39 -04:00
Andy Armstrong
0488f077dc Fix discussion bundling in Studio 2016-06-28 06:05:39 -04:00
hamzamunir7300
013bf65cc7 Merge pull request #12833 from edx/hamzamunir/TNL-4141-problem_creation_empty_answer_not_allowed 
TNL 4141
 2016-06-28 13:11:54 +05:00
Tasawer Nawaz
e46764f5fc Merge pull request #12820 from edx/tasawer/bugfix/ecom-1730-make-student-enrollment-more-robust 
Make user enrollment more robust
 2016-06-28 12:47:23 +05:00
Asad Iqbal
85b1f23a18 Merge pull request #12868 from edx/asadiqbal08/WL-538 
WL-538 changes to make UI responsive
 2016-06-28 11:59:59 +05:00
Ben Patterson
e7527fcabb Merge pull request #12854 from eduNEXT/jfavellar/TR-1194-fixtures 
Replacing relative imports by absolute imports for all files into com…
 2016-06-27 16:37:11 -04:00
Calen Pennington
ef89c75b19 Deprecate paver arguments with '_' in them in favor of versions with '-' 2016-06-27 15:21:28 -04:00
Calen Pennington
206cedf55e Deprecate extra_args in favor of just passing through all unknown options 2016-06-27 15:19:50 -04:00
Calen Pennington
c279eb1c03 Add a new Task subclass that will pass through unknown options as the unknown_options argument 2016-06-27 15:06:53 -04:00
Ahsan Ulhaq
a980361aa6 Merge pull request #12867 from edx/ahsan/ECOM-4792-Incorrect-links-on-edX-Course-Catalog-API 
Incorrect links on `edX Course Catalog API`
 2016-06-28 00:05:30 +05:00