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

37678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Jacobel
628ec509cc Merge pull request #12859 from edx/bjacobel/TNL-4392 
Fix TNL-4392
 2016-06-29 10:16:42 -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
alisan617
c9459eef79 Merge pull request #12873 from edx/alisan/deletebadfiles 
delete local pycharm files
 2016-06-27 15:04:50 -04:00
Sylvia Pearce
ce3da57546 Merge pull request #12783 from edx/sylvia/DOC-2361 
Account registration and activation text string revisions
 2016-06-27 15:01:36 -04:00
Chris
e90dad8af5 Merge pull request #12860 from edx/clrux/ac-398 
AC-398 putting edx.org social media links in list, updating styles
 2016-06-27 13:50:21 -04:00
Sylvia Pearce
8b1f28d317 Account registration and activation text string revisions 2016-06-27 13:32:53 -04:00
Simon Chen
8ad34c08b1 ECOM-4804 Add the organization logo url to the program details page (#12862) 2016-06-27 12:44:11 -04:00
alisan617
93395145dd delete local pycharm files 2016-06-27 12:11:23 -04:00
Chris Rodriguez
62a6f891c4 AC-398 putting edx.org social media links in list, updating styles 2016-06-27 11:31:42 -04:00
Nimisha Asthagiri
b9b164866e Update BlockStructure version number 
https://openedx.atlassian.net/browse/TNL-4865
Without this change, we get 500 errors when the server tries to
deserialize cached data using a previous data structure.
 2016-06-27 11:15:07 -04:00
Ahsan Ulhaq
f6fdd3c499 Incorrect links on edX Course Catalog API 
ECOM-4792
 2016-06-27 19:53:37 +05:00
Tasawer
3a984d3ca2 Make user enrollment more robust 
ECOM-1730
 2016-06-27 14:51:09 +00:00
alisan617
f9edd4e8e5 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Merge branch 'master' 2016-06-27 09:17:11 -04:00
alisan617
8ea177f9c9 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Update packages.xml 2016-06-27 09:17:09 -04:00
asadiqbal
0d32f71113 WL-538 changes to make UI responsive 2016-06-27 17:34:37 +05:00
Awais Jibran
4f10552add Merge pull request #12834 from edx/aj/ecom4775-change-bulk-enroll-mgm-cmd 
Fix `bulk_change_enrollment` command to emit event
 2016-06-27 17:33:18 +05:00