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

17651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christina Roberts
0bea1855f7 Merge pull request #928 from edx/christina/courseid_length 
Change course id limit to 65.
 2013-09-12 06:04:11 -07:00
Valera Rozuvan
2286259b65 Merge pull request #943 from edx/valera/update_lti_tests 
Updating LTI Jasmine tests.
 2013-09-12 01:35:19 -07: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
cahrens
ff2d952d39 Change course id limit to 65. 
STUD-726
 2013-09-11 16:15:16 -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
David Baumgold
acd23ad933 reformat for readability 2013-09-11 13:26:17 -04:00
jkarni
df72f02898 Merge pull request #931 from edx/jkarni/fix/itemsavelogging 
Add logging to save item
 2013-09-11 09:33:19 -07: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
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
c5d7246342 Merge pull request #822 from edx/valera/fix_controls_stack_2_rows 
Adding styles to fix issue BLD-221.
 2013-09-11 00:33:13 -07: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
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
Greg Price
f20333ef4e Remove some cruft from forums SASS 2013-09-10 14:46:54 -04:00
David Baumgold
871ad7d694 Pass hostname to LTI XModule 
Necessary for RFC compliance with oauthlib
 2013-09-10 14:21:56 -04:00
Greg Price
6ecbba7230 Improve accessibility of forums navigation elements 
The home icon and discussion topic drop-down icon now have text that is
visible only to screen readers. The visual change between the icon and the
topic name with down-arrow is now achieved with the CSS visible property
instead of the opacity property, so only one at a time will be visible to
screen readers as well as visually.
 2013-09-10 14:21:17 -04:00
Jason Bau
7b9c6fbe5f remove spaces from usename suggestion 2013-09-10 10:42:19 -07:00
jkarni
64b1f2b7e9 Merge pull request #904 from edx/jkarni/fix/textbook-upload 
Fix element name conflict
 2013-09-10 10:23:23 -07: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
David Baumgold
543438816d Merge pull request #875 from edx/db/translate-hellip 
Translate …
 2013-09-10 06:58:47 -07:00
Alexander Kryklia
0958a2757a Merge pull request #898 from edx/alex/lti_module_squashed 
LTI module with tests
 2013-09-10 00:57:35 -07:00
Julian Arni
0acaaa8859 Fix element name conflict 2013-09-09 18:32:01 -04: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
0734d835a1 Merge pull request #895 from edx/alex/revert_unsquashed_pr 
Revert "Merge pull request #804 from edx/valera/lti_module"
 2013-09-09 12:56:38 -07: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
David Ormsbee
34d0fe1554 Merge pull request #890 from edx/ormsbee/verifyuser3 
User verification / validated certificates feature
 2013-09-09 11:30:09 -07:00
Diana Huang
d3454e58b5 Undo some of the hacks to make receipt rendering work. 2013-09-09 14:02:28 -04:00
David Ormsbee
ec3db3efde Make Certificate tests subclass ModuleStoreTestCase to fix missing course 2013-09-09 13:54:27 -04:00
David Ormsbee
af8475ad31 Make sure CourseFactory creates desired courses before shopping cart tests run. 2013-09-09 13:09:17 -04: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
cd72f05778 Fix test 2013-09-09 19:16:19 +03:00
Alexander Kryklia
03de84ecfe Fix 2013-09-09 19:16:18 +03:00
Alexander Kryklia
bd6fed83eb Fix. 2013-09-09 19:16:18 +03:00
Alexander Kryklia
ef4b7b9b1d Add custom LTI exception. 2013-09-09 19:16:18 +03:00