Jason Bau
|
a4f5f4e42f
|
about page changes, refactor processor reply handling
|
2013-08-21 13:14:21 -04:00 |
|
Jason Bau
|
0b8f41443f
|
Lots more verification of CyberSource reply + receipt generation
|
2013-08-21 13:14:21 -04:00 |
|
Jason Bau
|
cf9d42772f
|
factor out cybersource processor from cart
|
2013-08-21 13:14:21 -04:00 |
|
Jason Bau
|
ab1452cb1a
|
add Order model fields for receipt generation
|
2013-08-21 13:14:21 -04:00 |
|
Jason Bau
|
1f6bdca6dd
|
add Validation function for cybersource receipt POST
|
2013-08-21 13:14:21 -04:00 |
|
Jason Bau
|
ed4e7f54c7
|
Move shopping cart from session into model/db
|
2013-08-21 13:14:21 -04:00 |
|
Jason Bau
|
1a3953ca89
|
add parameterization of cybersource creds
|
2013-08-21 13:14:21 -04:00 |
|
Jason Bau
|
9e56028091
|
added shopping cart list template, embedded form
|
2013-08-21 13:14:20 -04:00 |
|
Jason Bau
|
b7d73933b7
|
initial commit of shopping cart and cybersource integration
|
2013-08-21 13:14:20 -04:00 |
|
Diana Huang
|
deb55380d5
|
Merge pull request #760 from edx/diana/move-course-modes-to-common
Move course modes to common and enable in Studio admin
|
2013-08-21 10:12:26 -07:00 |
|
Kevin Chugh
|
2f4665375f
|
Merge pull request #745 from edx/dave/block_forums_for_unenrolled
Make it so that students who are not enrolled cannot see the forum
|
2013-08-21 09:13:10 -07:00 |
|
Your Name
|
25d98778cc
|
Merge branch 'master' into dave/block_forums_for_unenrolled
|
2013-08-21 12:00:06 -04:00 |
|
Your Name
|
541aa08471
|
update forum access to include check for valid date range
|
2013-08-21 11:59:39 -04:00 |
|
Your Name
|
a36e3b1957
|
CourseEnrollment no longer needed in forum/views
|
2013-08-21 11:06:30 -04:00 |
|
Diana Huang
|
70e1c70e4f
|
Move course modes to common and enable in Studio
|
2013-08-21 09:59:15 -04:00 |
|
Your Name
|
b317d45ffb
|
add missing imports
|
2013-08-21 09:49:09 -04:00 |
|
Kevin Chugh
|
08aafc58ea
|
refactor to add access control to already_existing access control routines in access.py
|
2013-08-20 19:43:46 -04:00 |
|
Kevin Chugh
|
a2bbb65dcf
|
refactor to add access control to already_existing access control routines in access.py
|
2013-08-20 19:42:03 -04:00 |
|
jkarni
|
e79f8c437a
|
Merge pull request #665 from edx/feature/msteele/remove-log_event
Remove js log_event (keep compatibility)
|
2013-08-20 14:09:59 -07:00 |
|
Miles Steele
|
cb7a3ad8eb
|
switch from log_event to Logger.log
keep log_event for compatibility
|
2013-08-20 16:52:18 -04:00 |
|
Peter Baratta
|
5692867b14
|
Merge pull request #750 from edx/peterb/numerical/add-docs
Add docs for changes in #726
|
2013-08-20 13:22:43 -07:00 |
|
Peter Fogg
|
9065023132
|
Merge pull request #749 from edx/peter-fogg/fix-rename-fail-grade
Fix failing grade label being editable but not saved.
|
2013-08-20 12:53:27 -07:00 |
|
Carlos Andrés Rocha
|
a35a2fd389
|
Merge branch 'release'
|
2013-08-20 14:55:20 -04:00 |
|
Peter Baratta
|
ab2570a7bd
|
Add docs for changes in #726
|
2013-08-20 14:04:38 -04:00 |
|
Peter Fogg
|
533e0da101
|
Add acceptance test for noneditable failing grade range.
|
2013-08-20 13:34:41 -04:00 |
|
Peter Fogg
|
38165efd18
|
Fix failing grade label being editable but not saved.
|
2013-08-20 12:42:36 -04:00 |
|
jkarni
|
6c5d3e66c9
|
Merge pull request #731 from edx/jkarni/feature/docchanges
Incorporate Anant's suggestions
|
2013-08-20 07:00:05 -07:00 |
|
Peter Baratta
|
8211600bde
|
Merge pull request #726 from edx/peterb/numerical/evaluate-staff
Use calc's evaluator for staff answers in `Numercial` type
|
2013-08-20 06:53:27 -07:00 |
|
Brian Talbot
|
f14e93029e
|
Merge pull request #748 from edx/talbs/lms-fix-resetbutton
Sync up Reset Action Button Styling for Capa xmodules
|
2013-08-20 06:43:40 -07:00 |
|
Brian Talbot
|
fb7fe13061
|
adds in the .reset type of action to the x module capa styling
|
2013-08-20 09:21:04 -04:00 |
|
Christina Roberts
|
1a8b2fa0eb
|
Merge pull request #735 from edx/fix/cdodge/pylint-violations
address some pylint violations in the mixedmodulestore build report
|
2013-08-20 05:42:55 -07:00 |
|
Christina Roberts
|
05712da6e9
|
Merge pull request #744 from edx/dhm/pep_pylint_cleanups
Add doc strings and fix spaces
|
2013-08-20 05:28:21 -07:00 |
|
chrisndodge
|
4129c1cffd
|
Merge pull request #636 from edx/fix/cdodge/dont-process-osx-hidden-files-on-imports
on import, when enumerating through the 'draft content', OSX environment...
|
2013-08-19 21:42:19 -07:00 |
|
Chris Dodge
|
e576c7be15
|
pylint error fix
|
2013-08-20 00:40:20 -04:00 |
|
chrisndodge
|
c33571ff98
|
Merge pull request #732 from edx/fix/cdodge/get_items_needs_courseid
Fix/cdodge/get items needs courseid
|
2013-08-19 21:26:12 -07:00 |
|
chrisndodge
|
63c65484d1
|
Merge pull request #729 from edx/fix/cdodge/I18N-dashboard-error
don't put the substitutions in quotes
|
2013-08-19 21:11:43 -07:00 |
|
Chris Dodge
|
6a423af7ad
|
PR feedback
|
2013-08-19 23:53:53 -04:00 |
|
Chris Dodge
|
0ed0653956
|
on import, when enumerating through the 'draft content', OSX environments will have hidden binary encoded quarantine files. We don't want to try to process these as they will throw an exception when trying to be parsed. It's harmless - the import goes on fine - but it's a lot of clutter in the output logs.
|
2013-08-19 23:52:28 -04:00 |
|
Chris Dodge
|
6a3dafeed6
|
update hint manager to pass in a course_id when dereferencing a module
|
2013-08-19 23:42:27 -04:00 |
|
Chris Dodge
|
bc5e27fe17
|
update some more call sites in LMS to always pass in a course_id
|
2013-08-19 23:42:26 -04:00 |
|
Chris Dodge
|
a16aee340a
|
get_items should take a course_id
|
2013-08-19 23:42:26 -04:00 |
|
Chris Dodge
|
2e1eb1dce5
|
add escaping
|
2013-08-19 23:41:49 -04:00 |
|
Chris Dodge
|
f599d4b508
|
don't put the substitutions in quotes
|
2013-08-19 23:41:49 -04:00 |
|
Chris Dodge
|
352e56eb4e
|
address some pylint violations in the mixedmodulestore build report
|
2013-08-19 23:40:46 -04:00 |
|
Jason Bau
|
606e8b1d97
|
Merge pull request #697 from edx/fix/jbau/openendmodule-round-score-up
small change in aggregating peer eval grades (rounds up)
|
2013-08-19 15:43:03 -07:00 |
|
David Ormsbee
|
013009ea24
|
Let staff have access to a forum even if they're not enrolled in the course.
|
2013-08-19 17:27:23 -04:00 |
|
David Ormsbee
|
c2d1791de4
|
Make it so that students who are not enrolled cannot see the forum
|
2013-08-19 17:09:47 -04:00 |
|
Jonah Stanley
|
73ad057eff
|
Merge pull request #710 from edx/jonahstanley/help-acceptance-test
Jonahstanley/help acceptance test
|
2013-08-19 14:02:29 -07:00 |
|
Don Mitchell
|
20641bab61
|
indent even more
|
2013-08-19 16:57:59 -04:00 |
|
Adam
|
2a24d6497a
|
Merge pull request #742 from edx/fix/adam/help-modal-FAQ
set first FAQ link to mktg webiste too
|
2013-08-19 13:44:35 -07:00 |
|