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

2043 Commits

Author SHA1 Message Date
Ben Patterson
b71c20c031 Revert "Add Cosmetic Display Price field to studio & logic to show it" 2015-02-03 09:41:54 -05:00
Sarina Canelake
db3d6fd9ab Merge pull request #6182 from Stanford-Online/giulio/course-price-upstream 
Add Cosmetic Display Price field to studio & logic to show it
 2015-02-02 20:07:58 -05:00
Renzo Lucioni
8f974ea901 Merge pull request #6815 from edx/renzo/enable-logistration 
Make logistration generally available if feature flag is enabled
 2015-01-30 15:15:56 -05:00
Renzo Lucioni
a8bed5ce98 Make logistration generally available if feature flag is active 
Makes logistration available at /login and /register as well as /accounts/login/ and /accounts/register/. In addition:

- Adds support for redirect URLs in third party auth for combined login/registration page
- Adds support for external auth on the combined login/registration page
- Removes old login and registration acceptance tests
- Adds deprecation warnings to old login and register views
- Moves third party auth util to student_account
- Adds exception for microsites (theming)
 2015-01-30 13:28:30 -05:00
Muzaffar yousaf
ae102de3be Merge pull request #6777 from edx/muzaffar/student-info-tnl836 
Get user anonymous id via xblock user service.
 2015-01-30 19:35:26 +05:00
Renzo Lucioni
80589eab36 Remove old payment and verification flow 
Removes old payment and verification endpoints, views, templates, and tests, making the new split flow the default. The SEPARATE_VERIFICATION_FROM_PAYMENT feature flag is also removed.
 2015-01-29 10:56:25 -05:00
muzaffaryousaf
c461541d35 Refactoring tests. 
TNL-1185
 2015-01-29 13:33:28 +05:00
Matt Drayer
8b03ad3906 Decoupled entrance exam scoring from milestone fulfillment 2015-01-28 22:00:25 -05:00
Matt Drayer
dc0816669d Merge pull request #6792 from edx/ziafazal/make-course-requirements-links 
make course requirement as link
 2015-01-28 16:56:35 -05:00
Chris Rodriguez
9e2494b21d Video player branding addition for XuetangX 2015-01-28 06:39:21 -05:00
Zia Fazal
ba5fd98aaf make course requirement as link 2015-01-28 14:26:27 +05:00
muzaffaryousaf
4d72910060 Adding get_anonymous_user_id in Xblock 'user' service. 
TNL-836
 2015-01-28 12:47:49 +05:00
Giulio Gratta
c18ee8cc09 Add cosmetic price field to studio & logic 
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
 2015-01-27 15:15:43 -08:00
Syed Hassan Raza
e2ecb0db46 Invalid youtube_id raise NotFoundError for transcripts 
TNL-1229
 2015-01-27 11:48:08 +05:00
swdanielli
ed8fea79c2 update accessibility 2015-01-23 16:13:26 -05:00
Usman Khalid
3d4a853e00 Merge pull request #5926 from Stanford-Online/kluo/lti-grades-past-due 
Make LTI grade submissions respect deadlines
 2015-01-22 19:55:21 +05:00
Kevin Luo
af9dce82a3 Make LTI grade submissions respect deadlines 2015-01-21 17:05:46 -08:00
Braden MacDonald
025f046b04 Fix errors with libraries when old mongo is default (first) modulestore 2015-01-21 11:01:52 -08:00
Ned Batchelder
e64d45b705 Merge pull request #6563 from edx/ned/fix-6013 
Fixes for #6013: Implement user service to return currently-logged-in user
 2015-01-16 15:12:31 -05:00
Nimisha Asthagiri
8394fb71ac Merge pull request #6608 from edx/mobile/MA-216 
MA-216 Mobile API: display unreleased courses in enrollment list.
 2015-01-16 12:41:21 -05:00
Jason Bau
7f1b60b286 Implement user service to return currently-logged-in user 
returns XBlockuser with 2 data layers
 2015-01-16 11:40:06 -05:00
Jason Bau
dd18a8e618 User service PR: fix unrelated courseware test 
Makes lms/djangoapps/courseware/tests/test_views.py:test_index_invalid_position
actually do what it intends to do, but fixing the URL the
test client visits
 2015-01-16 11:40:05 -05:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Nimisha Asthagiri
a07f607281 Updated strategy per review feedback. 2015-01-15 17:15:46 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
jsa
0049c97d8f use bulk_ops on course_about 2015-01-15 10:37:25 -05:00
cahrens
5de170ff59 Short-circuit group_access check if only user_partitions are split_test partitions. 2015-01-15 10:33:48 -05:00
Andy Armstrong
f58e96a2fa Fix quality failures 2015-01-15 10:33:47 -05:00
Andy Armstrong
561c57dbe9 Extend preview to support cohorted courseware 
TNL-651
 2015-01-15 10:33:44 -05:00
jsa
6fb3daa772 support group_access. JIRA: TNL-649 2015-01-15 10:33:44 -05:00
jsa
17d892c521 make block.get_parent() work. 
Co-Authored-By: Christina Roberts <christina@edx.org>
Co-Authored-By: Daniel Friedman <dfriedman@edx.org>
Co-Authored-By: Don Mitchell <dmitchell@edx.org>
 2015-01-15 10:33:44 -05:00
Braden MacDonald
10fe9c0180 pylint fixes 2015-01-12 11:00:51 -08:00
Braden MacDonald
9a116529ce Add module key and library source info to problem events 2015-01-12 10:39:13 -08:00
Braden MacDonald
eddf44d853 Library Content XModule 2015-01-12 13:37:56 +03:00
Nimisha Asthagiri
3c274e2847 Merge pull request #6398 from edx/mobile/MA-199 
MA-199 Course Authorization framework in mobile API
 2015-01-07 20:19:27 -05:00
Nimisha Asthagiri
5349b55bd0 MA-199 Course Authorization framework in mobile API. 2015-01-07 19:31:02 -05:00
Sarina Canelake
d6741c7700 Clean up default pages for Open edX instances 
Remove Jobs, News
Change "Vision" to "About"
 2015-01-06 18:26:12 -05:00
AlasdairSwan
a434207076 ECOM-783 updated logistration in light of redesign 2015-01-05 11:09:37 -05:00
swdanielli
b009ac8f41 testcases for RecommenderXBlock 
This involves moving from edx-private to github
 2014-12-29 18:21:35 -05:00
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release 
Release
 2014-12-19 13:23:22 -05:00
Brian Wilson
2faff29a21 Fix PureSystem so that runtime.publish() works for a pure XBlock. 
Fix extracted from https://github.com/edx/edx-platform/pull/6035.
 2014-12-19 09:00:32 -05:00
Calen Pennington
61ba910255 Add a test of pure xblock and xmodule event publishing 2014-12-19 08:55:42 -05:00
Waheed Ahmed
d23e772dd0 Fixed unicode problem if transcript file is not UTF-8 encoded. 
TNL-527
 2014-12-17 13:19:47 +05:00
chrisndodge
c46c247e46 Merge pull request #6262 from edx/cdodge/also-sort-in-courses-list 
also apply sorting rules overrides to the /courses view
 2014-12-15 15:34:39 -05:00
Greg Price
ee103659dc Merge pull request #6257 from edx/mobile/video-pipeline-squashed 
Add video upload feature to Studio
 2014-12-15 15:18:52 -05:00
Chris Dodge
483cccb657 also apply sorting rules overrides to the /courses view 2014-12-15 14:11:58 -05:00
Nimisha Asthagiri
0687a62a8f Add back end for Studio video upload feature 
This feature allows upload of video assets to S3. This requires that the
VIDEO_UPLOAD_PIPELINE setting be properly configured and that each
course be configured with a token issued by the media team for their
processing purposes (e.g. linking the video with a YouTube channel).

Co-authored-by: Greg Price <gprice@edx.org>
 2014-12-15 13:09:59 -05:00
Muhammad Shoaib
914ecac9ac added the course price in the course about page 2014-12-15 12:53:37 -05:00
zubair-arbi
1d6d2f2a7f set position to default value if POST request don't have position argument 
TNL-922
 2014-12-15 11:59:52 +05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides 
[PLAT-217]
 2014-12-13 08:26:28 -05:00