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

24760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lduarte1991
0ca9bfa7e4 Annotation Tools: Added Grouping Plug-In 
- adding comments

 - spacing issues and indentation
 2014-08-06 14:49:40 -04:00
Christina Roberts
540d67a670 Merge pull request #4687 from lduarte1991/lduarte-harvardx-pr16 
TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool
 2014-08-06 12:26:46 -04:00
clytwynec
22582f4931 Merge pull request #4634 from edx/clytwynec/removing_remaining_rake_references 
removing rake and  outdated references to it
 2014-08-06 10:20:30 -04:00
Alexander Kryklia
2bdc4bf0a2 Merge pull request #4717 from edx/alex/fix_test 
Request IFRAME API every time with https scheme.
 2014-08-06 15:39:09 +03:00
Alexander Kryklia
c9ef2f3efa Request IFRAME API every time with https scheme. 2014-08-06 14:59:17 +03:00
zubair-arbi
9caff20036 Merge pull request #4250 from edx/zub/story/listallexportfaildcourses 
update export_all_courses management command to count and list all faile...
 2014-08-06 16:19:10 +05:00
Don Mitchell
753c67a73a Merge pull request #4698 from mitocw/cg/fix_student_migration_35 
Correct UnboundLocalError exception in student_migration_35
 2014-08-05 18:26:45 -04:00
jmclaus
9f313fcbdd Merge pull request #4613 from edx/jmclaus/easy-access-group-configurations-page 
BLD 1020: Easy access to Group Configurations page from Content Experiment component.
 2014-08-05 23:45:55 +02:00
lduarte1991
fe009f5989 TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool 
- fixed missing media and link buttons on image

 - fixed a CSS issue with the sharing button
 2014-08-05 15:05:56 -04:00
John Jarvis
043d495a90 Merge pull request #4673 from edx/jarv/rsyslog-handler 
Jarv/rsyslog handler
 2014-08-05 14:31:30 -04:00
jmclaus
459c241e3b BLD 1020: Easy access to Group Configurations page from Content Experiment component. 2014-08-05 19:44:21 +02:00
Sarina Canelake
1673448d08 Merge pull request #4518 from lduarte1991/lduarte-harvardx-pr13 
Text Annotation Tool: Safari Colored Highlights Bug Fix
 2014-08-05 13:17:45 -04:00
Sarina Canelake
1184cc063a Merge pull request #4675 from lduarte1991/lduarte-harvardx-pr14 
Annotations Tools: Fixing major Firefox/Tinymce bug in annotations
 2014-08-05 13:16:33 -04:00
chrisndodge
246a431760 Merge pull request #4590 from edx/cdodge/fix-reg-codes 
eCommerce enhancements (pt. 2)
 2014-08-05 13:12:52 -04:00
lduarte1991
a1684d2e64 Text Annotation Tool: Safari Colored Highlights Bug Fix 
- fixed spacing
 2014-08-05 12:04:29 -04:00
Carson Gee
7bb780335d Correct UnboundLocalError exception in student_migration_35 2014-08-05 11:51:49 -04:00
Alexander Kryklia
9a2c96cabd Merge pull request #4693 from edx/anton/fix-video-tests 
Fix failing video tests due to wrong IFRAME_API_RESPONSE
 2014-08-05 18:28:56 +03:00
polesye
4f391f664d Update youtube api. 2014-08-05 18:27:55 +03:00
Diana Huang
1e1b321b69 Merge pull request #4655 from edx/diana/allow-only-verified 
Allow verified to be offered without audit
 2014-08-05 11:26:29 -04:00
lduarte1991
0b770e1d53 Annotations Tools: Fixing major Firefox/Tinymce bug in annotations 
- fixed issue in Firefox where the init gets called multiple times

 - fixed spacing issues and added more comments

 - fixed indentation, added missing parens in comment, and fixed typo
 2014-08-05 11:22:37 -04:00
Calen Pennington
ea4e76b0bc Merge pull request #4254 from marcore/fix-branding-course-listing-opaque 
Fix filter with new opaque key, allowing user to set COURSE_LISTING as o...
 2014-08-05 10:31:33 -04:00
asadiqbal08
33bdf935f0 Retrieving active coupon codes from model 2014-08-05 10:01:31 -04:00
asadiqbal08
fc8ec1cc43 e-commerce UI suggested changes 2014-08-05 10:00:17 -04:00
Chris Dodge
a1248f614e add more detail to new CourseModesArchive table 2014-08-05 10:00:17 -04:00
asadiqbal08
932010df59 refund message for purchased courses 
Add little more logic for paid courses
 2014-08-05 10:00:16 -04:00
Muhammad Shoaib
33d5b49e81 added course price set/view/edit functionality 
added CoursmodeArchive model to save the old prices history

analytics -> instructor_analytics

analytics -> instructor_analytics
 2014-08-05 10:00:13 -04:00
asadiqbal08
dc46170f36 registration code checkout flow 
Redirecting to dashboard after free user enrollment.
 2014-08-05 10:00:12 -04:00
Muhammad Shoaib
878eaa9f77 added django admin pages for Coupon Table 
added the suggested changes by cdonge
 2014-08-05 10:00:12 -04:00
Muhammad Shoaib
4333e53997 added registration-codes generation functionality 
rebased and resolve conficts with cdoge/registration_codes

feature enhancement request: added transaction group name text field to the download buttons as an extra optional query paramerter
 2014-08-05 10:00:11 -04:00
Muhammad Shoaib
08ff030521 updated the course registration models 2014-08-05 10:00:11 -04:00
Chris Dodge
14357f7e44 Move a few HTML elements on the instructor dashboard page 2014-08-05 10:00:10 -04:00
asadiqbal08
5a9fc036a6 Course Instructor as financeadmin role, will be able to download all purchase transactions in the course as a CSV file 2014-08-05 10:00:10 -04:00
Christine Lytwynec
eb3c1ab9a8 removing rake and outdated references to it 2014-08-05 09:54:29 -04:00
Diana Huang
ec13aabe97 Fix up tests and enrollment behavior. 2014-08-05 09:32:39 -04:00
Diana Huang
52f9613274 Add an optional description field to course modes. 2014-08-05 09:32:39 -04:00
Diana Huang
3d942503c2 Add the ability to override non-standard verified mode names 2014-08-05 09:32:39 -04:00
Diana Huang
604bfabb88 fixup! Allow verified to be offered without audit 2014-08-05 09:32:39 -04:00
Diana Huang
cfc3b46c5c Allow verified to be offered without audit 2014-08-05 09:32:38 -04:00
Alexander Kryklia
44c4102096 Merge pull request #4691 from edx/ammar/fix-video-init-issue 
Fix Video Player Initialization Issue
 2014-08-05 16:23:59 +03:00
Muhammad Ammar
acc8616d0c Fix Video Player Initialisation Issue 2014-08-05 14:04:31 +03:00
zubair-arbi
70e5044f47 update export_all_courses management command to count and list all failed export courses 2014-08-05 14:09:02 +05:00
Sarina Canelake
11c9dae0a6 Merge pull request #4688 from Stanford-Online/njdupoux/email-content-history-qualityfixes 
Cleaned pylint quality issues in instructor email content history code
 2014-08-04 21:31:47 -04:00
njdup
c5cf6db93d Cleaned pylint quality issues in instructor email content history code. 2014-08-04 16:01:11 -07:00
marcore
a3d52557a5 Fix filter with new opaque key, allowing user to set COURSE_LISTING as old way path 2014-08-04 23:52:07 +02:00
Christina Roberts
035e495cd0 Merge pull request #4512 from Stanford-Online/dcadams/refactor_advanced_component_types 
Refactor ADVANCED_COMPONENT_TYPES
 2014-08-04 17:42:37 -04:00
Alison Hodges
8e1bd42e88 Merge pull request #4683 from edx/ahodges/documentation/AN2976 
Added clarification for events that do/not include session values
 2014-08-04 16:46:28 -04:00
Alison Hodges
90a64a7d58 Added clarification for events that do/not include session values 2014-08-04 16:28:15 -04:00
David Adams
9e45e8f982 Refactor ADVANCED_COMPONENT_TYPES 
Modified to a setting in CMS common.py and aws.py
    Also factored out are: ADVANCED_PROBLEM_TYPES

    This enables third parties to add XBlocks to their system
    without having to make a code change.

    Code also added to ensure that a component should exist in both
    ADVANCED_COMPONENT_TYPES and the course advanced module list
    in order for it to be enabled in the course.
 2014-08-04 12:17:45 -07:00
Sarina Canelake
3af43cdefa Merge pull request #4451 from Stanford-Online/njdupoux/email-content-history 
Instructors can view previously sent email content
 2014-08-04 14:35:42 -04:00
Sarina Canelake
672c2a94a1 Merge pull request #4378 from lduarte1991/lduarte-harvardx-pr10 
Annotation Tool: Fixed Flagging for Instructor flag removal
 2014-08-04 14:25:59 -04:00