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

6311 Commits

Author SHA1 Message Date
Gabe Mulley
b1a76f1258 Merge pull request #925 from mulby/fix/gabe/configurable-tracking-filter 
Make URL patterns to exclude from tracking configurable
 2013-09-13 11:10:59 -07:00
Greg Price
e360f1d54f Merge pull request #950 from edx/gprice/dialog-role 
Add ARIA dialog role to Markdown editor dialogs
 2013-09-13 10:42:58 -07:00
Jason Bau
1a5176c9cb Merge pull request #966 from edx/jbau/fix/verify-student-aws-settings-defaults 
fix default for VERIFY_STUDENT in lms/envs/aws.py
 2013-09-13 09:02:45 -07:00
Gabe Mulley
761a4dcc97 Make URL patterns to exclude from tracking configurable 
* Add unit test coverage for this "exclusion from tracking" logic
* Exclude based on regex match instead of raw string comparison
* Exclude heartbeat requests from tracking
 2013-09-13 11:24:51 -04:00
James Tauber
c6dfd97eeb Merge pull request #902 from antoviaque/accessibility 
Help Modal - Accessibility Fixes
 2013-09-13 08:21:47 -07: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
Jason Bau
2f230836e0 fix default for VERIFY_STUDENT in lms/envs/aws.py 2013-09-12 16:49:30 -07:00
Sarina Canelake
193f7166d7 Merge pull request #962 from edx/sarina/fix-datadog-import 
Don't assign variable to .update() call
 2013-09-12 13:46:44 -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
Sarina Canelake
484bc91ab3 Don't assign variable to .update() call 2013-09-12 16:03:22 -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
Greg Price
67053feec1 Add ARIA dialog role to Markdown editor dialogs 2013-09-12 10:47:47 -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
Diana Huang
8839a2053e Wait until the flash object is loaded before looking for a camera. 2013-09-12 09:09:35 -04:00
David Ormsbee
b8fcc118dd Merge pull request #942 from edx/ormsbee/aws_verify_settings 
Tiny change to pull in student verification settings on aws envs
 2013-09-11 22:08:44 -07:00
David Ormsbee
5942a87071 Pull VERIFY_SETTINGS from AUTH_TOKENS 2013-09-12 01:04:01 -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
David Ormsbee
00f96ec79f Merge pull request #937 from edx/zoldak/add-cert-tests 
Add more certificates test for newly implemented features
 2013-09-11 20:33:53 -07:00
David Ormsbee
af9193afda Merge pull request #939 from edx/hotfix/progress-500s 
Hotfix/progress 500s
 2013-09-11 19:04:44 -07:00
David Ormsbee
f9067cbe4d Merge pull request #940 from edx/ormsbee/flash_detect_camera 
Detect cameras and flash
 2013-09-11 18:58:57 -07:00
Carlos Andrés Rocha
ee0004e2f8 Remove dogstatsd-python in favor of dogapi 
Also added datadog application to commom django apps and set it to use
a local statsd server by default.
 2013-09-11 19:28:58 -04:00
Renzo Lucioni
fbe5cafdab Merge pull request #936 from edx/renzo/instrument-verified-cert-flow 
Renzo/instrument verified cert flow
 2013-09-11 16:02:43 -07:00
Diana Huang
7ab5ae925d Add in the ability to detect webcams and flash. Show error messages. 2013-09-11 18:39:18 -04:00
Frances Botsford
5921bca082 adding notification to photo page when no flash or webcam is detected 2013-09-11 18:39:17 -04:00
David Ormsbee
e498ad522a Add hasCamera() method to flash camera detection 2013-09-11 18:39:17 -04:00
Adam Palay
ee62719025 check if module created from description is None before looking for its child descriptors 2013-09-11 18:33:51 -04:00
Adam Palay
7ff4397e81 change disable_start_dates to False in lms.dev to mirror more closely a production environment 2013-09-11 18:33:43 -04:00
Jay Zoldak
fbeb63ee47 Add more certificates test for newly implemented features 2013-09-11 17:29:50 -04:00
Renzo Lucioni
9fd4f69e76 Instrument verified cert flow 2013-09-11 16:51:46 -04:00
Jay Zoldak
1ead54223b Change locators of links to match updated ids 2013-09-11 16:23:51 -04:00
Jay Zoldak
36f7d439aa Change locators of links to match updated ids 2013-09-11 16:18:59 -04:00
David Baumgold
049aa3bbfd Merge pull request #880 from edx/db/update-requests-lib 
Update `requests` library to 1.2.3
 2013-09-11 13:03:55 -07:00
Greg Price
9faa55d336 Merge pull request #921 from edx/gprice/forum-nav-accessibility 
Improve forums nav accessibility
 2013-09-11 11:47:56 -07:00
Frances Botsford
3e9584bb1c cleanup on vcert payment error and receipt billing info 2013-09-11 13:40:26 -04:00
Alexander Kryklia
68409f0c7a Add default launch url for lti. 2013-09-11 19:16:46 +03:00