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

7186 Commits

Author SHA1 Message Date
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
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
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
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
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
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
polesye
95a88823b9 BLD-633: Fix show answer for ImageResponse. 2014-01-10 13:32:16 +02: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
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
Ned Batchelder
7f1fc01f80 Change XModule i18n to use runtime.service 
LMS-1597
 2014-01-09 14:19:56 -05:00
Will Daly
dde5455227 Added configuration for running tests using the bok-choy framework 2014-01-09 12:57:50 -05:00
Don Mitchell
a07896dacc Set definition_locator on in-memory xblocks 2014-01-09 12:39:39 -05:00
Feanil Patel
7d9b6a55dd Add a command to transfer students from one course to another. 
Move only active students and also update cert item for verified students.
 2014-01-08 16:39:24 -05:00
Don Mitchell
bccae306db Merge pull request #2111 from edx/dhm/drop_contentstore 
During testing: drop contentstore when cleaning up modulestore
 2014-01-08 11:37:42 -08:00
Don Mitchell
81a5b36363 During testing: drop contentstore when cleaning up modulestore 2014-01-08 12:05:32 -05:00
Andy Armstrong
93675304da Add sorting to Studio's Files & Uploads page 
Added sorting to the new pagination logic for STUD-995.
 2014-01-08 10:35:40 -05:00
David Baumgold
5d63cd0eb0 Merge pull request #2094 from edx/db/change-section-start-date 
Set default section start date to Jan 1, 2030
 2014-01-07 13:10:29 -08:00
David Baumgold
ce4b130113 Set default section start date to Jan 1, 2030 
STUD-1072
 2014-01-07 15:46:15 -05:00
Greg Price
afaa463f7f Merge pull request #2093 from edx/gprice/forum-vote-button-a11y 
Improve accessibility of forum vote buttons
 2014-01-07 10:54:17 -08:00
Christina Roberts
c711bb6072 Merge pull request #2055 from edx/christina/amp 
Tests for behavior of export with & in HTML and XML-based components
 2014-01-07 07:35:58 -08:00
Ned Batchelder
27b8c83b34 Mark XModule strings for i18n 2014-01-07 09:43:46 -05:00
Ned Batchelder
549d9230f8 Merge pull request #2077 from edx/ned/misc-msg-fixes 
Miscellaneous fixes to strings found during i18n work.
 2014-01-07 06:41:42 -08:00
zubair-arbi
f71688ce42 Merge pull request #2075 from zubair-arbi/zub/bugfix/std878-wrongcontenttype 
Assign valid content_type to static resource (import_static_content)
 2014-01-06 23:35:44 -08:00
Greg Price
b7d7751dc2 Improve accessibility of forum vote buttons 
This change involves substantial refactoring of the relevant code to
reduce duplication. It also makes the templates for the vote buttons
more consistent and cleaner.

JIRA: FOR-64
 2014-01-06 17:08:53 -05:00
Greg Price
d4f7cd68d8 Remove redundant URI.min.js fron lms/ 
A newer version was added to common/, so that is used instead. It is
also added to the set of JS files used in unit tests to allow forums
code in common/ to be tested.
 2014-01-06 17:02:31 -05:00
Brian Wilson
21a4520b8c Remove output of management command options and args from tracking logs. 2014-01-06 12:53:56 -05:00
Brian Wilson
1aefe2f5bf Define TrackedCommand for use as base class for tracking management commands. Use in create_user command. 2014-01-06 12:43:04 -05:00
Usman Khalid
6108529ce1 Merge pull request #2001 from edx/waheed/openended-problems-commands-2 
Django command to post submissions to ora
 2014-01-06 08:04:33 -08:00
Ned Batchelder
93682af4eb Don't catch all exceptions. 2014-01-06 10:24:00 -05:00
brianhw
9c81a07012 Merge pull request #2076 from edx/brian/server-track-null-request 
Modify server_track to handle being called without a request.
 2014-01-06 07:15:14 -08:00
Usman Khalid
57710d7226 Added django commands to get statistics and repost submissions to grader for open ended problems. 
ORA-286
 2014-01-06 19:13:28 +05:00
zubiar-arbi
b998a161d2 Assign valid content_type to static resource (import_static_content) 
STUD-878
 2014-01-06 14:05:09 +05:00
Andy Armstrong
f9c45586a4 Add pagination to Studio's Files and Uploads page 
These changes implement STUD-813. The commit consists of the
following logical changes:
 - a REST API has been implemented for a course's assets
 - the page itself now fetches the assets client-side
 - the Backbone.Paginator library is used to support pagination
 - the AssetCollection has been refactored to extend
   Backbone.Paginator.requestPager so that it can be paged
 - an abstract PagingView class has been added to generalize
   the communication with a paging REST API
 - the AssetsView has been reimplemented to extend PagingView
 - two new child views have been added:
   - PagingHeader: the paging controls above the list of assets
   - PagingFooter: the paging controls below the assets
 2014-01-05 23:35:12 -05:00
Brian Wilson
7e31c95c45 Modify server_track to handle being called without a request. 2014-01-05 22:58:10 -05:00
Ned Batchelder
be6c57f53a Mark XModule strings for i18n 2014-01-03 17:50:16 -05:00
Ned Batchelder
39380f2d22 Very Minor tweaks to the LMS and CMS startup. 
I was going to do something in the startup code, then changed my mind,
but didn't want to just discard these changes.
 2014-01-02 14:27:52 -05:00
louyihua
31cb9bab26 The function tzAbbr() causes null-reference exception when the browse returns a non-English timezone string. 2013-12-31 09:12:30 -05:00
zubair-arbi
236c50d78a Merge pull request #2048 from zubair-arbi/zub/bugfix/std1071-staticpagespreview 
Hide staticpages preview on render
 2013-12-31 02:02:18 -08:00
zubiar-arbi
5ad73f0839 fix tinymce popup size too small 
STUD-674
 2013-12-31 14:11:34 +05:00
zubiar-arbi
0d1a10659c update rewriteStaticLinks utility function(modifiy only relative urls) 
STUD-674
 2013-12-31 12:58:48 +05:00
Adam Palay
e7f029f615 a11y: manage focus appropriately for modals with iframes in IE (LMS-1539) 2013-12-30 16:11:20 -05:00