Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
19,363 Commits 1 Branch 0 Tags
e8f067de8f2be4c7864ad1bdf4e0794de175e0dc
Commit Graph

6850 Commits

Author SHA1 Message Date
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
Calen Pennington
e415d2c264 Merge pull request #923 from cpennington/fix-mitxmako-middleware-import 
Add mitxmako.middleware to fix workers
 2013-09-10 13:54:23 -07:00
Calen Pennington
2ddaf9089d Merge pull request #891 from cpennington/fix-mitxmako-middleware-import 
Add mitxmako.middleware to fix workers
 2013-09-10 13:40:27 -07:00
Jason Bau
f3af24f692 Merge pull request #842 from edx/jbau/shib-revamp 
Revamped + Enhanced Shibboleth support
 2013-09-10 12:27:07 -07:00
Diana Huang
b597cdfdae If user has previously selected a price, show it on the choose page 2013-09-10 14:35:57 -04:00
David Baumgold
871ad7d694 Pass hostname to LTI XModule 
Necessary for RFC compliance with oauthlib
 2013-09-10 14:21:56 -04:00
Jason Bau
7b9c6fbe5f remove spaces from usename suggestion 2013-09-10 10:42:19 -07:00
David Ormsbee
740e5bace7 Prevent being able to click on disabled button in IE. 
Enable display of course org, num in receipt page.
 2013-09-10 13:32:52 -04:00
David Baumgold
a1d3899a4d Use oauthlib directly for LTI module 2013-09-10 11:02:30 -04:00
David Baumgold
45f38ddf81 Update requests library to 1.2.3 2013-09-10 09:59:21 -04:00
Frances Botsford
5c7443be38 cleanup copy on reqs, photo, and choose pages 2013-09-10 09:13:00 -04:00
Valera Rozuvan
ee02c06250 Add Learning Tools Interoperability (LTI) blade. 
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
 2013-09-10 12:30:42 +03:00
Valera Rozuvan
d02ef8bc12 Add Learning Tools Interoperability (LTI) blade. 
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
 2013-09-09 23:54:49 +03:00
Alexander Kryklia
719ec8f9d8 Revert "Merge pull request #804 from edx/valera/lti_module" 
This reverts commit 2894b21c32, reversing
changes made to 34d0fe1554.
 2013-09-09 22:51:57 +03:00
Alexander Kryklia
2894b21c32 Merge pull request #804 from edx/valera/lti_module 
LTI module with tests
 2013-09-09 12:38:01 -07:00
Alexander Kryklia
ecc37227f2 Fix 2013-09-09 19:32:44 +03:00
Alexander Kryklia
8377f490f0 Revert "Add custom LTI exception." 
This reverts commit ef4b7b9b1d.
 2013-09-09 19:30:44 +03:00
Alexander Kryklia
03de84ecfe Fix 2013-09-09 19:16:18 +03:00
Alexander Kryklia
ef4b7b9b1d Add custom LTI exception. 2013-09-09 19:16:18 +03:00
Valera Rozuvan
86dbb1fe3f Addressing comments on PR 804. 
Rewriting expect() calls to use Jasmine jQuery event spies. Making individual
it() tests independent.
 2013-09-09 19:16:18 +03:00
Alexander Kryklia
45da4115d1 Fix 2013-09-09 19:16:17 +03:00
Alexander Kryklia
5e3c6736ab Fixes. 2013-09-09 19:16:16 +03:00
Alexander Kryklia
6220da32c9 Improve code. 2013-09-09 19:16:16 +03:00
Alexander Kryklia
dd4fe82b00 Improve code. 2013-09-09 19:16:16 +03:00
Valera Rozuvan
6fc280d611 Updated Jasmine tests. 
Now the introductory text is of a more serious nature.
 2013-09-09 19:16:16 +03:00
Alexander Kryklia
56f01ce056 Improve code. 2013-09-09 19:16:16 +03:00