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

37829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
9ab92d58c3 Revert "moving milestones check to access.py" (#13060) 
This reverts commit 5db58c0038.
 2016-07-21 13:12:44 -04:00
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
Robert Raposa
6e04ddcc4d Merge pull request #13041 from edx/robrap/activate-fix 
activate fix
 2016-07-20 13:22:49 -04: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
Renzo Lucioni
5ba8cf8324 Merge pull request #13011 from edx/renzo/catalog-integration-admin 
Register CatalogIntegration model with the Django admin
 2016-07-17 18:27:25 -04:00
Renzo Lucioni
71739f3f44 Register CatalogIntegration model with the Django admin 2016-07-17 01:26:01 -04:00
John Eskew
92923638b2 Merge pull request #13009 from edx/jeskew/bump_xblock_version 
Merging - @robrap FYI.
Bump XBlock version to 0.4.12
 2016-07-15 16:42:50 -04:00
John Eskew
924f114b7c Bump XBlock version to 0.4.12 2016-07-15 15:23:25 -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
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
Jhony Avella
c25cdbad07 Removing references to deleted module common.test.acceptance.pages.lms.rubric 2016-07-13 17:38:10 -05:00
Adam
6e7d4cef04 Merge pull request #12992 from open-craft/bump-problem-builder-2.0.4 
Bump problem-builder on edx.org to edx-release 2.0.4
 2016-07-13 17:30:28 -04:00
Cliff Dyer
b9056f96a5 Merge pull request #12951 from edx/release 
Release
 2016-07-13 14:10:02 -04:00
Braden MacDonald
c0f608e638 Bump problem-builder on edx.org to edx-release 2.0.4 2016-07-13 10:37:49 -07:00
Chris
c72d2b56bc Merge pull request #12990 from edx/clrux/tabs-hotfix 
Hotfix for tabs
 2016-07-13 12:12:46 -04:00
Chris Rodriguez
638263027d Hotfix for tabs 2016-07-13 11:13:39 -04:00
Cliff Dyer
e6c88a2415 Merge pull request #12963 from edx/rc/2016-07-12 
Release Candidate: 2016-07-12
 2016-07-13 10:19:33 -04:00
Toby Lawrence
71bebec579 Merge pull request #12986 from edx/PERF-351 
Account for settings.STATIC_URL in XBlock resource URLs when rewriting them.
 2016-07-13 09:39:52 -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
Toby Lawrence
8ab62b5b99 [PERF-351] Account for settings.STATIC_URL in XBlock resource URLs when 
rewriting them.

In PERF-341, we adjusted the static_replace middleware to try and
exclude static XBlock resource URLs from being interpreted as the marker
URLs used to signify course assets in course content.  Since they both
started with /static, this could, and did, cause issues where linking
directly to the assets of an XBlock within, say, one of its templates,
would lead to that link being rewritten and ultimately being incorrect.
The fix attempted to see if the link started with the prefix that all
static XBlock resource URLs start, and if so, it returned them
unmodified.

We incorrectly assumed that our testing captured all cases, and since
we're here, we know that this was wrong.  We weren't accounting for cases
when the URLs being generated had the STATIC_URL configuration value
prefixed -- https://example.com/static/xblock/.... -- and so our direct
check of seeing if such a URL started with "/static/xblock" would always
fail, leading to the erroneous rewriting and nonsensical output.

This fix checks if the link either starts with the prefix OR if it
starts with the STATIC_URL value and contains the prefix overall.  There
is a small overlap between the STATIC_URL and the prefix we check for,
so an inconsistency could arise down the line if we changed our
STATIC_URL to use a difference base directory, but our tests will at
least catch the issue now.
 2016-07-12 22:33:11 -04: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
Cliff Dyer
e410cd972e Merge pull request #12981 from edx/adam/small-fix-to-rc 
small fix to typo in activation email
 2016-07-12 16:12:05 -04:00
Chris
facb1eb8fd Merge pull request #12953 from edx/clrux/ac-517 
AC-517 fixes `color-contrast` ignores
 2016-07-12 15:30:29 -04:00
Jesse Zoldak
5e6f89b0a9 Mark test for skipping SOL-1811 2016-07-12 15:20:04 -04:00
caseylitton
a6e028c6b4 Add flag allow toggle logistration footer 2016-07-12 12:13:12 -07:00
caseylitton
6761be0b29 Add name and email to Authors 2016-07-12 12:13:03 -07:00
Chris Rodriguez
4e4c740c2c AC-517 fixes color-contrast ignores across platform 2016-07-12 14:41:06 -04:00
Chris
3d76f092dd Merge pull request #12983 from edx/clrux/safelint-fixup 
Safelint violation count
 2016-07-12 14:40:42 -04:00
Jesse Zoldak
e33ddbea98 Merge pull request #12982 from edx/zoldak/SOL-1811 
Mark test for skipping SOL-1811
 2016-07-12 14:24:54 -04:00
Chris Rodriguez
1b7fe5978a Safelint violation count 2016-07-12 14:03:28 -04:00
Adam Palay
58073d2fe1 small fix to typo in activation email 2016-07-12 13:46:25 -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
Jesse Zoldak
c6e0813785 Mark test for skipping SOL-1811 2016-07-12 13:16:21 -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
d728746d20 Merge pull request #12979 from edx/clrux/rc-footer-badge-fix 
Fixes mobile app footer link styles
 2016-07-12 09:19:36 -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
Fred Smith
d82292cb98 Merge pull request #12971 from edx/derf/go_away_pycharm 
Remove pycharm project files and gitignore
 2016-07-11 15:51:00 -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
Douglas Hall
a873bf7c7b Merge pull request #12901 from edx/douglashall/WL-541 
WL-541 Add recipient key to Zendesk ticket creation API request payload
 2016-07-11 15:36:11 -04:00
Douglas Hall
c38f2373c7 Add recipient key to Zendesk ticket creation API request payload 2016-07-11 14:56:44 -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