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

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
a5913a4836 LMS: adding in basic is-deprecated visual styling 2014-12-09 13:57:20 -05:00
Sarina Canelake
919e411fd9 Only show "Course Statistics at a Glance" in the Admin tab 2014-12-09 13:57:20 -05:00
Sarina Canelake
bfa8349ec4 Clean up Datadump section on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
5aeb412bbe Remove deprecated cohorts management on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
762b0d9b6b Clean up Manage Groups section on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
3474601321 Add CSS rules for legacy dash deprecation warnings 2014-12-09 13:57:20 -05:00
Sarina Canelake
e3179c37cd Clean up Email section of legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
d4a06794d0 Clean up Forum Admin section of legacy dashboard 2014-12-09 13:57:19 -05:00
Sarina Canelake
5d7f820d93 Clean up Admin section of legacy dashboard 2014-12-09 13:57:19 -05:00
Sarina Canelake
d8904d9091 Clean up Grade Downloads section of legacy dash 2014-12-09 13:57:19 -05:00
Sarina Canelake
a15110f01c Remove Grade Adjustment code from legacy dash 2014-12-09 13:57:19 -05:00
Sarina Canelake
0a5af2a385 Rename legacy dash template 2014-12-09 13:57:19 -05:00
Adam Palay
abdae8261c add 'defunct' states for shoppingcart (ECOM-737) 
add retire method to order class
 2014-12-09 12:59:20 -05:00
Clinton Blackburn
9a309448b6 Merge pull request #6200 from edx/jeskew/fix_500_error_mongo_fmt_change 
Upon fail-over check, change asset metadata document to new format.
 2014-12-09 12:15:59 -05:00
John Eskew
755241f5eb Upon fail-over check, change asset metadata document to new format. 2014-12-09 11:24:30 -05:00
jmclaus
910466e0d8 Merge pull request #5829 from edx/jmclaus/load_ova_js_from_templates_with_requirejs 
In LMS, load OVA JS only in four OVA templates with requireJS. [TNL-693-outdated]
 2014-12-09 11:03:35 -05:00
Clinton Blackburn
5110632ecf Merge pull request #6197 from edx/talbs/fix-lms-calculator-toggle 
FIX - LMS: removing un-needed utility Sass mixin from calc styling
 2014-12-09 09:55:06 -05:00
jmclaus
082cb3b9ed Load OVA JS with requireJS in LMS. 2014-12-09 09:49:45 -05:00
Brian Talbot
39125bcc0a LMS: removing un-needed utility Sass mixin from calc styling 2014-12-09 09:41:57 -05:00
chrisndodge
099d02d13d Merge pull request #6124 from edx/muhhshoaib/WL-164 
Unpurchased items in the shoppingcart should be removed if the enrollment period has closed
 2014-12-09 09:25:46 -05:00
Will Daly
26dfb3b346 Merge pull request #6194 from edx/will/ecom-757 
ECOM-757: Fix reference error with emailOptIn variable
 2014-12-09 09:04:26 -05:00
Will Daly
0fd6dddbae Fix reference error with emailOptIn variable 2014-12-09 08:31:03 -05:00
Waheed Ahmed
b0eba8a62e Merge pull request #6114 from edx/waheed/tnl892-fix-css-background-image-for-important-visual-indicator 
Added IMG tag instead of css background property for important visual indicator.
 2014-12-09 14:11:39 +05:00
Waheed Ahmed
222b05a158 Added IMG tag instead of css background property for important visual indicator. 
TNL-892
 2014-12-09 12:38:54 +05:00
Muhammad Shoaib
829f7dba5f Remove items from the shopping cart if they are for a course whose course enrollment window has closed 
changed the url name to verify_cart and change the color of the message in the shopping cart
 2014-12-09 12:20:37 +05:00
Clinton Blackburn
4a502c2964 Merge pull request #6185 from edx/adam/update-codejail 
update codejail for better logging (TNL-835)
 2014-12-08 16:04:54 -05:00
Adam Palay
b85a4655c4 update codejail for better logging (TNL-835) 2014-12-08 16:01:02 -05:00
Clinton Blackburn
97bc506b45 Merge pull request #6179 from edx/sanchez/email_optin_third_party 
3rd-party pipeline supports updating email optin
 2014-12-08 14:56:30 -05:00
Clinton Blackburn
71bc536c6d Merge pull request #6183 from edx/renzo/email-opt-in-copy 
Improved support for multiple organization names
 2014-12-08 14:55:06 -05:00
stephensanchez
7ab0cb0730 3rd-party pipeline supports updating email optin 
Fix all the 3rd party auth scenarios.

Update pipeline to preserve parameters.

Updating tests
 2014-12-08 19:52:06 +00:00
Andy Armstrong
2b0f959bd7 Merge pull request #5942 from edx/cohorted-courseware 
Cohorted courseware
 2014-12-08 14:38:30 -05:00
Clinton Blackburn
5b0b967376 Merge pull request #6184 from edx/adam/dont-export-ophan-draft-children 
don't export draft children of orphaned drafted (TNL-923)
 2014-12-08 14:27:48 -05:00
Adam Palay
27c710b85d don't export draft children of orphaned drafted (TNL-923) 2014-12-08 14:14:38 -05:00
Renzo Lucioni
1d1baa5009 Improved support for multiple organization names 
Updates copy used in the checkbox label, constructs strings within the view instead of passing through a separate context variable, and alleviates unipain
 2014-12-08 14:10:09 -05:00
Ben Patterson
99b55f88d6 Merge pull request #6181 from edx/revert-6096-jarv/config-refactor-wip 
Revert "Jarv/config refactor wip"
 2014-12-08 14:09:07 -05:00
Ben Patterson
89397d00f9 Revert "Jarv/config refactor wip" 2014-12-08 13:40:49 -05:00
David Baumgold
ca42dda7a7 Merge pull request #6127 from mitocw/cg/pin_cas_client 
Pin django-cas to hash
 2014-12-08 13:32:55 -05:00
Andy Armstrong
50e4416d00 Document the Open edX package. 2014-12-08 13:28:47 -05:00
John Jarvis
cc6111181d Merge pull request #6096 from edx/jarv/config-refactor-wip 
Jarv/config refactor wip
 2014-12-08 13:19:29 -05:00
John Eskew
72dbeb7fc3 Merge pull request #6166 from edx/jeskew/modulestore_asset_md_format_changes 
Make changes to the Mongo modulestore format for asset metadata.

https://openedx.atlassian.net/browse/PLAT-301
 2014-12-08 11:34:25 -05:00
Sarina Canelake
43ff734382 Merge pull request #6171 from edx/sarina/20141208-translation-update 
Update translations (autogenerated message)
 2014-12-08 11:23:18 -05:00
Will Daly
1511851abf Merge pull request #6170 from edx/will/old-login-register-email-opt-in 
Add email opt in to old login and register pages
 2014-12-08 11:15:01 -05:00
Sarina Canelake
dca161ccea Merge pull request #6168 from fmyzjs/patch-6 
Support unicode ANALYTICS_DASHBOARD_NAME
 2014-12-08 11:12:04 -05:00
Waqas Khalid
c88a017dea Merge pull request #5244 from mlkwaqas/waqas/tnl152-stop-voting-on-closed-thread 
Don't allow voting while the thread is closed
 2014-12-08 20:15:33 +05:00
Jason Zhu
7391f359dd Support unicode ANALYTICS_DASHBOARD_NAME 
I open this pull to support unicode ANALYTICS_DASHBOARD_NAME
 2014-12-08 23:10:27 +08:00
Christine Lytwynec
6821fd4093 Merge pull request #6122 from edx/clytwynec/dont-fail-diff-quality-for-todo 
Clytwynec/dont fail diff quality for todo
 2014-12-08 10:00:26 -05:00
Will Daly
23a51a6515 Add email opt in to old login and register pages 2014-12-08 09:29:16 -05:00
Adam
896b191503 Merge pull request #6161 from edx/adam/fix-openended-draft-export 
fix export for openassessment drafts (PLAT-249)
 2014-12-08 09:25:09 -05:00
Christine Lytwynec
25d76da4ef add disable fixme to pylintrc 2014-12-08 09:19:19 -05:00
Jim Abramson
8bddb09720 Merge pull request #6160 from edx/jsa/tnl-937 
avoid errors when forward-migrating course_groups after south conversion
 2014-12-08 08:58:43 -05:00