Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,994 Commits 1 Branch 0 Tags
322ac8a468c2d861643efb139db57408872679e7
Commit Graph

39994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Rossi
2b4da4d836 MIT: CCX. Address performance issues. 
Use client's session to set POC for test, now that we have the capability to do that.

Use a middleware to set the current POC one time per request, and avoid having to look up the stack for the current request in 'get_current_poc'.

Fetch all overrides for a block at one time.

Speed up the lineage computation by doing some caching.

Unused import.

Get field overrides once per user per block.

Streamline configuration.

Fix poc config tuples
 2015-04-10 23:17:38 -04:00
cewing
a1ed62089f MIT: CCX. Code Quality fixes 
Remove unused assertion.  Login is required so this will never be used.  No point in having it here.
 2015-04-10 23:17:08 -04:00
cewing
98b663dc69 MIT: CCX. Implement mechanism for switching POC and MOOC views 
Ensure there is a consistent key for the session dict that will store the value of the poc_id if one is active.  If none is active, the mooc is assumed to be active.

Add mooc_name, mooc_url and active to the dict for each poc membership.

Update the navigation template to show link to mooc if poc is active, or to poc if not.

Ensure the switch_active_pocs view is covered well with tests.
 2015-04-10 23:16:44 -04:00
cewing
591c75a3eb MIT: CCX. Provide template data for active POCs 
Add a utility function to get template data for the POCs to which a user is actively registered

Add tests for the new utility
 2015-04-10 23:16:02 -04:00
Chris Rossi
eecefec8a0 MIT: CCX. Implement coach customization of grading policy for a CCX 
Story #35 As a coach I can see and edit the json for the grading policy.

Story #34 Recalculate grading policy

Repair the broken test for grading by providing an explicit POC context for the request to run in
 2015-04-10 23:15:29 -04:00
Chris Rossi
2c586ddbe4 MIT: CCX. Code Quality fixes 2015-04-10 23:15:15 -04:00
Chris Rossi
e66fe2b311 MIT: CCX. Properly handle possible representations of the course key 2015-04-10 23:13:57 -04:00
Chris Rossi
aa1333c363 MIT: CCX. Hide course blocks not in the CCX from view for coaches and students 2015-04-10 23:13:11 -04:00
cewing
6cfc3a025f MIT: CCX. Implement individual student enrollments 2015-04-10 23:12:35 -04:00
Chris Rossi
630d1ce0d4 MIT: CCX. Implement coach interactions with student grades 
Story #4: Coaches sees grades.

Story #9: Coach downloads grades.
 2015-04-10 23:12:14 -04:00
cewing
cabb1962a6 MIT: CCX. Code Quality fixes 2015-04-10 23:11:56 -04:00
cewing
12625a9255 MIT: CCX. Increase test coverage 
Implelement test coverage for utility code supporting enrollments in CCXs

bugfix: prevent UnboundNameError if user does not exist in database.
 2015-04-10 23:11:07 -04:00
Chris Rossi
a2cb7fd276 MIT: CCX. Implement Custom Courses for Edx. 
This feature provides the ability to designate a "coach" who can create customized runs of an existing course, invite students to participate, and manage students through the run of the course.

In this squashed commit we implement the initial scifi, add the 'POC Coach' course role, refine the scifi, add migrations for models, create POCs, enforce POC Coach role, provide panels for Coach Dashboard, set up rudimentary display of course outline, add and remove units, show/hide all units, and save schedule changes, set dates when adding units, edit dates on units already added and provide some tests.

We also provide mechanisms for invitation and enrollment in a POC (to become CCX) and control the display of blocks to students in a POC.
 2015-04-10 23:10:48 -04:00
Martyn James
953581e62f Merge pull request #7313 from edx/mjames/SOL-174 
SOL-174 - Indexing within celery task
 2015-04-10 15:22:20 -04:00
alawibaba
7b29dd4c04 Fixed readability nit. 2015-04-10 14:49:40 -04:00
alawibaba
a6a2fd95bf Added more precise alerting to video beacon experiment. 2015-04-10 14:37:31 -04:00
Davorin Sego
e37a98d1be Indexing moved to celery task. Reorganised indexing to always allow for full course reindex. Indexing code no longer needs to be in common, because it is triggered by signal instead of being called.g 2015-04-10 14:30:19 -04:00
Martyn James
d54cb3b962 Merge pull request #7648 from edx/mjames/AboutExtra 
Updated course_about API to include additional information
 2015-04-10 13:48:49 -04:00
Ben Patterson
a542b3d3c8 Merge pull request #7647 from edx/benp/remove-lettuce-tab-tests 
[Lettuce deprecation] Remove redundant lettuce tab tests.
 2015-04-10 11:57:25 -04:00
Aamir
a83d068600 Merge pull request #7617 from edx/aamir-khan/ECOM-1290-redirect-to-courseware-new 
ECOM-1290: added the redirection back to courseware after re-verificatio...
 2015-04-10 20:53:45 +05:00
aamir-khan
ca08b979b3 ECOM-1290: added the redirection back to courseware after re-verification 2015-04-10 19:44:35 +05:00
Awais
b464542e63 ECOM-1183 fixing the 2015-04-10 19:40:48 +05:00
Martyn James
bf9d1ef137 Updated course_about API to include additional information 2015-04-10 10:27:34 -04:00
frances botsford
d45aecff3c Merge pull request #7646 from edx/frances/donate-notification-fix 
Dashboard donate and sidebar layout fix
 2015-04-10 09:39:09 -04:00
zubair-arbi
8db98203ff Merge pull request #7601 from edx/zub/story/ecom-1228/enhance-track-selection-page 
update track selection page, use only min price for course modes
 2015-04-10 14:52:15 +05:00
zubair-arbi
2c10eeb3aa update track selection page, use only min price for course modes 
ECOM-1228
 2015-04-10 11:53:31 +05:00
zubair-arbi
305b7138e5 Merge pull request #7639 from edx/zub/bugfix/ecom-653-remove-invalid-link 
update invalid documentation link in '_payment_page_response' method doc...
 2015-04-10 11:07:33 +05:00
Ben Patterson
1146bb2c61 [Lettuce deprecation] Remove redundant lettuce tab tests. 
These are already covered by bok-choy tests:
  File: test_lms.py
  Class: HighLevelTabTest
 2015-04-09 18:20:03 -04:00
Frances Botsford
73dd510fd7 remove bad classwrapper for dashboard donate banner layout and sidebar 2015-04-09 17:05:39 -04:00
Stephen Sanchez
a2e029a516 Merge pull request #7553 from edx/sanchez/support_oscar_receipts 
XCOM-128: Allow the receipt page to support E-Commerce Orders.
 2015-04-09 10:52:38 -04:00
zubair-arbi
3cc931d8d9 update invalid documentation link in '_payment_page_response' method docstring 
ECOM-653
 2015-04-09 19:13:28 +05:00
Stephen Sanchez
1669274175 :Allow the receipt page to support Oscar Orders. 2015-04-09 14:01:12 +00:00
Calen Pennington
2c080af646 Merge pull request #7603 from cpennington/xblock-metrics-block-type 
Add the entry-point used to load an XBlock to the tags when recording me...
 2015-04-08 16:35:33 -04:00
Christine Lytwynec
05a8e23d57 Merge pull request #7633 from edx/release 
Release
 2015-04-08 15:40:45 -04:00
Adam
0298180e30 Merge pull request #7632 from edx/adam/revert-multiple-email-queues 
Revert "use different queue for smaller emails (TNL-1591)"
 2015-04-08 14:47:45 -04:00
Adam
c04ef4b733 Merge pull request #7630 from edx/hotfix/2015-04-08 
Hotfix/2015 04 08
 2015-04-08 14:38:19 -04:00
Marko Jevtić
5cb7fe7390 Merge pull request #7567 from edx/mjevtic/SOL-294 
(SOL-294) CSS style that will display ellipsis properly
 2015-04-08 19:43:25 +02:00
Calen Pennington
29c9080bdf Add the entry-point used to load an XBlock to the tags when recording metrics on rendering and handling 2015-04-08 13:00:27 -04:00
Marko Jevtić
42896452a1 Merge pull request #7576 from edx/mjevtic/more_search_results 
Fixes show more results section of the lms courseware search
 2015-04-08 18:49:57 +02:00
marjev
050a53d954 (SOL-294) CSS style that will properly display ellipsis 2015-04-08 18:46:23 +02:00
Adam Palay
9fa8187ffc Revert "use different queue for smaller emails (TNL-1591)" 
This reverts commit c2e5bd3d98.
 2015-04-08 12:33:09 -04:00
Jesse Zoldak
de1cbb9b93 Merge pull request #7631 from edx/zoldak/remove-ptest 
Remove unused bok_choy paver option ptests
 2015-04-08 12:14:19 -04:00
Jesse Zoldak
e5132e3f74 Remove unused paver option ptests 2015-04-08 11:57:02 -04:00
Chris
35db7f34af Merge pull request #7580 from edx/clrux/UX-1909-a11y-button-contrast 
Changed color of gray to be slightly darker for AA compliance
 2015-04-08 11:54:20 -04:00
chrisndodge
8a3fb01d32 Merge pull request #7598 from edx/cdodge/use-microsite-config-in-dashboard 
be sure to take platform_name from microsite config paths in the dashboa...
 2015-04-08 11:52:14 -04:00
Adam Palay
33ddecbc97 update nltk in other parts of the platform 2015-04-08 11:28:49 -04:00
David Baumgold
aac8bf2ebd Update NLTK to 2.0.5 
For setuptools compatibility
 2015-04-08 11:26:55 -04:00
Waheed Ahmed
c20c99badd Added ora release tag. 2015-04-08 11:26:36 -04:00
Chris
468d538e0c Merge pull request #7584 from edx/clrux/UX-1911-a11y-remove-nav 
Changes the nav element to a div
 2015-04-08 11:25:32 -04:00
Syed Hassan Raza
23e08b2744 Split courses drafts import issue 2015-04-08 11:22:27 -04:00