Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,367 Commits 1 Branch 0 Tags
7c1f6ff2c0024bf4a003b2f07dc257bb75c6dd9d
Commit Graph

40367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qubad786
7c1f6ff2c0 Mgmt. Command to Sync Marketing Urls from Catalog service 
Introduces a mgmt. command that retrieves course runs from catalog service in order to update marketing urls for the courses found in course metadata cache (i.e. CourseOverview). This also provides an updated utility to retrieve course sharing url.
 2017-03-06 20:12:31 +05:00
Michael Youngstrom
01ed17426f Merge pull request #14628 from edx/michaelyoungstrom/revert_django_setting 
[WIP] Revert Django renderer change
 2017-03-03 17:37:41 -05:00
Michael Youngstrom
fa74e0bf19 Revert Django renderer change 
Force run on PR

Remove force run on PR
 2017-03-03 17:34:02 -05:00
Brandon DeRosier
20ae9948d1 Merge pull request #14610 from open-craft/bdero/fix-enterprise-api-url 
Keep default ENTERPRISE_API_URL if LMS_ROOT_URL not set
 2017-03-03 14:30:10 -05:00
Nimisha Asthagiri
0465f6bf4a Merge pull request #14627 from edx/neem/bs_fix_logs 
Fix BlockStructure log statements
 2017-03-03 13:26:11 -05:00
Nimisha Asthagiri
6e61f063fa Merge pull request #14626 from edx/neem/update_bs_version 
Increment BlockStructureBlockData.VERSION
 2017-03-03 12:39:23 -05:00
Nimisha Asthagiri
9c2e5f257c Fix BlockStructure log statements. 2017-03-03 12:20:58 -05:00
alisan617
190501b873 Merge pull request #14609 from edx/alisan/site-status-PL 
platform site status message bar styling clean up
 2017-03-03 12:02:27 -05:00
Douglas Hall
d70101a256 Merge pull request #14499 from edx/hasnain-naveed/WL-766/front-end 
WL-766 Program marketing page view
 2017-03-03 11:47:36 -05:00
Nimisha Asthagiri
bda2a793ac Increment BlockStructureBlockData.VERSION 2017-03-03 11:42:52 -05:00
Brian Jacobel
f3bce3ee20 Merge pull request #13903 from proversity-org/proversity/feature-cookie-consent 
add cookie consent feature flag and popup banner
 2017-03-03 11:16:16 -05:00
Eric Fischer
a82b8549dc Merge pull request #14607 from edx/efischer/deprecated_message 
More specific messaging for unsupported block types
 2017-03-03 10:27:50 -05:00
Cliff Dyer
d6e2673917 Merge pull request #14620 from edx/cdyer/celeryutils-0.1.3 
Version bump and use new pypi version.
 2017-03-03 10:14:09 -05:00
alisan617
7802e518d3 remove white error img replace with FA icon 2017-03-03 09:50:54 -05:00
Awais Jibran
2881bac3bc Merge pull request #14623 from edx/aj/fix-edit-discussions 
Fix discussion Edit post.
 2017-03-03 18:29:51 +05:00
mikedikan
dca22ff229 Merge pull request #14613 from edx/mdikan/remove-deprecated-references-to-apiconfig 
Remove deprecated references to ProgramsApiConfig model
 2017-03-03 07:42:21 -05:00
Ned Batchelder
65febd6122 Merge pull request #14618 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-03-03 06:28:24 -05:00
AsadAzam
4af5d45dcd Merge pull request #14603 from edx/asadazam/ecom-7252-refund-cutoff-log 
added log for refund cutoff date
 2017-03-03 15:57:43 +05:00
Awais Jibran
0f1ec82e0a Fix discussion Edit post. 
TNL-6631
 2017-03-03 15:29:13 +05:00
Asad Azam
3102b2dd80 added log for refund cutoff date 2017-03-03 15:05:51 +05:00
Ahsan Ulhaq
090f4e419f Merge pull request #14600 from edx/ahsan/ECOM-6977-ensure-hidden-html-content-not-render 
Hidden html content on the dashboard are rendered
 2017-03-03 14:51:34 +05:00
Ahsan Ulhaq
2d1bb9bf7f Hidden html sontent on the dashboard are rendered 
ECOM-6977
 2017-03-03 13:17:31 +05:00
Mike Dikan
ca64946b99 Remove deprecated references to ProgramsApiConfig model 
ECOM-7195

The (now deprecated) programs service had several fields to set up configuration of the API.  We are removing the property/field references in codeas the first part of deprecating the model fields.  Also being removed are the model properties.
 2017-03-02 18:07:23 -05:00
J. Cliff Dyer
d216488352 Version bump and use new pypi version. 2017-03-02 16:20:10 -05:00
Hasnain
d6d2b2d50f Add program marketing view 
This change adds the URL configuration and Django view required
to implement a program marketing page. It is left to theme builders
to implement a template that fulfills their own UX requirements.

WL-766
 2017-03-02 14:38:01 -05:00
Ned Batchelder
6c44eee00e Update translations (autogenerated message) 2017-03-02 19:25:59 +00:00
Umar Nawaz
b23854244d Merge pull request #14604 from edx/unawaz/ECOM-6902-a11y-footer-links 
a11y footer links to ul
 2017-03-02 10:30:50 -08:00
Nimisha Asthagiri
ed5eda3fd0 Merge pull request #14617 from edx/neem/command-generate-blocks 
Block Structure Storage management command
 2017-03-02 13:04:50 -05:00
Nimisha Asthagiri
952143b776 Block Structure Storage management command 
TNL-6524
 2017-03-02 12:07:26 -05:00
Nimisha Asthagiri
95e24a4b85 Merge pull request #14606 from edx/neem/move_block_structure 
Consolidate Block Structure folders
 2017-03-02 12:02:21 -05:00
Eric Fischer
f00f55566f More specific messaging for deprecated block types 
TNL-6628
 2017-03-02 10:20:39 -05:00
Uzair Rasheed
ed658ff868 Merge pull request #14508 from edx/uzairr/ECOM-6757 
Send activation email to un-activated user
 2017-03-02 19:05:59 +05:00
umar-nawaz
cee0eb8779 a11y footer links to ul 2017-03-02 15:28:22 +05:00
uzairr
07ddf9b452 Send activation email to un-activated user 2017-03-02 10:04:09 +00:00
Hasnain Naveed
92348a2447 Merge pull request #14596 from edx/hasnain-naveed/WL-989 
Management command for back-populating the 'created_on_site' in UserA…
 2017-03-02 12:36:38 +05:00
Nimisha Asthagiri
00d466224e Consolidate Block Structure folders 
TNL-6518
 2017-03-01 21:19:28 -05:00
sanfordstudent
11dce770c4 Merge pull request #14608 from edx/sstudent/utc_modified_times 
ensure that modified start/end are treated as UTC by django
 2017-03-01 16:07:21 -05:00
Brandon DeRosier
48fe4ad10b Keep default ENTERPRISE_API_URL if LMS_ROOT_URL not set 2017-03-01 15:48:25 -05:00
Sanford Student
576516b599 ensure that modified start/end are treated as UTC by django 2017-03-01 15:15:17 -05:00
Nimisha Asthagiri
090fc12b5a Merge pull request #14512 from edx/beryl/cbs_waffled_manager 
Storage-backed Versioned Block Structures: Manager and Store
 2017-03-01 10:26:56 -05:00
Jesse Shapiro
45eff7efd1 Merge pull request #14574 from open-craft/haikuginger/add-edx-api-collection-option 
[ENT-200] Add many=True kwarg to get_edx_api_data to modify empty return value
 2017-03-01 10:05:38 -05:00
Hasnain
7764b0128f Management command for back-populating the 'created_on_site' in UserAttribute model. 2017-03-01 18:09:49 +05:00
Zia Fazal
84ad88b7af Merge pull request #14568 from edx/ziafazal/YONK-523-b 
Moved tagging aside xblock data save/update logic out of preview_hanlder
 2017-03-01 12:48:31 +05:00
Zia Fazal
9041ed1400 removed statement which updates xblock in preview handler 
added test to support changes

moved aside xblock data save logic int component_handler

changes after feedback

fixed typo
 2017-03-01 11:45:52 +05:00
Andy Armstrong
f6876ce199 Merge pull request #13937 from edx/andya/use-ui-blocks 
[WIP] Use web fragments for discussion and static tabs
 2017-03-01 00:36:48 -05:00
Nimisha Asthagiri
02c24cb259 Block Structure query count and API changes 2017-02-28 23:54:57 -05:00
Nimisha Asthagiri
1ee2c27f49 Storage-backed versioned Block Structures: Manager and Store 2017-02-28 23:54:57 -05:00
Nimisha Asthagiri
77a29242e3 Merge pull request #14571 from edx/beryl/cbs_models 
Storage-backed versioned Block Structures: Models
 2017-02-28 23:50:21 -05:00
Andy Armstrong
248558f1d4 Render Discussion tab using web fragments 2017-02-28 23:39:39 -05:00
George Song
5e21f64c2c Merge pull request #14585 from vagupta16/fix-course-about-invalid-course-id-upstream 
Ensure that course_about uses a valid course ID
 2017-02-28 09:32:16 -08:00