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

37864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanford Student
4e65b1f14b genericizing transformer 2016-07-20 11:28:04 -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
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
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
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
Jesse Zoldak
3647c17911 Make the temp dir for instructor dashboard local files uniquely named. EV-56 2016-07-16 09:37:30 -04:00
Chris
e1dbfe3aac Merge pull request #13007 from edx/clrux/ac-531 
AC-531 fixing nav-aria-label ignores in the platform
 2016-07-15 21:09:08 -04:00
alisan617
72dbbaeafb delete unwanted pycharm xml files 2016-07-15 21:03:19 -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
Renzo Lucioni
a43c507a00 Use course run marketing URLs from the catalog service on program detail page 
Part of ECOM-4566.
 2016-07-15 16:12:10 -04:00
Chris Rodriguez
3b3186c6ea AC-531 fixing nav-aria-label ignores in the platform 2016-07-15 12:21:37 -04:00
alisan617
6fe894f305 Merge pull request #12977 from edx/alisan/tnl-4815-remove-edx-icons-usage-from-studio 
Remove edx icons usage in platform
 2016-07-15 11:22:30 -04:00
Ned Batchelder
9e189f7cc1 Merge pull request #13000 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-07-15 09:55:44 -04:00
Ben Patterson
0d227afc4e Merge pull request #12994 from eduNEXT/jfavellar90/rubric-pages-fix 
Removing references to deleted module common.test.acceptance.pages.lm…
 2016-07-15 08:11:46 -04:00
Ahsan Ulhaq
18a2b535ba Merge pull request #12922 from edx/ahsan/ECOM-4681-Tech-Debt-on-Certificate-generate-panel 
Tech Debt on Certificate generate panel
 2016-07-15 15:56:14 +05:00
Ned Batchelder
49f8f4d2e9 Update translations (autogenerated message) 2016-07-15 00:08:25 +00:00
Saleem Latif
bfae8206ff Merge pull request #12987 from edx/saleem-latif/branding-logo-url-fix 
Fix branding api get_logo_url return value
 2016-07-14 17:52:28 +05:00
e0d
8a18b2c351 use random rather than unusable so they can be reset 2016-07-14 08:09:51 -04:00
Awais Jibran
07467a5b68 Merge pull request #12989 from edx/aj/add-logging-for-allow-donation 
Adding logging if course_id is not found in enrolled course modes.
 2016-07-14 15:03:08 +05:00
Awais Jibran
dba8a51f59 Adding logging if course_id is not found in enrolled course modes. 2016-07-14 12:59:38 +05:00
alisan617
95b2bfbbee Remove edx-icons usage in studio - TNL-4815 
Remove edx-icons from edx-platform - TNL-4813
Remove edx-icons from LMS - TNL-4952
comment out baseline screenshot Bokchoy assertion tests
SOL-1937 Temporarily comment out baseline screenshot Bokchoy assertion tests
 2016-07-13 19:43:59 -04:00