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

8693 Commits

Author SHA1 Message Date
Clinton Blackburn
3796f8c689 Merge pull request #4639 from edx/clintonb/link-to-analytics-dashboard 
Added link from instructor dashboard to analytics dashboard
 2014-08-07 12:15:11 -04:00
Clinton Blackburn
1a4e067712 Added link from instructor dashboard to analytics dashboard 2014-08-07 12:13:34 -04:00
Waqas Khalid
3d5dde8195 Fix inconsistent ui issues on discussion during blackout period 
FOR-108
 2014-08-07 19:33:40 +05:00
David Baumgold
e99a14eb3f Merge pull request #4654 from edx/db/kill-check-for-code 
Replace `check_for_get_code` with `assert_request_status_code`
 2014-08-07 08:28:50 -04:00
Usman Khalid
9599c31aa0 Catch InvalidKeyError in static_tab view. 
LMS-11189
 2014-08-07 15:41:07 +05:00
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
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
jmclaus
459c241e3b BLD 1020: Easy access to Group Configurations page from Content Experiment component. 2014-08-05 19:44:21 +02:00
David Baumgold
5457775cfe Replace check_for_get_code with assert_request_status_code 
More flexible, uses the word "assert", method instead of function
 2014-08-05 13:36:49 -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
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
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
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
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
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
njdup
5791fd1087 Instructors can view previously sent email content 
Previously on the send email page of the instructor dashboard, instructors could only view
task information about emails they've sent for their course in the past.
In addition to this, I've now added the ability to see the content of all previously sent emails.

A "Sent Email History" button has been added to the page. When clicked, a table displaying the
subject line, number of emails sent, and date/time of submission for each previously sent email
is created. An instructor can then click on any subject line to see the content of that email,
displayed in a modal window that appears on the page.

The window is also equipped with a "copy email to editor" button, which copies the emails contents
to the tinyMCE editor, so that an instructor can easily resend an email that they've sent
in the past.
 2014-08-04 10:08:32 -07:00
Sarina Canelake
ecba41e865 Add Eng (GB) and Albanian lang codes 2014-08-04 11:13:06 -04:00
Carson Gee
87fa6cc753 Check if user is anonymous before calling PSYCHOMETRICS 
LTI grade callbacks for example, come in with an anonymous user.  This causes a
stack trace in the psychometrics app that leads to the LTI service
getting a 404.  This adds a check before that callback gets registered.
 2014-08-01 12:34:12 -04:00
Dave St.Germain
eb1d046352 Show the enrollment counts for each mode on the instructor dashboard. 2014-08-01 12:17:36 -04:00
Renzo Lucioni
3c37b9723c Merge pull request #4620 from edx/renzo/fix-instructor-analytics 
Renzo/fix instructor analytics
 2014-07-31 14:12:47 -04:00
Greg Price
b10c4b146f Merge pull request #4599 from Stanford-Online/u/forum/upload-file-size 
Fix incorrect max upload file size on forums
 2014-07-31 10:31:16 -04:00
Renzo Lucioni
ab067046e3 Fully rename instructor dashboard analytics app 2014-07-31 09:45:44 -04:00
Don Mitchell
437a3bf93e Merge pull request #4542 from edx/split/perf_test 
Split/perf test
 2014-07-31 09:14:15 -04:00
Oleg Marshev
36d47dd05e Merge pull request #4527 from edx/oleg/xml-course-transcripts-fix 
Fix transcripts in XML course when no static_asset_path is set.
 2014-07-31 10:35:44 +03:00
Don Mitchell
d4776a151b Test both split and old mongo 2014-07-30 17:44:45 -04:00
Don Mitchell
0f0d75fce8 Convert toc test to use mongo not xml ms 
Included adding a general create_toy_course and create_sample_course method for tests
 2014-07-30 17:44:44 -04:00
Renzo Lucioni
3599e2eec7 Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"" 
This reverts commit 079808ee47.
 2014-07-30 17:01:52 -04:00
Julia Hansbrough
14dc3ce853 Merge branch 'release' 2014-07-30 19:35:51 +00:00
Ben Patterson
2848f7ab58 Merge pull request #4597 from edx/benp/fix-bok-choy-solano 
Simplify bok choy environments to inherit pipeline settings from common.
 2014-07-30 12:16:45 -04:00
stv
510c130c1a Fix incorrect max upload file size on forums 
The file size is calculated and displayed as a number of bytes, but was
being incorrectly labeled as 'K' [0].

The size is now correctly labeled as "bytes" and the sentence now begins
with a leading captial letter.

Impact: This has been broken on master since 2012 [1].

[0] https://github.com/edx/edx-platform/blob/master/lms/djangoapps/django_comment_client/settings.py#L4
[1] 5d90366917
 2014-07-29 12:18:22 -07:00
Nimisha Asthagiri
538bec92a7 LMS-11137 Course Action State Django models. 2014-07-29 15:03:36 -04:00
Julia Hansbrough
079808ee47 Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul" 
This reverts commit 252038c376, reversing
changes made to 7caf8c53b1.
 2014-07-29 17:41:46 +00:00
Ben Patterson
90a2417d97 Simplify bok choy environments to inherit pipeline settings from common.py 2014-07-29 11:40:21 -04:00
Juanan Pereira
cb2aaf8d8c set keyboard input focus to the e-mail field on the login screen 2014-07-29 00:31:26 +02:00
Ned Batchelder
7f9839b990 Merge pull request #4492 from edx/ned/poweredby-logos-on-cdn 
Use the CDN-friendly URLs for the Powered-By logos
 2014-07-28 15:33:41 -04:00
Usman Khalid
b594bd480a Merge pull request #4427 from edx/usman/lms6507-mako-dir 
Use /tmp/mako_lms and /tmp/mako_cms for compiled mako templates.
 2014-07-28 21:52:20 +05:00