James Tauber
c6dfd97eeb
Merge pull request #902 from antoviaque/accessibility
...
Help Modal - Accessibility Fixes
2013-09-13 08:21:47 -07:00
chrisndodge
b6761498a3
Merge pull request #954 from edx/fix/cdodge/remove-forum-permissions-on-delete
...
define a unseeding forums permissions and call into it from delete_cours...
2013-09-13 07:23:14 -07:00
Chris Dodge
955e54c2e6
refactor some code out of the django-admin entry point into a help function in CMS. Update tests to use new method
2013-09-13 09:07:01 -04:00
Valera Rozuvan
52eae9839b
Merge pull request #907 from edx/valera/fix_remove_unnecessary_css_code_from_video
...
Removed an inclusion of t-copy-sub1 in SCSS for Video.
2013-09-13 00:12:31 -07:00
Valera Rozuvan
27015578f2
Removed an inclusion of t-copy-sub1 in SCSS.
...
This line was not doing anything and simply causing a warning while
SASS was compiling. The following is the warning:
---
WARNING on line 35 of /home/valera/edx_all/edx-platform/common/static
/xmodule/descriptors/css/_000-5df8e10160f918d31f2b2e8be3ce247d.scss:
".xmodule_edit.xmodule_VideoDescriptor .editor-with-tabs .edit-header
.component-name" failed to @extend ".t-copy-sub1".
The selector ".t-copy-sub1" was not found.
Use "@extend .t-copy-sub1 !optional" if the extend should be able to
fail.
---
2013-09-13 10:11:45 +03: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
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
Chris Dodge
2ac6d78a90
update comment
2013-09-12 16:01:51 -04:00
Chris Dodge
bf67c83340
update comment and verify seeding was done
2013-09-12 15:58:56 -04:00
Chris Dodge
481cbfd8a5
consolidate delete role logic
2013-09-12 15:57:13 -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
Chris Dodge
615341fb65
add one more test to verify that deleting one courses forum permissions does not accidentially delete another course's forum seeding
2013-09-12 15:03:00 -04:00
Jay Zoldak
681e40dbe7
Merge pull request #960 from edx/zoldak/remove-unimplemented-steps
...
Remove unimplemented steps from certificates acceptance test code
2013-09-12 12:02:56 -07:00
Jay Zoldak
b542864b47
Merge pull request #957 from edx/zoldak/images-in-cert-flow
...
Fix acceptance tests to capture images for paid cert flow
2013-09-12 12:02:38 -07:00
Jay Zoldak
cfe4e46a17
Remove unimplemented steps from certificates acceptance test code
2013-09-12 14:54:01 -04:00
David Baumgold
24df55234f
Adding @hikari-boulders to AUTHORS file
2013-09-12 14:47:55 -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
2c9fc59d79
Unused import.
2013-09-12 14:30:00 -04:00
cahrens
ce4fb08bdf
Style cleanup.
2013-09-12 14:30:00 -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
Chris Dodge
bd69db4410
switch to using get() rather than get_or_create(). Also add a test case with a different casing on the courseId
2013-09-12 14:27:57 -04:00
Chris Dodge
41be20a000
define a unseeding forums permissions and call into it from delete_course
...
define a unseeding forums permissions and call into it from delete_course
define a unseeding forums permissions and call into it from delete_course
2013-09-12 14:27:57 -04:00
Will Daly
2677598a53
Merge pull request #938 from rocha/mock-mongo-on-event-tracking-tests
...
Mock mongo event tracking backend during tests
2013-09-12 11:27:22 -07:00
jkarni
2b5fa7994f
Merge pull request #951 from edx/jkarni/add-mock
...
Add mock package to RTD requirements
2013-09-12 10:58:46 -07:00
Carlos Andrés Rocha
dba03b9cbc
Merge pull request #953 from rocha/fix-event-logger-backend-json-encoding
...
Fix error encoding datetime objects in the event track logger backend
2013-09-12 10:44:56 -07:00
Carlos Andrés Rocha
6a64b404a1
Mock mongo event tracking backend during tests
2013-09-12 13:36:49 -04:00
Adam
4b07aa0fb7
Merge pull request #914 from edx/fix/adam/instr-dash-strip
...
strip processed fields in instructor dash
2013-09-12 10:01:15 -07:00
Carlos Andrés Rocha
979ec89f0e
Fix error encoding datetime objects in the event track logger backend
...
The function json.dumps was being called with incorrect arguments,
causing an infinite recursion when serializing an event containing
datetime objects
2013-09-12 12:21:08 -04:00
Diana Huang
8194eedcd9
Merge pull request #952 from edx/ormsbee/ss_msg_signing
...
Re-enable signature checking of Software Secure postbacks
2013-09-12 09:03:36 -07:00
David Ormsbee
221777e6ea
Re-enable signature checking for Software Secure callbacks
2013-09-12 11:59:03 -04:00
David Baumgold
b16799071e
Merge pull request #559 from hikari-boulders/patch-2
...
Update discussion.md
2013-09-12 08:36:43 -07:00
Julian Arni
1bd745f336
Add mock package to RTD requirements
2013-09-12 10:56:47 -04:00
Christina Roberts
784115ac79
Merge pull request #901 from edx/christina/dont_import_checklists
...
Do not store expanded action URLs.
2013-09-12 07:54:25 -07:00
jkarni
5af1fd79ab
Merge pull request #932 from edx/jkarni/fix/remove-leftover-file
...
Fixes extra 'file' that was leftover locally after import
2013-09-12 07:50:09 -07:00
David Ormsbee
a7cb28fc90
Merge pull request #949 from edx/ormsbee/force_save_on_photo_id_upload
...
Force save of photo_id_key on upload
2013-09-12 07:37:15 -07: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
Julian Arni
ca2049abd3
Fixes extra 'file' that was leftover locally after import
2013-09-12 10:29:41 -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
cahrens
cda45cd77a
Add a checklist example to test course for import/export roundtrip.
2013-09-12 09:58:07 -04:00
Diana Huang
dbf088ae39
Merge pull request #944 from edx/diana/fix-camera-detection
...
Wait for flash to load before trying to detect a camera
2013-09-12 06:57:36 -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
cahrens
ea26b19d0b
pylint/pep8 cleanup.
2013-09-12 09:47:30 -04:00
