Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
Muhammad Shoaib
b555c869bf SOL-794 Detailed Enrollment Report 
- added the abstract and concrete layers of enrollment report provider
- created a celery task.
-added the button in the e-commerce reports section

added the enrollment data backend

added the payment data and start writing the test cases.

updated the code with the feedback suggestions and wrote some test cases.
- all the downloadable reports are now visible in the ecommerce download section.
Pending instructor tasks is also visible in the ecommerce section

added the fields in the user profile information
changed the report store configuration key
added the new http endpoint for financial reports to add more permissions for finance_admin to access.

fix quality issues

added test cases to check csv content data

rebased with master and resolved conflicts

changed the log messages

added the changes as per code clintonb suggestions during code review

updated the test cases for the finance_admin decorator

changes suggested by clinton.

Created and moved Table level filters to the Custom Manager for the CourseEnrollment model.

ecommerce.js file was loaded twice in the instructor_dashboard.js fixed the issues

added the registration code column in the csv

added the full gender in the csv file

Update data sources and add display name translations for the report columns

fix meta name

Make sure the reports section does not appear on non whitelabel courses

pylint fixes

expand out enumerated values
 2015-05-22 15:16:57 -04:00
Jim Abramson
c807a6041b Merge pull request #8127 from edx/jsa/xcom-306 
Implement student-initiated refunds for external commerce service.
 2015-05-21 11:42:32 -04:00
jsa
3dede202f1 Implement student-initiated refunds for external commerce service. 
XCOM-306
 2015-05-21 11:37:37 -04:00
Sarina Canelake
1ca4b3b941 Merge pull request #8102 from rando305/master 
Create email only when it will be sent
 2015-05-19 14:06:35 -04:00
Renzo Lucioni
7eecfd89f9 Merge pull request #8094 from edx/renzo/enrollment-api-unenrollment 
Allow enrollment API to deactivate enrollments
 2015-05-19 10:51:23 -04:00
Randy Ostler
93e6434e19 Create email message only when it will be sent 2015-05-19 10:01:48 -04:00
Renzo Lucioni
960b02cf98 Allow enrollment API to deactivate enrollments 
Will allow Otto to revoke fulfillment of course seat products. Only server-to-server calls are currently allowed to deactivate or otherwise modify existing enrollments.
 2015-05-18 19:44:02 -04:00
Gabe Mulley
63b0378520 Ensure GA events have a course label if available 2015-05-18 13:25:12 -04:00
Ned Batchelder
e97b94bde2 Merge pull request #8060 from edx/ned/add-supers 
Add super() calls to setUp/tearDown that are missing them
 2015-05-15 12:29:14 -04:00
christopher lee
5cef287c5d MA-635 Block Mobile Content for unfulfilled milestones 
Previously, the mobile api did not check for pre-requisite courses
or entrance exams. This change checks for these milestones and then
returns course content accordingly.
 2015-05-15 09:39:54 -04:00
Ned Batchelder
78e9445aa1 Add super() calls to setUp/tearDown that are missing them 
Also, I replaced a number of tearDown methods with addCleanup instead.
And also remove some unneeded patch.stopall() calls.
 2015-05-14 18:14:21 -04:00
Ned Batchelder
7c704f3959 Move xmodule_modifiers.py to openedx/core/lib/xblock_utils.py 2015-05-14 16:03:50 -04:00
Diana Huang
362c632ad7 Catch BSON errors as well as PyMongo errors when emitting 
MongoDB events.

TNL-2035
 2015-05-13 12:21:53 -04:00
Andy Armstrong
2fafaec053 Implement grade report analytics 
TNL-1988
 2015-05-12 16:32:01 -04:00
Adam
e71ee2b566 Merge pull request #7953 from Stanford-Online/kluo/cleanup-keyword-sub 
Clean up keyword_substitution.py
 2015-05-07 13:09:58 -04:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
Kevin Luo
5c36bd1052 Clean up keyword_substitution.py 
Update docstring and remove unused import
This is cleanup after edx/edx-platform#7605
 2015-05-06 14:22:21 -07:00
Muhammad Ammar
63f4aa8ceb Merge pull request #7761 from edx/ammar/tnl1886-add-certificate-columns-in-grade-report 
Add certificate columns in grade report
 2015-05-06 09:32:42 +05:00
Jesse Zoldak
6c7cec6d3c Skip intermittently failing test. TE-871 2015-05-05 16:21:52 -04:00
muhammad-ammar
3bb7a2508d Add certificate columns to existing grade report 
TNL-1886
 2015-05-05 17:43:08 +05:00
Sarina Canelake
3169825a9f Merge pull request #7870 from mitocw/feature/cg/disable_ssl_cache 
Remove anonymous caching when SSL is enabled
 2015-05-04 10:59:41 -04:00
Awais Jibran
e9f26a99a8 Merge pull request #7829 from edx/aj/tnl1530-discussion-section-jump-to-bottom 
Switching between discussion threads take focus to bottom of the page.
 2015-05-04 12:03:51 +05:00
Clinton Blackburn
bfb201ec7d Merge pull request #7822 from edx/clintonb/receipt-page-update 
Updated Receipt Page for Oscar
 2015-05-02 09:32:11 -04:00
Clinton Blackburn
1a1fe56b29 Added Oscar-Compatible Receipt Page 2015-05-02 00:18:05 -04:00
Will Daly
5d16ed46a2 Enrollment API course details include credit modes. 
Credit modes are hidden by default, since the user
isn't allowed to select them on the track selection page.
This commit exposes credit modes through the enrollment
API so that consumers can see that a course has a credit
track.
 2015-05-01 12:36:30 -04:00
Carson Gee
681b9a5ea7 Remove anonymous caching when SSL is enabled 2015-04-30 10:50:19 -04:00
Ned Batchelder
777be12ada Add missing __init__.py files 2015-04-30 07:43:08 -04:00
Awais Jibran
6e6aa036e7 Switching between discussion threads take focus to bottom of the page. 
TNL-1530
 2015-04-29 20:28:52 +05:00
Awais Jibran
3bd45358ab Merge pull request #7753 from edx/aj/tnl1745-change-email-on-dashboard 
Fixed change email address error from student dashboard
 2015-04-28 11:29:15 +05:00
Mark Hoeber
39cd5cec60 Merge pull request #7791 from edx/markhoeber-doc1904 
Updated enrollment api doc for new response fields
 2015-04-24 09:23:00 -04:00
Mark Hoeber
568ed781c6 Updated enrollment api doc for new response fields 
And cleaned up one doctoring
 2015-04-23 15:17:47 -04:00
cahrens
4af79d6f76 Don't event first_name and last_name. 
TNL-2044
 2015-04-21 16:03:59 -04:00
Will Daly
4df2bd3329 Merge pull request #7756 from edx/will/ecom-1408-take-two 
Expose course start/end date in the enrollment API
 2015-04-21 10:50:33 -04:00
Calen Pennington
97d9a19052 Merge pull request #7710 from cpennington/relax-context-contract 
Fix contract on context argument
 2015-04-21 10:01:24 -04:00
Will Daly
fc918fb3d1 Expose course start/end date in the enrollment API 2015-04-21 08:41:42 -04:00
Awais Jibran
1d9499e1ad Fixed change email address error from student dashboard 
TNL-1745
 2015-04-20 14:36:31 +05:00
Nimisha Asthagiri
a87c881024 MA-612 Mobile Push Notification Studio Django admin setting 2015-04-18 15:30:14 -04:00
Andy Armstrong
17392ef3bf Code review feedback and test cleanup. 2015-04-17 17:23:19 -04:00
Andy Armstrong
7742735fb0 Event on user preference updates 
TNL-1851
 2015-04-17 17:23:19 -04:00
cahrens
4797a74e5c Emit events for language proficiencies from the update_account_settings method. 2015-04-17 17:23:18 -04:00
Daniel Friedman
97c43adaa4 Track user settings changed events on User save 2015-04-17 17:23:18 -04:00
Diana Huang
3f20a6f304 Add model change event tracking to UserProfile. 2015-04-17 17:23:18 -04:00
Usman Khalid
da57b13b6d Removed all references to AUTH_ENTRY_DASHBOARD. 
TNL-2024
 2015-04-17 17:23:17 -04:00
cahrens
938dcce061 Event change_initiated for password and email change requests. 2015-04-17 17:23:16 -04:00
Andy Armstrong
c3a39934a0 Limit the size of the user profile's "bio" field 
TNL-1990
 2015-04-17 17:23:16 -04:00
muzaffaryousaf
3110cf6bb6 Remove account settings display and editing from dashboard sidebar. 
TNL-1516
 2015-04-17 17:23:15 -04:00
Usman Khalid
429984efcc Third party auth tests should check account_settings_context(). 
TNL-1535
 2015-04-17 17:23:15 -04:00
Usman Khalid
2667f705ad Enable third party auth from account settings page. 
TNL-1535
 2015-04-17 17:23:15 -04:00
jsa
bb2599cecd Include profile image version in URLs. 
TNL-1860
 2015-04-17 17:23:13 -04:00
jsa
1d11345e90 make auto_auth users satisfy PARENTAL_CONSENT_AGE_LIMIT 2015-04-17 17:23:13 -04:00