Commit Graph

24728 Commits

Author SHA1 Message Date
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
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
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
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
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
lduarte1991
3e99edd665 Annotation Tool: Flagging plugin should now allow instructors to remove flags from annotations
Annotation Tools: Added lots of comments, fixed spacing, fixed slice issue

Annotation Tools: i18n fixed for this tool

 - fixed Translator to Translators

Annotation Tools: Removed unnecessary class and worked with element object
2014-08-04 11:44:29 -04:00
Gabe Mulley
ce727fc7bd Merge pull request #4566 from mulby/remove-duplicate-context-fields
Remove duplicated data from legacy events
2014-08-04 11:36:48 -04:00
Sarina Canelake
e3ac967b96 Merge pull request #4672 from edx/sarina/080414-translation-update
Sarina/080414 translation update
2014-08-04 11:33:39 -04:00
Sarina Canelake
b6102462ac Update translations (autogenerated message) 2014-08-04 11:31:40 -04:00
Sarina Canelake
ecba41e865 Add Eng (GB) and Albanian lang codes 2014-08-04 11:13:06 -04:00
Christina Roberts
c58f8b2266 Merge pull request #4664 from edx/chrisitna/disable-tooltip-manager
Remove tooltip manager to get tests working in CMS again.
2014-08-02 10:08:16 -04:00
cahrens
70e6ee1b70 Remove tooltip manager to get tests working in CMS again. 2014-08-02 07:15:18 -04:00
Ben Patterson
2a966646aa Merge pull request #4660 from edx/revert-4658-benp/fix-bok-choy-check
Revert "bok-choy: check mysql the old way."
2014-08-01 18:14:50 -04:00
Sarina Canelake
bad803e451 Merge pull request #4653 from Stanford-Online/stv/i18n/empty
Translate string iff non-empty
2014-08-01 18:03:43 -04:00
Julia Hansbrough
7b1fce9e3f Merge pull request #4641 from edx/reruns/server-side-handlers
Basic notifications handling.
2014-08-01 17:30:54 -04:00
Alison Hodges
5f8ed7cb3e Merge pull request #4661 from edx/ahodges/documentation/numbering
numbering error
2014-08-01 17:10:24 -04:00
Alison Hodges
1b3ec2d9b0 numbering error 2014-08-01 17:09:49 -04:00
Alison Hodges
65b4eab9b5 Merge pull request #4572 from edx/ahodges/documentation/DOC764
Ahodges/documentation/doc764
2014-08-01 16:59:40 -04:00
Jesse Zoldak
692e59c3c8 Merge pull request #4659 from edx/revert-4652-jarv/only-add-handler-if-rsyslog
Revert "allow rsyslog to be none"
2014-08-01 16:59:24 -04:00
Alison Hodges
8e8f7b9889 Getting data package files from AWS 2014-08-01 16:58:50 -04:00
Ben Patterson
fa10274d6c Revert "bok-choy: check mysql the old way." 2014-08-01 16:41:50 -04:00
Jesse Zoldak
17841fcdd4 Revert "allow rsyslog to be none" 2014-08-01 16:33:07 -04:00
Ben Patterson
61f9fe56b6 Merge pull request #4658 from edx/benp/fix-bok-choy-check
bok-choy: check mysql the old way.
2014-08-01 16:17:51 -04:00
Ben Patterson
e6d6a3bf92 bok-choy: check mysql the old way. 2014-08-01 16:15:00 -04:00
Diana Huang
69f900dd90 Basic notifications handling.
LMS-11163
2014-08-01 19:50:37 +00:00
Anton Stupak
1ae5901062 Merge pull request #4606 from edx/anton/remove-group-configurations
Add possibility to remove group configurations.
2014-08-01 22:18:35 +03:00
Ben Patterson
e7d39baa10 Merge pull request #4645 from edx/benp/mysql-as-process-not-service
Bok-choy: check if mysql is running, even if it's not a daemon.
2014-08-01 14:43:36 -04:00
John Jarvis
a1aa6c2f1d Merge pull request #4652 from edx/jarv/only-add-handler-if-rsyslog
allow rsyslog to be none
2014-08-01 14:10:23 -04:00
stv
3fdfdbcd2b Translate string iff non-empty
This resolves an issue where a checklist's long_description being empty
caused gettext to dump PO file headers.

I had originally made this change to the Stanford-Online/edx-platform
repository a few weeks ago [0] to address a failing test on our fork.
I didn't take the time to diagnose the root issue; I just fixed it for
the single case.

After stumbling across the issue elsewhere, @kluo <kevkluo@gmail.com>
followed through and tracked down the cause of the behavior. It turns
out that `gettext`, by default, translates the empty string into PO file
headers; this is apparently a feature, not a bug [1].

This behavior seems counterintuitive; for our use, it seems that
translating an empty string should simply return an empty string. We
already program defensively around this in platform code [2], but it'd be
convenient to resolve this with a centralized solution, instead of a
patchwork of fixes.

[0] 4b88f54aa658db952e899222ff5ede4a1c1beb18
[1] http://stackoverflow.com/questions/18459387/translation-of-empty-string-shows-po-header
[2] https://github.com/edx/edx-platform/blob/master/cms/djangoapps/contentstore/views/checklist.py#L140
2014-08-01 11:03:47 -07:00
Ben Patterson
c8ef4a1b89 Bok-choy: check if mysql is running, even if it's not a daemon.
The impetus is integration with test environments, where mysql is not configured
as a service.
2014-08-01 14:01:47 -04:00
John Jarvis
8d849f8087 allow rsyslog to be none 2014-08-01 13:55:15 -04:00
polesye
27013e74f4 BLD-1049: Remove Group Configurations. 2014-08-01 20:45:23 +03:00
Jason Bau
9c52e5d74d Merge pull request #4585 from edx/jbau/ext-auth-fix-password-complexity
Allow external_auth registrations to bypass PW complexity check
2014-08-01 10:43:57 -07:00
Sarina Canelake
ec8dee52c0 Merge pull request #4646 from lduarte1991/lduarte-harvardx-pr16
Annotator Tools: Fixing annotator code break in login and dashboard
2014-08-01 12:56:27 -04:00