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

14611 Commits

Author SHA1 Message Date
Sanford Student
4e65b1f14b genericizing transformer 2016-07-20 11:28:04 -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
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
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
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
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
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
Cliff Dyer
b9056f96a5 Merge pull request #12951 from edx/release 
Release
 2016-07-13 14:10:02 -04:00
Chris Rodriguez
638263027d Hotfix for tabs 2016-07-13 11:13:39 -04:00
Ahsan Ulhaq
518218ba7d Tech Debt on Certificate generate panel 
ECOM-4681
 2016-07-13 12:44:23 +05:00
Saleem Latif
5503285f5c Fix branding api get_logo_url return value 2016-07-13 09:25:22 +05:00
Douglas Hall
0332ebea9e Merge pull request #12880 from caseylitton/up_logistration_toggle_footer_setting 
Add flag allow toggle logistration footer
 2016-07-12 20:34:51 -04:00
caseylitton
a6e028c6b4 Add flag allow toggle logistration footer 2016-07-12 12:13:12 -07:00
Chris Rodriguez
4e4c740c2c AC-517 fixes color-contrast ignores across platform 2016-07-12 14:41:06 -04:00
Renzo Lucioni
b1fcc51c7f Merge pull request #12965 from edx/renzo/catalog-config-model 
Add ConfigurationModel governing integration with the catalog service.
 2016-07-12 13:34:11 -04:00
Chris
53c98f10cc Merge pull request #12750 from edx/clrux/ac-486 
AC-486 updating tabbed_view to use proper accessibility rules
 2016-07-12 12:50:20 -04:00
Chris Rodriguez
298f168e23 AC-486 updating tabbed_view to be accessible 2016-07-12 11:01:11 -04:00
Chris Rodriguez
30ed53d446 Fixes mobile app footer link styles 2016-07-12 07:43:08 -04:00
Asad Iqbal
7147a69490 Merge pull request #12968 from edx/asadiqbal08/WL-552 
asadiqbal08/WL-552 ID-Verification message is responsive in activate account page
 2016-07-12 11:42:11 +05:00
sanfordstudent
d13e456959 Merge pull request #12939 from edx/sstudent/TNL-4924 
moving milestones/gating check to access.py
 2016-07-11 16:21:53 -04:00
Renzo Lucioni
e7cdcb9b71 Merge pull request #12954 from edx/renzo/extract-token-generation 
Unify JWT generation code
 2016-07-11 15:37:14 -04:00
Renzo Lucioni
191a353078 Add ConfigurationModel governing integration with the catalog service. 
This is the first in a series of commits that will retrieve and use data from the catalog API. Part of ECOM-4566.
 2016-07-11 14:47:55 -04:00
Sanford Student
5db58c0038 moving milestones check to access.py 2016-07-11 14:32:52 -04:00
Kevin Kim
dfc1cf1546 Fix the About Me section on the learner profile page. 2016-07-11 15:58:55 +00:00
asadiqbal
682fde96d9 WL-552 2016-07-11 17:44:54 +05:00
Chris
db04911268 Merge pull request #12924 from edx/clrux/ac-521 
AC-521 fixes 'data-table' ignores
 2016-07-08 17:10:22 -07:00
Chris Rodriguez
ddc93abf81 AC-521 fixes data-table ignores in the platform 2016-07-08 15:28:31 -04:00
Christina Roberts
b6b792826c Merge pull request #12864 from edx/christina/disable-xblocks 
Move disabling of XBlocks to new XBlockConfiguration model
 2016-07-08 15:05:17 -04:00
Cliff Dyer
cb4c712558 Merge pull request #12964 from edx/adam/merge-release-to-rc 
Adam/merge release to rc
 2016-07-08 13:53:57 -04:00
Ned Batchelder
9132b7d555 Update translations (autogenerated message) 2016-07-07 21:02:43 -04:00
Amir Qayyum Khan
0d3f96d4b5 Fixed CCX coach dashboard access issues. 2016-07-08 04:24:19 +05:00
Renzo Lucioni
f6d7371dd1 Unify JWT generation code 
These changes unify four different approaches to JWT creation, moving the core of the AccessTokenView to a general-purpose JwtBuilder class. This utility class defaults to using the system's JWT configuration, but it will allow overriding of the signing key and audience claim to support those clients which still require this. Part of ECOM-4566.
 2016-07-07 16:38:39 -04:00