Commit Graph

80 Commits

Author SHA1 Message Date
Peter Pinch
2c8f82f03d Fixing calculator hint to display correct definition of the constant T 2014-07-13 17:35:52 -04:00
asadiqbal08
5734d2a883 asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS
Added username into Authors file

[Ex-12] Add user to input coupon code in the Shopping Cart

[Ex-13] Discount should be reflected in the Payment confirmation page and email

added E-commerce Tab in Instructor Dashboard

added name/email in authors file

removed the is_active column, change the colors scheme, fixed bugs

wip

wip

test github account

STORE_BILLING_INFO set to True

cybersource api update, reference number updated, merchant_data removed from params

View Course buttons on receipt

link for course added to receipt

receipt.html view course button - func update

receipt.html course link update

move new CyberSource implementation to a separate file so that we can keep the original

remove config changes

remove config changes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

remove array paid_course_ids init in views.py

removed the is_active filter=false, added styling to the inactive coupon codes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

Add column to the list of coupons in the E-Commerce tab

Add ability for microsites to specify custom CyberSource secret configuration, i.e. run under different accounts

make the new CyberSource2 also microsite aware

updating migration for student and shopping cart apps

added user signup functionality that orignated from the Microsites

added non-microsite user signup tests

fix the hard coded callback URL to localhost

add comment

Modify e-commerce instructor tab to show a total amount above the coupon listings for admin finance user

made changes as suggested by diana khuang

add the CourseAccessRoles table to the Django Admin website

shopping cart coupon checkout changes as suggested by Jason Bau

changes are made according to the suggesstions on PR#4172

changes made in the coupons file

changes in the coupons get_coupon_info view

fix merge conflict resolution error

changes in the remove_coupon view json response

changes as suggested by David Baumgold

pep8/pylint fixes

Changes as suggested by jasonBau

don't assume item in shopping cart is a PaidCourseRegistration

fix up some logging

changed the urls of the coupon views and use the post to get the values from the request
2014-07-10 09:35:32 -04:00
Daniel Friedman
dc3dab115a Add myself to AUTHORS. 2014-07-07 16:01:36 -04:00
swdanielli
890eba26e2 Update AUTHORS 2014-07-03 12:58:14 -04:00
Brandon DeRosier
6869d594b7 Added Brandon DeRosier to authors 2014-06-27 12:27:49 -04:00
Tim Babych
ceb25fc4ee adding Tim Babych to AUTHORS 2014-06-19 12:19:21 +03:00
Mat Peterson
b48ab9d27c Adds Mat Peterson to authors file 2014-06-10 18:54:38 +00:00
Ben McMorran
1a0f57ac45 Adds Ben McMorran to authors file. 2014-06-02 14:44:44 -04:00
Johnny Brown
0bd2286e5b show a friendly message for an empty course rather than an error page 2014-05-29 16:55:40 -05:00
Ned Batchelder
0a230d93cd Add some missing AUTHORS 2014-05-27 10:56:39 -04:00
stv
e4df2c2ceb Add 'forum_roles' endpoint to user_api
Expose a new endpoint to query a list of users based on a
role name (Moderator, Student, etc.) and a course_id.

This will initially be used by the notifier to send daily digest
messages to forum moderators.
2014-05-23 13:07:04 -07:00
lduarte1991
e4e4b32c62 Image Annotation Tool: Add linkback functionality to image thumbnails
Changes requested in PR
2014-05-23 14:59:31 -04:00
Ben Patterson
dd07967805 Disable cms test due to failure on master build. 2014-05-22 09:24:13 -04:00
David Baumgold
c6ea63d3fd Added @ksteph to AUTHORS file
See https://github.com/edx/edx-platform/pull/506
2014-05-13 17:14:09 -04:00
Sébastien Hinderer
7c078e04d3 Add myself to AUTHORS. 2014-05-13 10:31:25 -04:00
dragonfi
c07b360528 Add my name to the authors file 2014-05-12 22:26:51 +02:00
Ben Weeks
b8bc909a01 Adding my name to the AUTHORS file. 2014-04-30 14:55:49 -04:00
John Cox
ce0b640712 Add third-party auth implementation and tests 2014-04-25 12:11:20 -07:00
Christine Lytwynec
ea3c48cf02 Removed trailing periods in two scenario names 2014-04-24 12:00:51 -04:00
Jonas Jelten
49f3eb3bc4 added jj to the author list 2014-04-18 22:56:51 +02:00
Ned Batchelder
db747dfd81 Fix Chris Terman's email address 2014-04-08 15:52:55 -04:00
marcore
cc7b13a811 Add my name! 2014-04-08 10:21:35 +02:00
William Desloge
043f036165 Added myself to author file 2014-03-24 11:35:26 +01:00
Jay Zoldak
db615248cb Update Authors file to add Raees and Ammar 2014-03-21 17:10:22 -04:00
Usman Khalid
e914286ba2 Fixed email in authors.txt 2014-03-21 16:12:38 +05:00
Ned Batchelder
07cec31887 Add Han Su Kim to AUTHORS 2014-03-06 15:20:36 -05:00
Ned Batchelder
166748a340 Fix Paul-Olivier Dehaye's AUTHOR entry. 2014-03-06 14:26:45 -05:00
Martyn James
9f4cb51d08 Adding Marty as an author 2014-02-26 12:28:05 -05:00
Nimisha Asthagiri
2ea92e1c6c Added nimisha to AUTHORS file. 2014-02-25 17:50:13 -05:00
Will Daly
544616be4b Fix sys.path manipulation in pavement.py, with detailed comment
Restore reverted changes from paver part 1
2014-02-18 15:09:07 -05:00
avinassh
6b5c5190e9 Added myself in AUTHORS 2014-02-17 19:22:43 +05:30
Will Daly
c85c4b22ed Revert "Replace rake functions with python paver functions"
This reverts commit df2e410f2a.
2014-02-14 14:25:28 -05:00
David Glance
df2e410f2a Replace rake functions with python paver functions
Deprecated rake functions issue a warning and then call paver
replacements

Bring Paver commands up to date with master for servers, assets, and docs.
Revert deprecation of quality, tests, and i18n for a future pull request.
Deprecate workspace migration
2014-02-14 11:25:55 -05:00
Ali Reza Sharafat
85058ec460 Course short descriptions -- couple of more asserts and pep8 fixes 2014-02-12 20:24:26 +00:00
Ned Batchelder
f900e8bb1d add missing people to AUTHORS 2014-02-05 17:52:18 -05:00
bachmann
62ca73fa59 Add Matt Bachmann to authors file 2014-02-02 01:18:03 -05:00
Graham Lowe
eaa98b2ef8 Add myself as contributor. 2014-01-30 15:45:51 -05:00
Cristian Salamea
4b664627b3 Added myself in AUTHORS 2014-01-16 14:12:35 -05:00
Matt Drayer
67666a0d4f Added myself to the Authors list 2014-01-06 16:07:44 -05:00
Andy Armstrong
c573db35d0 Add myself to list of authors 2014-01-05 23:37:21 -05:00
louyihua
fefb7757e7 Add 'Yihua Lou <supermouselyh@hotmail.com>' to the AUTHORS file. 2013-12-31 09:12:31 -05:00
David Baumgold
d12571744c Add @tusbar to AUTHORS file
To acknowledge his help with refactoring URLs in our CSS to be
protocol-relative
2013-12-22 08:11:37 -05:00
Gang Chen
012862bc24 Update AUTHORS 2013-12-17 10:20:57 -05:00
David Baumgold
179a1dd44e Revert "Merge pull request #1889 from tusbar/studio-https-fonts"
This reverts commit 540256b213, reversing
changes made to bd04ab5a08.
2013-12-16 09:30:42 -05:00
David Baumgold
540256b213 Merge pull request #1889 from tusbar/studio-https-fonts
Remove protocol from font URLs in Studio and Tiny MCE
2013-12-13 11:52:07 -08:00
polesye
38276972a5 Fix author name. 2013-12-11 13:59:07 +02:00
Bertrand Marron
0cbeb1035f Add myself to author file 2013-12-09 21:21:19 +01:00
Carson Gee
96c7cb5ffd Added tests for signup skipping 2013-11-25 13:06:28 -05:00
danielcebrian
954ca83c90 Update AUTHORS 2013-11-19 14:37:07 -05:00
Manuel Freire
cdc3ad1cc4 298.15 K is 25 C, not 0 (0 is defined to be at 273.15)
Signed-off-by:  <manuel.freire@fdi.ucm.es>
2013-11-19 12:52:13 +01:00