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

14643 Commits

Author SHA1 Message Date
wajeeha-khalid
98ba4b779c MA-2076: add due date to course block API 2016-07-25 11:06:47 +05:00
Mushtaq Ali
d4ff39a391 Merge pull request #12237 from edx/mushtaq/maintenance 
Maintenance app and force publish course view
 2016-07-23 01:23:58 +05:00
Daniel Naranjo
f84d05b9af add formatting and indentation best practices (#12850) 
add_missing_semicolon

simple SpaceBeforeBrace
 2016-07-22 15:42:42 -04:00
Mushtaq Ali
27646b7e6f Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-07-22 18:29:12 +00:00
Eric Fischer
1af5e2abda Retry-while-retrying is not an error in bulk email (#13068) 
This code will be hit if, during a retry of the send_email task, an error
is encountered that means we need to retry the task again. Since the task will
be retried with timed backoff up to predefinied limits, this is an expected
situation and does not need to be logged as an exception.
 2016-07-22 14:19:03 -04:00
Ned Batchelder
3799890b98 Merge pull request #13072 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-07-22 10:14:30 -04:00
Kevin Kim
2fddd2bd71 Initial check of removing feature flag (#13058) 2016-07-22 09:28:19 -04:00
Ned Batchelder
eaece533a9 Update translations (autogenerated message) 2016-07-22 09:28:15 -04:00
Nimisha Asthagiri
b04a6a6a4b Merge pull request #13053 from edx/tnl/grades-app 
Create Grades djangoapp
 2016-07-22 09:07:40 -04:00
Nimisha Asthagiri
1ada5c3487 Create Grades djangoapp 
https://openedx.atlassian.net/browse/TNL-5008
 2016-07-22 00:09:43 -04:00
Christina Roberts
467bc55d27 Merge pull request #12950 from edx/christina/studio-support-levels 
Studio support level of components/xblocks
 2016-07-21 17:13:58 -04:00
sanfordstudent
f2a1984f1a Revert "genericizing transformer" (#13063) 
This reverts commit 4e65b1f14b.
 2016-07-21 17:04:07 -04:00
Renzo Lucioni
719edc7632 Merge pull request #13032 from edx/renzo/program-utility-cleanup 
Handle unavailable course runs on the program detail page
 2016-07-21 16:30:44 -04:00
cahrens
d4cc7b8ffd Support level support for Studio xblock creation. 
TNL-4670
 2016-07-21 15:44:59 -04:00
Renzo Lucioni
4c997601e9 Handle unavailable course runs on the program detail page 
Includes a refactor of the program data extension utility. ECOM-4807.
 2016-07-21 15:05:23 -04:00
Adam
05700243fe Merge pull request #13037 from OmarIthawi/edraak/calculator-2-fixups 
Calculator wording and translation improvements
 2016-07-21 14:42:53 -04:00
Eric Fischer
cae03d0349 Revert "moving milestones check to access.py" (#13060) (#13061) 
This reverts commit 5db58c0038.
 2016-07-21 13:58:35 -04:00
Robert Raposa
67e15e22e6 Merge pull request #13046 from edx/release 
Release 2016-07-20 back to Master
 2016-07-21 10:43:58 -04:00
Mushtaq Ali
d4f359d42a Merge pull request #13013 from edx/mushtaq/ecom4926-unactivated-user-msg 
Show user activation message if he has activation incomplete.
 2016-07-21 11:33:32 +05:00
Umar Nawaz
733cf06cd9 Merge pull request #13005 from edx/unawaz/ECOM-4787-account-settings-page-header 
unawaz/ECOM-4787-account-settings-page-header
 2016-07-21 01:13:32 +05:00
sanfordstudent
ed6995b0ba Merge pull request #12984 from edx/sstudent/TNL-4925 
generalizing proctored exam transformer
 2016-07-20 13:56:36 -04:00
Brian Jacobel
8ed78a387e Fix TNL-5011 (#13031) 
Vote button is now disabled for yourself, but count is still visible
 2016-07-20 13:29:33 -04:00
Chris
92010f003a Merge pull request #13015 from edx/clrux/ac-522 
AC-522 fixing checkboxgroup ignores in platform
 2016-07-20 11:37:23 -04:00
Sanford Student
4e65b1f14b genericizing transformer 2016-07-20 11:28:04 -04:00
unawaz
5f8bb35f9d Account settings page 
unawaz/ECOM-4787-account-settings-page-header
 2016-07-20 20:18:53 +05:00
Adam Palay
95c0b50ebe authenticate user after their reset confirmation goes through 
make password validation code more DRY

grammar nit: "less" -> "fewer"
 2016-07-20 11:06:58 -04:00
Nimisha Asthagiri
9d747fa65c Merge pull request #12975 from edx/tnl/hide_content 
LMS Hide Subsection Content
 2016-07-20 09:04:32 -04:00
Chris Rodriguez
51f9109bea AC-552 fixing checkboxgroup ignores in platform 2016-07-20 09:01:03 -04:00
Chris
3302b26e65 Merge pull request #12926 from edx/clrux/ac-524 
AC-524 fixes `label` ignores
 2016-07-20 09:00:15 -04:00
Chris Rodriguez
b97d063181 AC-524 - label - test_lms_instructor_dashboard.py 2016-07-20 07:49:48 -04:00
Omar Al-Ithawi
38e35ddf82 Added some comments for the translators in the calculator 2016-07-20 12:07:39 +03:00
Omar Al-Ithawi
185dbd3c9b Set the direction of the calculator input to LTR 2016-07-20 12:07:30 +03:00
Omar Al-Ithawi
ba2e7bb0c7 Corrected the direction of the English equations 2016-07-20 11:02:30 +03:00
Omar Al-Ithawi
6a3001570e TNL-3798: Removed the greek letters 2016-07-20 10:58:33 +03:00
Omar Al-Ithawi
7f9eaf0caa TNL-3798: Removed the subscript note 2016-07-20 10:58:04 +03:00
Mushtaq Ali
e58813be79 Show user activation message if he has activation incomplete. 
Only show validation deadline message when user is activated and course has validation deadline.
ECOM-4926
 2016-07-20 11:51:32 +05:00
Nimisha Asthagiri
37b8e6360c HiddenContentTransformer to check for hide_after_due 2016-07-19 21:13:14 -04:00
Nimisha Asthagiri
eb02f2adc1 LMS Update to hide subsection content based on due-date 
TNL-4905
 2016-07-19 21:13:14 -04:00
alisan617
43572db0e5 update UXPL v.0.16.1 2016-07-19 19:13:43 -04:00
Chris Rodriguez
a4a7948b1d AC-523 - duplicate-id - instructor_dashboard.py 2016-07-19 10:59:26 -04:00
Renzo Lucioni
ded0885c5c Merge pull request #13025 from edx/renzo/pdp-archived-courses 
Allow viewing of archived courses from the program detail page
 2016-07-19 10:08:17 -04:00
Jesse Zoldak
2a2a1c3c17 Merge pull request #12985 from edx/zoldak/EV-56 
Make the temp dir for instructor dashboard local files uniquely named EV-56
 2016-07-19 09:28:33 -04:00
Renzo Lucioni
b1f5916360 Allow viewing of archived courses from the program detail page 
ECOM-4974.
 2016-07-18 17:04:48 -04:00
Chris Rodriguez
237b955d97 AC-526 fixing invalid-aria-attr-value failures and ignores in the platform 2016-07-18 07:28:22 -04:00
E. Kolpakov
e0c7228d11 Quality, safe template linter and test fixes: 
* Safe template linter reports zero violations on modified files
* Removed some (or most) coffeescript-genereated returns
* Big HTML chunks in JS converted to underscore templates
* Markdown processor - safe tempate linter compatibility
* Fixed double escaping HTML tags in code blocks caused by passing it through postMathJaxProcessor twice
 2016-07-18 10:14:13 +03:00
Jesse Zoldak
5600a9bd0c Fix instructor_task model tests to use unique temp dirs 2016-07-16 09:37:30 -04:00
Jesse Zoldak
3647c17911 Make the temp dir for instructor dashboard local files uniquely named. EV-56 2016-07-16 09:37:30 -04:00
Renzo Lucioni
863782d021 Merge pull request #12991 from edx/renzo/run-marketing-urls 
Use course run marketing URLs from the catalog service on program detail page
 2016-07-15 17:55:01 -04:00
PaulWattenberger
ff247a6802 Merge pull request #13004 from edx/pwattenberger/sailthru-fix 
Fix 500 error unenrolling when running Sailthru integration on Stage ECOM-4960
 2016-07-15 17:40:36 -04:00
PaulWattenberger
ab242145cb Fix 500 error unenrolling when running Sailthru integration on Stage ECOM-4960 2016-07-15 16:36:20 -04:00