Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,303 Commits 1 Branch 0 Tags
5d7befdebe015bbd7ee25c28fa4103b4c90935a1
Commit Graph

20303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Rossi
5d7befdebe Generate certificate URLs. 2014-01-16 17:03:13 -05:00
Chris Rossi
bb43d4cae4 House cleaning. 2014-01-16 17:03:13 -05:00
Chris Rossi
ec2678a5c5 Refactor LinkedIn API code to common location for reuse. 2014-01-16 17:03:13 -05:00
Chris Rossi
dc9c52d757 Pep8, pylint. 2014-01-16 17:03:13 -05:00
Chris Rossi
2f9e9e2494 Refactor findusers script to be fully lazy, in hopes we don't run out of memory with huge numbers of users. 2014-01-16 17:03:12 -05:00
Chris Rossi
7a48e93575 Did not mean to check in proof of concept script. 2014-01-16 17:03:12 -05:00
Chris Rossi
411d39deea Script to log in to LinkedIn API. 2014-01-16 17:03:12 -05:00
Chris Rossi
b2db05fc89 Initial stab at placeholder email template. 2014-01-16 17:03:12 -05:00
Chris Rossi
fc17ed26d4 Properly handle already emailed courses. 2014-01-16 17:03:12 -05:00
Chris Rossi
2468c99c52 Test grandfather path. 2014-01-16 17:03:12 -05:00
Chris Rossi
2d5c4dae52 Test coverage. 2014-01-16 17:03:12 -05:00
Chris Rossi
e34d131f70 Skeleton for emails script. 2014-01-16 17:03:12 -05:00
vagrant
883563d8df Test max_calls == 0 2014-01-16 17:03:12 -05:00
Chris Rossi
a5d1cb3592 pep8 and pylint 2014-01-16 17:03:12 -05:00
Chris Rossi
64887c6870 Flesh out findusers script, except for LinkedIn API call, with tests. 2014-01-16 17:03:12 -05:00
Chris Rossi
cc53aab4ec Initial app and model for LinkedIn integration. 2014-01-16 17:03:12 -05:00
David Baumgold
9d0e9f6762 Add dummy start dates to static_tab and course_info xmodules 2014-01-16 15:34:55 -05:00
David Baumgold
c24820ae87 Change default start date for About pages 
So that About pages will display in the LMS if the user is not logged in
 2014-01-15 14:10:55 -05:00
Don Mitchell
7ff137866b Merge pull request #2180 from edx/usman/openended_post_hostname_argument 
Added hostname argument to openended_post command.
 2014-01-15 09:05:32 -08:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org 
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
 2014-01-14 14:36:01 -05:00
Feanil Patel
a86086b771 Merge pull request #2041 from edx/feanil/transfer_students 
Add a command to transfer students from one course to another.
 2014-01-13 08:30:51 -08:00
Christina Roberts
6c49e0db14 Merge pull request #2105 from edx/christina/reorder-privates 
Fix bug about draft verticals reordering.
 2014-01-13 07:22:17 -08:00
Anton Stupak
9abe8ae39a Merge pull request #2135 from edx/anton/fix-video-volume-cookie 
Video: Fix volume cookie.
 2014-01-13 07:08:40 -08:00
cahrens
38c516e9e9 Fix bug about draft verticals reordering. 
STUD-714
 2014-01-13 09:25:16 -05:00
polesye
af56a2df72 BLD-518: Fix video volume cookie. 2014-01-13 12:03:57 +02:00
Feanil Patel
16d6d23fbc Save state before unenrolling student from old course. 2014-01-10 14:16:04 -05:00
Usman Khalid
76f4eaf947 Merge pull request #2068 from edx/usman/lms1584-edge-home-page 
Fix register button on edge
 2014-01-10 11:01:44 -08:00
Feanil Patel
1be33651b0 CertificateItems should be updated for all course students. 
Not just students that are currently active.  Students may have enrolled with verified certs, paid, gotten
a refund, and un-enrolled from the original course.  This function should now capture that.
 2014-01-10 13:18:39 -05:00
Calen Pennington
2ad4749a5d Merge pull request #2119 from cpennington/xblocks-behind-feature-flag 
Enable pure XBlocks, hidden by feature flags
 2014-01-10 09:51:23 -08:00
Usman Khalid
45401f5a73 Added hostname argument to openended_post command. 
ORA-286
 2014-01-10 11:44:20 -05:00
Calen Pennington
417fe21d05 Enable pure XBlocks, but behind a feature flag 
[LMS-226]
[LMS-2013]
 2014-01-10 11:40:03 -05:00
Will Daly
4a3cffbb3f Merge pull request #2131 from edx/db/fix-theme-name-issues 
Fix theme issues in Sass preprocessing
 2014-01-10 08:03:23 -08:00
David Baumgold
85453f703e Fix theme issues in Sass preprocessing 2014-01-10 10:40:09 -05:00
brianhw
20489f22d8 Merge pull request #2079 from edx/brian/track-commands 
Define TrackedCommand for use as base class for tracking management commands
 2014-01-10 07:39:23 -08:00
Carson Gee
df1b7f44b9 Merge pull request #1985 from edx/cg/sysadmin-enhancements 
Several code enhancements to git_add_course
 2014-01-10 07:31:52 -08:00
Ned Batchelder
56f0c89461 Merge pull request #2127 from edx/ned/dont-extract-test_root-strings 
Dont extract test_root strings
 2014-01-10 07:04:43 -08:00
Carson Gee
ab151f9e7b Several code enhancements to sysadmin dashboard 
Improved testing (cleaning up afterwards, catching stdout)
Refactored import function to it's own file
Removed monkey patch to log capturing, but still needs work
Translation fixes
Removal of several gettext phrases
 2014-01-10 09:31:53 -05:00
Will Daly
4a9c239c3d Merge pull request #2030 from edx/will/bok-choy-integration 
Added configuration for running tests using the bok-choy framework
 2014-01-10 05:26:42 -08:00
Usman Khalid
864267a286 Removed stripped-main.html since it is not being used anymore. 
LMS-1584
 2014-01-10 17:29:52 +05:00
Usman Khalid
a336ae7df6 edge.html inherits from main.html 
LMS-1584
 2014-01-10 17:29:24 +05:00
Ned Batchelder
c329270f43 Dont extract test_root strings 2014-01-10 07:18:17 -05:00
Anton Stupak
54eaabce3f Merge pull request #2107 from edx/anton/fix-image-response 
Fix show answer button for ImageResponse.
 2014-01-10 04:13:19 -08:00
polesye
95a88823b9 BLD-633: Fix show answer for ImageResponse. 2014-01-10 13:32:16 +02:00
Sarina Canelake
9363dba535 Merge pull request #2121 from edx/sarina/neuter-static-files 
Edit template for unused edx.org pages
 2014-01-09 15:46:20 -08:00
Greg Price
5147a41b07 Merge pull request #2034 from carsongee/cg/notification_prefs_missing_slash 
Added missing slash to avoid 302 when calling /notification_prefs/status
 2014-01-09 13:01:29 -08:00
Calen Pennington
a6a004314a Use block type, rather than class names for StudentPreference field storage in LMS 2014-01-09 15:59:16 -05:00
Ned Batchelder
520822c3a6 Merge pull request #2122 from edx/ned/i18n-xblock-support 
Make LMS use runtime.service("i18n") for i18n.
 2014-01-09 12:52:13 -08:00
David Baumgold
96558c85f9 Merge pull request #2113 from edx/db/enable-theme-in-startup 
Do theme post-processing in startup hook
 2014-01-09 12:19:17 -08:00
Don Mitchell
67a5f862ab Merge pull request #2117 from edx/dhm/memory_definition 
Set definition_locator on in-memory xblocks
 2014-01-09 11:58:23 -08:00
Ned Batchelder
d138a2c6be Use Django for runtime i18n 
The django.utils.translation module has the right interface to serve as a
gettext.Translations object, so we use it for the runtime i18n service.

LMS-1597
 2014-01-09 14:19:56 -05:00