Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,822 Commits 1 Branch 0 Tags
203e512d4e9fe064c88f03bb4177a2e6923a021a
Commit Graph

2479 Commits

Author SHA1 Message Date
Edward Zarecor
c12c5c926d fixing post-release merge conflicts with DKH 2015-06-10 16:56:21 -04:00
Will Daly
5198257cbe Merge pull request #8461 from edx/will/verify-student-cleanup 
Remove unused code left over from ECOM-188.
 2015-06-10 14:44:51 -04:00
Matt Drayer
4dd55609ab Merge pull request #8430 from edx/asadiqbal08/SOL-971 
SOL-971
 2015-06-10 14:21:42 -04:00
Will Daly
69306da49a Remove unused code left over from ECOM-188. 2015-06-10 13:08:23 -04:00
Awais
d5ca25e197 ECOM-1644 minor message updation. 2015-06-10 22:08:23 +05:00
asadiqbal
302d7a0152 SOL-971 
Allow microsites to override content

more test checks

Fix pylint error (duplicate import)

SOL-971 Changes
 2015-06-10 19:26:30 +05:00
Awais Qureshi
16bbdc7fca Merge pull request #8329 from edx/awais786/ECOM-1494-remove-midcourse-models 
ECOM-1494 removing models.
 2015-06-10 18:24:39 +05:00
Tyler Nickerson
767ccbd1e7 Merge pull request #8235 from edx/nickersoft-include-expired 
Added optional GET parameter to the enrollment API that includes expired course modes
 2015-06-10 09:01:04 -04:00
Awais
ed02d9cc5c ECOM-1494 removing models only. 2015-06-10 11:19:51 +05:00
Nickersoft
8c1d3ae412 Added includes_expired parameter to enrollment API 
- Adding ?include_expired=1 to course detail requests will now include expired course verifications
 2015-06-09 17:12:30 -04:00
Sarina Canelake
85f5708d6b Merge pull request #8388 from edx/sarina/allow-preview-of-launched-langs 
Allow released languages to be previewed under dark lang
 2015-06-09 15:04:46 -04:00
Awais
956e41348e ECOM-1644 Implementing course-access roles. 2015-06-09 15:29:19 +05:00
Jim Abramson
a7ebe17dfb Merge pull request #8414 from edx/jsa/fix-deactivate-enrollment 
Jsa/fix deactivate enrollment
 2015-06-08 13:09:54 -04:00
jsa
445d0dabb6 Correct deactivation logic in enrollment api and test. 
XCOM-396
 2015-06-08 11:06:52 -04:00
Sarina Canelake
780ec6ee2c Allow released languages to be previewed under dark lang 2015-06-06 09:49:06 -04:00
Sarina Canelake
e53b9c83d9 Use Django 1.4 @ensure_csrf_cookie method PLAT-664 2015-06-06 08:48:36 -04:00
Nimisha Asthagiri
d240785b17 MA-722 Render xBlock API Support 2015-06-05 11:18:48 -04:00
Tim Krones
f711a32e3d TNL-1652: Allow instructors to obtain CSV file listing students who may 
enroll in a course but have not signed up yet.
 2015-06-04 20:50:04 +02:00
Jim Abramson
373d948c8b Merge pull request #8356 from edx/jsa/xcom-388 
Add tests for enrollment deactivation under various modes.
 2015-06-04 10:48:12 -04:00
jsa
445a0c938b Add tests for enrollment deactivation under various modes. 
A bug with the creation of inactive honor enrollment modes was caught and fixed along the way.

XCOM-388
 2015-06-04 09:40:54 -04:00
Peter Fogg
63c3af737c Add student bio max_length to migrations. 2015-06-03 17:07:02 -04:00
Ben McMorran
9d336c33eb TNL-1897 Implement Course Team API 2015-06-03 18:04:17 +00:00
Braden MacDonald
ce83f5cf35 Merge pull request #8077 from open-craft/keyed-config-model-2 
Keyed ConfigurationModel + Admin functionality
 2015-06-02 16:12:41 -07:00
Calen Pennington
8f6be8ab96 Allow for keyed ConfigurationModels + New Admin UI 2015-06-02 14:50:45 -07:00
Diana Huang
15291aa43b Merge pull request #8015 from edx/andya/add-tab-extensions 
Add extensible course view types for edX platform
 2015-06-02 17:08:45 -04:00
Diana Huang
dae137feaa Convert all tabs to the new plugin framework. 2015-06-02 15:05:16 -04:00
Muhammad Shoaib
65c4f1df89 SOL-236 Manual Enrollments 2015-06-02 13:19:32 -04:00
Andy Armstrong
94e1c42314 Add extensible course view types for edX platform 2015-06-02 13:12:40 -04:00
Christina Roberts
46cb847eb9 Merge pull request #8306 from edx/christina/delete-unused-methods 
Delete change_email_request and lang_pref_set_language
 2015-06-02 11:30:35 -04:00
cahrens
410beb8485 Delete unused methods. 
This functionality is provided to the user_api accounts and preferences api.
TNL-1701
 2015-06-02 10:03:19 -04:00
Ned Batchelder
cc5c1001d1 Fix simplifiable-range pylint warnings. 2015-06-02 09:47:13 -04:00
Matt Drayer
af7277cdd9 New Feature: Certificates Web View 
- SOL-465: Initial implementation of certificates web view and signatories (names/titles)

- SOL-718 Close button is working properly

- SOL-801 Backbone Signatories Modeling

- SOL-803 Underscore template: Editor (Add)

- SOL-802 Signatories: Underscore template - Details

- SOL-804 Signatories: Underscore template: Editor (Edit)

- Add signatory delete Django view

- SOL-805 Signatory editor (Delete)

- Add Coffeescript router

- SOL-716 Jasmine Tests

- Added missing minified JS library

- client side validation of signatory fields

- SOL-390 signatories names

- Remove obsolete extends Sass files

- input maxlength limiting for signatory information

- SOL-389: Course title override

- SOL-466: Add capability to upload digitized signatures in Studio

- ziafazal: fixed css for upload signature image

- ziafazal: completed deletion of signature images

- UX-1741: Add initial static rendering/styling for Open edX web certs
  * creating new global static dir
  * adding static version of edX UX pattern library assets
  * adding web certificates static assets
  * adding static (+abstracted) web certificates rendering
  * creating two tiers of rendering (base + distinguished)
  * providing sample assets for certificate rendering
  * supporting RTL layouts
  * adding certifcates assests to edX static asset pipeline
  * temporarily hiding the mozilla open badges share action
  * wiring print button to print view/page
  * fixup! addressing conflict artifact in valid cert template
  * fixup! adding missing %hd-subsection sass extend + components comment clean up
  * fixup! correcting pattern library .hd-4 font-weight value

- SOL-468 Linked Student View for Web View Credential

- SOL-467: Add capability to upload organization logos for certificates

- SOL-391 / SOL-387: Signatory related info (assets) in certificates web view

- kelketek: Fixes for static asset collection in certificate HTML view.

- SOL-398 Web View: Public Access

- mattdrayer: Post-merge branch stabilization

- catong: Initial changes to Studio template and Help config file

- ziafazal: Branch stabilizations

- SOL-387: Display organization logo on LMS web view

- talbs/mattdrayer: Branch Stabilizations

- talbs: converting backpack action to use a button HTML element

- talbs: revising placeholder assets + their rendering in cert view

- mattdrayer: Username web view wireup

- SOL-386 Certificate Mode Previews

- SOL-905: Make organization logo and signatory signature uneditable

- SOL-922: Improve test coverage

- SOL-765: Add LinkedIn sharing

- [marco] temporary styling adjustment to account for smaller linkedin share image / fake button

- SOL-921: Address hardcoded template items

- SOL-927: Deleting certificate should delete org logo image also
  * updated invalid template
  * removed hr
  * fix invalid certificate error

- clrux: Add i18n to certificate templates and partials

- mattdrayer: Pylint violations

- SOL-920 Certificate Activation/Deactivation

- mattdrayer: Added LMS support

- SOL-932: Fix preview mode support in certificate view

- SOL-934: Fixed bug reported and broken tests

- SOL-935 removed the 'valid' word from web view title

- talbs: RTL support updates/fixes
  * revising certificate type icon/name vertical alignment
  * removing unused older certificate template
  * revising styling for message/banner actions
  * abstracting accomplishment type to use course mode + adding in honor/verified-specific placeholders

- mattdrayer: JSHint violations
 2015-06-01 19:48:04 -04:00
Daniel Friedman
9e0dcb7239 Add JSON response to auto_auth with anonymous_id 2015-06-01 14:21:42 -04:00
Ned Batchelder
eb3b8c5ce4 TNL-2269 Compute language direction every time. 
The old code would compute the language direction once when the template
was loaded.

TNL-2269
 2015-05-28 16:13:59 -04:00
Awais Qureshi
5c5ec5c471 Merge pull request #8157 from edx/awais786/ECOM-1494-deprecate-midcourse-code 
Awais786/ecom 1494 deprecate midcourse code
 2015-05-28 12:25:48 +05:00
Nimisha Asthagiri
8aae4023f9 MA-738 OAuth2 token exchange for session cookie. 2015-05-27 07:35:31 -04:00
Awais
d0df626685 ECOM-1494 removing code from models. 2015-05-27 16:32:26 +05:00
Sarina Canelake
29c86032ec Merge pull request #8181 from IONISx/tusbar/fix-enrollment-api-doc 
Fix documentation comment for enrollment API
 2015-05-26 16:13:14 -04:00
chrisndodge
99de1c8f48 Merge pull request #7992 from edx/muhhshoaib/SOL-794-generate-detailed-enrollment-report 
Muhhshoaib/sol 794 generate detailed enrollment report
 2015-05-26 15:57:22 -04:00
Bertrand Marron
e8bf151f3d Fix documentation comment for enrollment API 2015-05-25 16:56:25 +02:00
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