Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,925 Commits 1 Branch 0 Tags
91fab4579b4e56459609f6ede8501de08a776398
Commit Graph

5844 Commits

Author SHA1 Message Date
David Ormsbee
91fab4579b Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/envs/common.py
	lms/envs/dev.py
 2013-08-22 14:57:34 -04:00
David Ormsbee
5422fc94ca very stupid initial photo verification attempt save just so we can stuff into a cart 2013-08-22 14:54:29 -04:00
David Ormsbee
25d9c2f385 Merge design first pass at mode choice page 2013-08-22 14:17:57 -04:00
David Ormsbee
4a70f7588e Merge branch 'ormsbee/verifyuser' into ormsbee/verifyuser_func 
Conflicts:
	lms/djangoapps/verify_student/models.py
	lms/djangoapps/verify_student/tests/test_models.py
	lms/djangoapps/verify_student/tests/test_views.py
	lms/djangoapps/verify_student/urls.py
	lms/djangoapps/verify_student/views.py
	lms/envs/dev.py
	lms/templates/verify_student/face_upload.html
	lms/templates/verify_student/photo_id_upload.html
	lms/urls.py
 2013-08-22 14:07:08 -04:00
David Ormsbee
0dd5819683 basic flow from enroll mode selection to verify screen 2013-08-22 13:56:23 -04:00
David Ormsbee
1676fc31a5 Halfway state for course enrollment by mode 2013-08-21 16:21:53 -04:00
Diana Huang
bd4cc448af Clean up models, add some error handling 2013-08-21 15:55:30 -04:00
Peter Fogg
e177270d0d Merge pull request #700 from edx/peter-fogg/course-image-upload 
WIP: Peter fogg/course image upload
 2013-08-21 11:17:12 -07:00
chrisndodge
9dce9d1e23 Merge pull request #755 from edx/fix/cdodge/STUD-671 
update the PDF textbook url paths as well as update wiki_slug when impor...
 2013-08-21 10:54:51 -07:00
Diana Huang
26f1caaf57 Add jsinput_spec back in. 2013-08-21 13:54:22 -04:00
Jason Bau
efbb439cb5 Adding migration to store purchased mode in PaidCourseRegistration 2013-08-21 13:14:22 -04:00
Jason Bau
65f2814d73 make PaidCourseRegistration mode aware 2013-08-21 13:14:22 -04:00
Diana Huang
d6e777bc1b Remove enrollment_cost from course_module 2013-08-21 13:14:21 -04:00
Jason Bau
a4f5f4e42f about page changes, refactor processor reply handling 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
b7d73933b7 initial commit of shopping cart and cybersource integration 2013-08-21 13:14:20 -04:00
Diana Huang
70e1c70e4f Move course modes to common and enable in Studio 2013-08-21 09:59:15 -04:00
Peter Fogg
e4302e62d2 Allow course image uploads in the settings page. 
Authors can upload an image (or choose an existing one) from the
settings page, using the in-context uploader from PDF
textbooks. Includes tests for backwards compatibility with XML courses
-- they used a magic filename (images/course_image.jpg) which is
mapped to a location in the Mongo contentstore.

Still needs some UX work, though the backend plumbing is there.
 2013-08-21 09:42:00 -04:00
Chris Dodge
596fed78f1 add docstrings 2013-08-20 22:45:37 -04:00
Chris Dodge
5989bf6bdc update the PDF textbook url paths as well as update wiki_slug when importing 2013-08-20 21:50:28 -04: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
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
Chris Dodge
e576c7be15 pylint error fix 2013-08-20 00:40:20 -04: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
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
Don Mitchell
20641bab61 indent even more 2013-08-19 16:57:59 -04:00
Don Mitchell
d3cbf212fe Add doc strings and fix spaces 2013-08-19 16:15:15 -04:00
cahrens
a4448ea50e Make sure to persist static tab name assignment. 
STUD-663

Pylint updates.
 2013-08-19 15:05:56 -04:00
Peter Baratta
e0f0ab090d Use calc's evaluator for staff answers in Numercial type 
Rather than just calling `complex(...)` on the staff answers, also call
`calc.evaluator`. This way, simple things like `1/3` can be entered, as well
as more complicated explicit equations (e.g. `sqrt((12^2 + 26^2)/2)` etc, etc)

Simplify and update the tests to work with this.
 2013-08-19 13:40:32 -04:00
Don Mitchell
33737d3142 Merge pull request #661 from edx/dhm/location_mapper 
Location to/from locator mapping facilities
 2013-08-19 07:39:15 -07:00
Chris Dodge
033f922ec0 add a try catch around the staticstorage lookup, which can throw an exception 2013-08-17 10:33:59 -04:00
chrisndodge
594a73d437 Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore 
Feature/cdodge/add a mixed modulestore
 2013-08-17 07:32:51 -07:00
Don Mitchell
998a25e7b3 Use a sort of name to choose if > 1 map 
and some minor comment changes.
 2013-08-16 16:07:26 -04:00
Don Mitchell
8f530d12c7 Raise ItemNotFoundError rather than return None if no map found 2013-08-16 16:07:26 -04:00
Don Mitchell
bd8a7906f5 Clarify doc/comments on default v explicit mappings 2013-08-16 16:07:26 -04:00
Don Mitchell
2ad515d15a Move singleton accessor w/ django dependencies to same place as modulestore() singleton accessor 2013-08-16 16:07:26 -04:00
Don Mitchell
2702d8a636 Implement location mapper as stand-alone helper class 
with own db connection.
 2013-08-16 16:06:56 -04:00
Don Mitchell
47a2122a65 Require edx:// for urls 
But don't use this parser for urls embedded in a browser url request.
 2013-08-16 16:06:11 -04:00
Don Mitchell
1b63ecab48 Enable test via naming it correctly 2013-08-16 16:06:11 -04:00
Don Mitchell
37602edfec Translate locations <-> locators 
unit tests and fixes they implied
 2013-08-16 16:06:11 -04:00
Don Mitchell
3ee6b3c095 pep8 violation fix (shadowed identifier) 2013-08-16 16:04:58 -04:00
Don Mitchell
1abae6f093 Location to Locator mapping utilities 
partial impl
 2013-08-16 16:04:58 -04:00
Don Mitchell
0833f87fef Remove 'edu' from examples 
per our agreement not to use the domain
 2013-08-16 16:03:34 -04:00
chrisndodge
8ba3214cd4 Merge pull request #496 from edx/feature/cdodge/add-a-mixed-modulestore 
Add a 'MixedModuleStore' which aggregates between XML and Mongo Modulestores
 2013-08-16 13:02:31 -07:00