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

40346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Jesse Shapiro
9d01bd9203 Merge pull request #14567 from open-craft/haikuginger/link-user-when-consent-disabled 
[ENT-210] Remove unnecessary pipeline element; use new name for existing element
 2017-02-28 11:37:57 -05:00
Jesse Shapiro
d61ad613c9 Add many=True kwarg to get_edx_api_data to modify empty return value; make resource_id checks slightly more strict 2017-02-28 11:34:10 -05:00
Cliff Dyer
c42bce4965 Merge pull request #14041 from ubc/ubcpi-0.6.0-update 
Update Peer Instruction XBlock to 0.6.2
 2017-02-28 10:37:26 -05:00
Jesse Shapiro
ff581d003f Remove unnecessary pipeline element; use new name for existing element 2017-02-28 09:54:57 -05:00
David Ormsbee
39fc6ce1f5 Merge pull request #14586 from edx/ormsbee/test_bulk_ops_1 
Move more tests to use bulk_operations
 2017-02-28 09:42:50 -05:00
David Ormsbee
825621a3dd Merge pull request #14589 from edx/ormsbee/faster_startup_pynliner 
LMS startup optimization: lazy load pynliner
 2017-02-28 09:00:32 -05:00
Ben Patterson
5f090e092e Merge pull request #14597 from edx/benp/fix-TNL-6040 
Benp/fix tnl-6040
 2017-02-27 18:21:53 -05:00
Pan Luo
6045fbcc58 Update UBCPI to 0.6.2 
Related changes https://github.com/ubc/ubcpi/pull/111
 2017-02-27 12:29:32 -08:00
Eric Fischer
e50d45dbb5 Merge pull request #14598 from edx/efischer/quick 
Cleaner grades exception handling
 2017-02-27 14:45:58 -05:00
Ben Patterson
819706a1c5 Remove flaky decorator. Feel optimistic. 2017-02-27 14:21:46 -05:00
David Ormsbee
b3a62bd252 LMS startup optimization: Load pynliner locally. 
pynliner imports cssutils, which has an expensive initialization. All
told, it can account for 15-20% of "fast" LMS startup (without asset
compilation). So we're going to load it locally here so that we delay
that one-time hit until we actually do the (rare) operation that is
sending a credit notification email.
 2017-02-27 14:07:44 -05:00
Eric Fischer
715076a48b Cleaner grades exception handling 2017-02-27 13:53:31 -05:00
Ben Patterson
a745b2d401 Temp commit to ensure flakiness is corrected. 2017-02-27 12:12:47 -05:00
Ben Patterson
4c527c370f Fix flakiness on test (it wasn't waiting for jquery to be loaded) 2017-02-27 12:11:58 -05:00
Jeremy Bowman
c8f7587f6b Merge pull request #14552 from edx/jmbowman/async_course_import 
PLAT-1104 Import courses asynchronously
 2017-02-27 12:01:06 -05:00
Jesse Shapiro
c6e6c8727d Merge pull request #14556 from open-craft/haikuginger/fix-enterprise-enrollment-api-url 
[ENT-208] Update AWS ENTERPRISE_ENROLLMENT_API_URL variable
 2017-02-27 10:41:44 -05:00
Nimisha Asthagiri
6f9b810f9a Storage-backed versioned Block Structures: Configuration 2017-02-27 00:39:22 -05:00
Nimisha Asthagiri
2f3b0b4cc8 Storage-backed versioned Block Structures: Settings 2017-02-27 00:39:22 -05:00
Nimisha Asthagiri
fb73888eba Storage-backed versioned Block Structures: Models 2017-02-27 00:39:21 -05:00
cahrens
8fedc08c2a Support web fragments for tabs. 2017-02-24 17:55:32 -05:00