Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,093 Commits 1 Branch 0 Tags
799e2bb4e4957dd3a2d2e77c92fcf787c19a6060
Commit Graph

42093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Raposa
80c361f10b Merge pull request #13006 from edx/rc/2016-07-19 
Release Candidate rc/2016-07-19
 2016-07-20 15:03:29 -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
Robert Raposa
6e04ddcc4d Merge pull request #13041 from edx/robrap/activate-fix 
activate fix
 2016-07-20 13:22:49 -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
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
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
Omar Al-Ithawi
0d71d0d6d3 Corrected RTL issues new forum post button: 
- Word break in Arabic on Google Chrome
 - Refactored forum buttons
 2016-07-20 06:38:45 +03: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
Amir Qayyum Khan
5839e1ca12 rearrage test code to avoid confusion 2016-07-18 14:40:32 +05:00
Amir Qayyum Khan
c0fc8669ba Only coach can access ccx dashboard 2016-07-18 14:40:32 +05: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