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
Vik Paruchuri
c6e5e67483
Fix linking problem for peer grading, add in a test
...
Conflicts:
common/lib/xmodule/xmodule/tests/test_peer_grading.py
2013-09-13 11:09:06 -04:00
Vik Paruchuri
00050a08a4
Address review comments
2013-09-13 11:07:36 -04:00
Vik Paruchuri
640b7fe6b5
Fix problem with peer grading list not rendering, test
2013-09-13 11:07:22 -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
Brian Talbot
81df682f35
Merge pull request #967 from edx/talbs/fix-verification-copy
...
Verification Process: Copy Changes
2013-09-13 08:00:35 -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
Brian Talbot
1c5e9730f2
Verification: revises copy on receipt page to reflect a completed registration process
2013-09-13 10:14:06 -04: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
Jason Bau
2f230836e0
fix default for VERIFY_STUDENT in lms/envs/aws.py
2013-09-12 16:49:30 -07:00
Felipe Montoya
45a1e551f9
i18n: problem submit buttons.
2013-09-12 18:13:16 -05:00
Felipe Montoya
c6f4c8b2b8
i18n: staff/student toggle link
2013-09-12 18:13:12 -05:00
Felipe Montoya
a5fd04a95d
i18n: submit buttons at dashboard
2013-09-12 18:12:49 -05: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
frances botsford
473e80f537
Merge pull request #964 from edx/fix/frances/copy-edits-mode-choice
...
adjusting wording on choice expand block
2013-09-12 13:32:58 -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
Julian Arni
2aaade0f32
Utility functions for finding courses by id
2013-09-12 15:51:20 -04:00
Julian Arni
3e62c5e29a
Cleaner tests
2013-09-12 15:48:00 -04:00
Julian Arni
9d3395ea06
Bump diff-cover version
2013-09-12 15:48:00 -04:00
Julian Arni
af64621467
Remove unnecessary encode
2013-09-12 15:48:00 -04:00
Julian Arni
0208506f93
Use upside-down english for unicode text
2013-09-12 15:48:00 -04:00
Julian Arni
d54b197d24
Fix unicode errors on exceptions and logging
2013-09-12 15:47:59 -04:00
Julian Arni
1cfad39f1e
Add tests for imports with unicode filenames
2013-09-12 15:47:59 -04:00
Julian Arni
1813b22ab0
Fix import errors with unicode filenames
2013-09-12 15:47:59 -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
Diana Huang
14e0a4a038
Show order errors in page instead of in an alert.
2013-09-12 14:58:34 -04: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
Frances Botsford
896ffd4e77
adjusting wording on choice expand block
2013-09-12 14:43:01 -04: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
