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

37884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jesse Zoldak
893d1f5dfe Merge pull request #13049 from edx/zoldak/TNL-5051 
Skip flaky CMS.Course updates lettuce tests  TNL-5051
 2016-07-20 21:04:15 -04:00
Eric Fischer
35ae67b530 New CMS visibility settings (#12940) 
TNL-4906 Subsections now use radio buttons, to allow for "hide after due" as a
visibility option. Also, all tabs have been consolidated to "Basic" and
"Advanced", and visibility options have moved there.

Documentation links are updated to assist course authors with the new
visibility options. Tests have also been updated, and the changes suggested
in TNL-4951 are included.
 2016-07-20 19:58:51 -04:00
Diana Huang
f3a46bfb07 Merge pull request #13045 from edx/diana/flaky-course-page-test 
Fix flaky asset page test
 2016-07-20 16:19:02 -04:00
Jesse Zoldak
8cdac6c99a Skip flaky CMS.Course updates lettuce tests TNL-5051 2016-07-20 16:15:26 -04: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
Renzo Lucioni
f0644abe3b Merge pull request #13033 from edx/renzo/handle-missing-catalog-config 
Allow program detail pages to function when catalog config is missing
 2016-07-20 15:46:59 -04:00
Andy Armstrong
51bb4d4e00 Merge pull request #12795 from eduNEXT/fmo/coffee_to_js_cms_main 
Convert cms/coffee/src/main to js
 2016-07-20 15:16:48 -04:00
Renzo Lucioni
935be27118 Allow program detail pages to function when catalog config is missing 2016-07-20 14:19:08 -04:00
Diana Huang
b51c4456b8 Fix flaky asset test. 2016-07-20 14:18:27 -04: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
Edward Zarecor
95800be01f Merge pull request #12999 from edx/e0d/random-passwords 
use random rather than unusable so they can be reset
 2016-07-20 09:28:26 -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
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
alisan617
bae7cfee81 Merge pull request #13028 from edx/alisan/update-pattern-library-version 
Icon class update in LMS user_dropdown and seq_module template html
 2016-07-19 22:37:59 -04: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
Simon Chen
1d768cde7a ECOM-4904 Move the program editor backbone app to Studio (#12962) 2016-07-19 19:09:51 -04:00
Brian Beggs
7745e7cdf7 Merge pull request #13030 from edx/bbeggs/1.8.14 
updating to Django 1.8.14 for XSS security fix
 2016-07-19 17:05:39 -04:00
Chris
390b74e279 Merge pull request #12925 from edx/clrux/ac-523 
AC-523 fixes 'duplicate-id' ignores
 2016-07-19 12:35:17 -04:00
Brian Beggs
7278102871 updating to Django 1.8.14 for XSS security fix 2016-07-19 11:47: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
Renzo Lucioni
a653d449fc Merge pull request #13024 from edx/renzo/pdp-enrollment-start 
Prevent program utilities from formatting dates prior to 1900
 2016-07-19 09:57:16 -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
Muddasser
3216940c13 Merge pull request #12789 from edx/muddasser/bok-choy-to-lettuce/course_settings 
course-settings.feature conversion to bokchoy
 2016-07-19 15:10:43 +05:00
Muddasser
186b3badb5 course-settings.feature conversion to bokchoy 2016-07-19 08:18:36 +00:00
Felipe Montoya
c32b30ba94 Relocating inside the cms namespace 
Addressing feedback
 2016-07-18 18:07:35 -05:00
Ben Patterson
26d49a7544 Merge pull request #12973 from eduNEXT/jfavellar90/TE-1194-2 
Relative to absolute imports for all files in common/test/acceptance/pages
 2016-07-18 19:04:22 -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
Renzo Lucioni
7ede26a117 Prevent program utilities from formatting dates prior to 1900 
ECOM-4973
 2016-07-18 16:22:51 -04:00
Chris
a9068dccde Merge pull request #13014 from edx/clrux/ac-526 
AC-526 fixing invalid-aria-attr-value failures and ignores in the platform
 2016-07-18 15:39:31 -04:00
alisan617
b66f163355 Merge pull request #13010 from edx/alisan/go_away_pycharm 
Remove pycharm xml files and add gitignore
 2016-07-18 15:11:13 -04:00
Christina Roberts
fa56b575c9 Merge pull request #13017 from edx/jeskew/xblock_version_num_bump 
Bump XBlock version to 0.4.12
 2016-07-18 12:18:21 -04:00
Jhony Avella
b1ee84b1d5 Relative to absolute imports for all files in common/test/acceptance/pages 
Added author

Fixing pylint line-too-long error

Added missing trailing comma
 2016-07-18 10:22:33 -05:00
John Eskew
ffcd3440de Bump XBlock version to 0.4.12 2016-07-18 11:06:31 -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
Eugeny Kolpakov
9f3b8ddf78 Merge pull request #12914 from open-craft/ekolpakov/discussion_fixes_from_solutions 
Discussion fixes from solutions
 2016-07-18 11:13:16 +03: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
E. Kolpakov
8d1e10bd8a Fixes and improvements from solutions fork: 
* Removing jQuery.ajax.beforeSend - it might be set globally and this code overrides it (part of 62fa253af6ee384f0766d72cd2d67bcf43697692)
* Avoid resetting Backbone history if already started (part of 9591b526bdd56163de0098099e46e44c566061f5)
* goHome no longer triggers thread:removed event - already triggered up the call stack (part of 9591b526bdd56163de0098099e46e44c566061f5)
* Avoid using beforeSend as it might be set globally (adapted from 2dfe104f3915efa546c85ef277eb75c5abb9b49b)
* Refactor triggering navigation to use constant/method instead of magic strings (part of 4843facd507b1cee8712bf10e96ff6c25c98bca2)
* Switching to using jQueyr.prop instead of jQuery.attr
* Fixed email notifications enable/disable (adapted from 8a7f022)
* Load thread if requested thread isn't loaded yet (adapted from e28dde32169b388235030dba945366f4c13e565f)
* Added ability to set custom css classes on search messages (adapted from b2e4c18905d7c7560838e264d6b218a3c4c6dc1f)
* Actually rerendering view with new model data when it is loaded/changed
 2016-07-18 10:13:44 +03:00
Jesse Zoldak
5600a9bd0c Fix instructor_task model tests to use unique temp dirs 2016-07-16 09:37:30 -04:00