Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,355 Commits 1 Branch 0 Tags
20d87061d428fb554bfbd3e904b1dcd052d6f934
Commit Graph

19226 Commits

Author SHA1 Message Date
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
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
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
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
Felipe Montoya
45a1e551f9 i18n: problem submit buttons. 2013-09-12 18:13:16 -05: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
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
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
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
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
Carlos Andrés Rocha
6a64b404a1 Mock mongo event tracking backend during tests 2013-09-12 13:36:49 -04: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
Julian Arni
238899faac Make default parser keep comments 2013-09-12 10:59:56 -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
cahrens
cda45cd77a Add a checklist example to test course for import/export roundtrip. 2013-09-12 09:58:07 -04: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
1184a97b0b Do not store expanded action URLs. 
They are not portable. STUD-681.

Minor updates.
 2013-09-12 09:47:30 -04:00
Calen Pennington
58a5cdd81f Replace references to .system 2013-09-12 09:29:17 -04:00
Valera Rozuvan
b858810aa4 Updating LTI Jasmine tests. 
Due to the fact that by default the LTI settings have "http://www.example.com"
set as the default form action (launch_url), tests were updated to reflect the
fact that when setting is in default state, form is not submited, even when
the form action is not empty.
 2013-09-12 11:07:07 +03: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
Adam Palay
9538ae35d4 change graders text to unicode 2013-09-11 18:34:03 -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
8a32f274be Fix forums nav sidebar overlapping content 
Previously, when the window was scrolled down past the top of the
discussion content pane, scrolling right would cause the sidebar to
appear above the background of the content pane but below the text.
This is only an issue with very small windows or with the text size
increased significantly, which is why this came up in an accessibility
audit. Now the sidebar is fixed to the left side of the page instead
of the left side of the viewport.
 2013-09-11 14:24:58 -04:00
David Baumgold
acd23ad933 reformat for readability 2013-09-11 13:26:17 -04:00
Alexander Kryklia
4621952a55 Stub headers if scheme not provided. 2013-09-11 19:32:06 +03:00
Alexander Kryklia
96bb5e1692 Merge branch 'db/update-requests-lib' of github.com:edx/edx-platform into db/update-requests-lib 2013-09-11 19:17:13 +03:00
Alexander Kryklia
68409f0c7a Add default launch url for lti. 2013-09-11 19:16:46 +03:00
Calen Pennington
74dbb9d74e Remove unused XModuleDescriptor.get_sample_state method 2013-09-11 12:12:19 -04:00
David Baumgold
6a8546801c Response.json is now a callable 2013-09-11 10:18:00 -04:00
Carlos Andrés Rocha
1d668ff96a Merge pull request #797 from rocha/track-backend-configuration 
Add event tracking with configurable backends
 2013-09-11 07:03:35 -07:00
Carlos Andrés Rocha
11db4e3773 Use datetime objects in time field in event tracking 2013-09-11 10:02:16 -04:00
Carlos Andrés Rocha
6de25bf5fe Monitor event tracking time by backend using statsd 2013-09-11 10:02:15 -04:00
Carlos Andrés Rocha
fbc243dbeb Add event tracking with configurable backends 2013-09-11 10:02:15 -04:00
Valera Rozuvan
dd5506eeb7 Adding styles to fix issue BLD-221. 
If you make the window smaller, and keep reducing it's size, at some
point the controls will not fit, and some will be bumped to the next row.
When the widnow is resized below the width 1024, extra styling rules
will kick in to fix this issue. The word "Speed" from the speeds control
will be temporarirly hidden.
 2013-09-11 10:29:32 +03:00