Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
17,958 Commits 1 Branch 0 Tags
34362b88a6304b71dfd99ad08095461e9e1aef5d
Commit Graph

2727 Commits

Author SHA1 Message Date
Adam
75b7514c4f Merge pull request #965 from felipemontoya/features/fmo/lms-i18n-strings 
Features/fmo/lms i18n strings
 2013-09-19 12:05:35 -07:00
Felipe Montoya
893d22515d Something for the user dashboard 2013-09-19 10:52:29 -05:00
Jason Bau
46fddc6d26 Merge pull request #1052 from edx/jbau/staff-needs-to-grade-use-get 
use .get when checking combined notifications to handle missing keys
 2013-09-19 07:49:39 -07:00
Jason Bau
aa0801907d use .get when checking combined notifications to handle missing keys 2013-09-18 23:47:31 -07:00
Calen Pennington
9643fd463f Rename xblock_field_data to xmodule_field_data 2013-09-18 10:49:41 -04:00
Calen Pennington
d35a03a0d6 Merge pull request #908 from cpennington/reference-runtime 
Replace references to .system
 2013-09-18 05:43:20 -07:00
Giulio Gratta
d4687aa6df 4 OE/ORA UI fixes to make it easier to use 
- require confirmation when clicking Open Ended reset button (now working)
- require confirmation when submitting Open Ended essay (now working)
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
 2013-09-17 16:13:36 -07:00
Diana Huang
d191847ff5 Merge branch 'release' 
Conflicts:
	lms/static/sass/views/_verification.scss
 2013-09-17 10:55:22 -04:00
chrisndodge
0601761d27 Merge pull request #1000 from edx/fix/cdodge/courseware-index-perf-tweek 
Fix/cdodge/courseware index perf tweek
 2013-09-17 06:50:33 -07:00
Chris Dodge
1a5edcd998 we already have the descriptor, so call get_module_for_descriptor() rather than refecting that subtree which is multiple round-trips to DB 
fix line indents
 2013-09-17 08:15:00 -04:00
Jason Bau
706b386a57 Revert "4 OE/ORA UI fixes to make it easier to use" 
This reverts commit 3b29d6056e.
 2013-09-16 20:22:18 -07:00
Jay Zoldak
30b13d3cf1 Improve code clarity and error messages for css selection 2013-09-16 16:49:18 -04:00
Jay Zoldak
2ff056df8c Simplify retry logic for ui helper functions 2013-09-16 16:49:17 -04:00
Jay Zoldak
6531918af5 Skip verified cert acceptance tests that upload to s3 2013-09-16 16:11:21 -04:00
David Ormsbee
4245c229d8 Don't verify SSL cert when submitting to Software Secure (they're using self-signed cert for the moment). 2013-09-16 14:21:03 -04:00
Giulio Gratta
3b29d6056e 4 OE/ORA UI fixes to make it easier to use 
- require confirmation when clicking Open Ended reset button
- require confirmation when submitting Open Ended essay
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
 2013-09-16 10:27:13 -07:00
David Ormsbee
99841be604 Update docstring on ssencrypt.body_string to be more useful. 2013-09-16 10:23:31 -04:00
David Ormsbee
ab6018a0e5 Replace signature validation with access-key and add logging around Software Secure callbacks. 2013-09-16 10:07:07 -04:00
David Ormsbee
b1be80b848 Extend message signing code to work with dicts, lists. 2013-09-16 10:07:07 -04:00
David Ormsbee
3b44ec11e0 Convert JSON dumps output to UTF-8 before sending to Software Secure 2013-09-16 10:07:07 -04:00
Diana Huang
47ce9082e4 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py
 2013-09-13 17:15:44 -04:00
David Ormsbee
1ac71223c1 Merge pull request #979 from edx/ormsbee/ss_small_fixes 
Send JSON messages to Software Secure in UTF-8, without escaping
 2013-09-13 12:25:44 -07:00
David Ormsbee
8c056f383e Make sure our JSON messages output unescaped UTF-8 text, to match Software Secure expectations. 2013-09-13 15:20:08 -04:00
Ned Batchelder
bbf508ca7b fix-setattr-and-getattr 2013-09-13 14:44:49 -04:00
Vik Paruchuri
8613594c49 Merge pull request #971 from edx/fix/vik/pg-hotfix 
Fix/vik/pg hotfix
 2013-09-13 09:23:00 -07:00
David Ormsbee
d1e1e7e5bc Minor fixes to handle non-ASCII names/config in student verification. 2013-09-13 11:49:54 -04:00
David Ormsbee
b6a863fb0e Make sure we use the name that was frozen at time of verification when sending to Software Secure. 2013-09-13 11:48:44 -04:00
Vik Paruchuri
009017fe07 Address review comments 2013-09-13 11:06:40 -04:00
Vik Paruchuri
b222e66f45 Fix nopathtoitem error in peer grading 2013-09-13 11:06:23 -04:00
Jason Bau
c86a56e6d9 Merge pull request #959 from edx/jbau/fix/anonymous-index-with-startdate 
fix bug with anonymous access to / with future start courses
 2013-09-12 17:33:55 -07:00
Diana Huang
90951a7bdb Merge branch 'release' 
Conflicts:
	CHANGELOG.rst
	common/lib/xmodule/xmodule/js/fixtures/lti.html
	common/lib/xmodule/xmodule/js/spec/lti/constructor.js
	common/lib/xmodule/xmodule/js/src/lti/lti.js
	common/lib/xmodule/xmodule/lti_module.py
	lms/djangoapps/courseware/features/certificates.py
	lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
	lms/djangoapps/courseware/tests/test_lti.py
	lms/djangoapps/shoppingcart/models.py
	lms/envs/aws.py
 2013-09-12 16:03:39 -04:00
Christina Roberts
70cc500851 Merge pull request #916 from edx/christina/due-date-format 
Allow custom formatting of due date strings.
 2013-09-12 12:05:28 -07:00
Jay Zoldak
cfe4e46a17 Remove unimplemented steps from certificates acceptance test code 2013-09-12 14:54:01 -04:00
Jason Bau
7668ef6f31 fix bug with anonymous access to / with future start courses 2013-09-12 11:43:21 -07:00
Jay Zoldak
ade62ab90f Fix acceptance tests to capture images for paid cert flow 2013-09-12 14:33:07 -04:00
cahrens
988833ded9 pylint/pep8 2013-09-12 14:30:00 -04:00
cahrens
95ad1826d4 Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format. 2013-09-12 14:30:00 -04:00
cahrens
08d9942993 Allow custom formatting of due date strings. 
STUD-724

Test course for allowing custom formatting of due date strings.

STUD-724

Try making the name of the course match the folder name.

More cleanup.

More cleanup.

updates.
 2013-09-12 14:30:00 -04:00
David Ormsbee
221777e6ea Re-enable signature checking for Software Secure callbacks 2013-09-12 11:59:03 -04:00
David Ormsbee
e3895b7856 Force a save of the model when we're uploading a photo ID so our generated key is always saved. 2013-09-12 10:33:24 -04:00
Adam Palay
8bbc11cb2b rename stripping function, make it more explicit 2013-09-12 10:10:19 -04:00
Adam Palay
bc424173ad move _clean_fields to tools.py 2013-09-12 10:10:18 -04:00
Adam Palay
640d00c5be strip processed fields in instructor dash 2013-09-12 10:10:18 -04:00
Adam
2c0a08f78f Merge pull request #864 from edx/adam/welcome-email 
Adam/welcome email
 2013-09-12 07:06:56 -07:00
Carlos Andrés Rocha
87fcf1ab9e Merge pull request #905 from rocha/datadog-statsd 
Remove dogstatsd-python in favor of dogapi
 2013-09-12 06:53:02 -07:00
Adam Palay
f446c88f4d fix tests 2013-09-12 09:32:34 -04:00
Adam Palay
bc70b1d9da change formatting for email messages to use full_name instead of first_ and last_name 
fix templates
 2013-09-12 09:32:34 -04:00
Calen Pennington
58a5cdd81f Replace references to .system 2013-09-12 09:29:17 -04:00
David Ormsbee
92cab96c11 Merge pull request #941 from edx/ormsbee/softwaresecure 
Software Secure message signing and callback
 2013-09-11 21:17:14 -07:00
David Ormsbee
8278357c74 Hook up interface to Software Secure for identity validation. 2013-09-11 23:59:37 -04:00