Sarina Canelake
484bc91ab3
Don't assign variable to .update() call
2013-09-12 16:03:22 -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
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
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
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
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
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
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
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
cahrens
1184a97b0b
Do not store expanded action URLs.
...
They are not portable. STUD-681.
Minor updates.
2013-09-12 09:47:30 -04: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