Will Daly
|
3d8625da9c
|
Refactored problem lettuce test implementation
|
2013-03-15 14:02:21 -04:00 |
|
Will Daly
|
5a2a4055f8
|
Added lettuce test for formula problem
|
2013-03-15 14:02:21 -04:00 |
|
Will Daly
|
4d5a8e757c
|
Added lettuce tests for numerical problem
|
2013-03-15 14:02:20 -04:00 |
|
Will Daly
|
b3946828c0
|
Added lettuce tests for string problems
|
2013-03-15 14:02:20 -04:00 |
|
Will Daly
|
e6466fdddc
|
Changed user creation so that it creates the user only if it doesn't
already exist
Updated login dialog handling to workaround multiple login dialogs
that sometimes appear on a page (where the first one is hidden)
|
2013-03-15 14:02:20 -04:00 |
|
Will Daly
|
56a6363d7a
|
CSS selectors in lettuce tests for problems now include the element tag.
|
2013-03-15 14:02:20 -04:00 |
|
Will Daly
|
90213d483c
|
Wrote lettuce tests for drop-down, multiple choice, and checkbox
problems.
|
2013-03-15 14:02:20 -04:00 |
|
Calen Pennington
|
6ed279ce38
|
Pin versions of testing tools
|
2013-03-15 12:40:27 -04:00 |
|
Calen Pennington
|
3b0aed5d42
|
Merge pull request #1572 from MITx/feature/alex/poll-merged
Feature/alex/poll merged
|
2013-03-15 09:04:42 -07:00 |
|
Calen Pennington
|
0f5a05c8a2
|
Merge pull request #1673 from MITx/jmpm-analytics
Addressing some pep8/pylint concerns
|
2013-03-15 09:04:15 -07:00 |
|
Calen Pennington
|
f1d4096bcd
|
Mark snippets as raw strings to avoid having to escape backslashes
|
2013-03-15 11:52:50 -04:00 |
|
Calen Pennington
|
10de617dea
|
Squelch a few more pylint exceptions
|
2013-03-15 11:28:46 -04:00 |
|
Calen Pennington
|
9f99c9004b
|
Fix up capa tests
|
2013-03-15 11:28:33 -04:00 |
|
Calen Pennington
|
6b64b4214f
|
Make relative imports explicitly relative
|
2013-03-15 11:23:22 -04:00 |
|
Calen Pennington
|
f1c66e9178
|
Make common/djangoapps not a python module either
|
2013-03-15 11:16:15 -04:00 |
|
David Ormsbee
|
67a0cccba9
|
Addressing some pep8/pylint concerns
|
2013-03-15 11:08:09 -04:00 |
|
Calen Pennington
|
fd3ba7db2a
|
Don't make cms.djangoapps a python module
|
2013-03-15 10:50:46 -04:00 |
|
Calen Pennington
|
fb8352e2cc
|
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
|
2013-03-15 10:33:54 -04:00 |
|
Calen Pennington
|
8531d56268
|
Merge pull request #1665 from MITx/jmpm-analytics
Enables basic analytics tab in instructor dashboard
|
2013-03-15 07:06:02 -07:00 |
|
Calen Pennington
|
029d8c8085
|
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
|
2013-03-15 09:46:47 -04:00 |
|
Calen Pennington
|
116ecf2a50
|
Disable sequence nav buttons when the sequence is empty
|
2013-03-15 08:39:24 -04:00 |
|
Calen Pennington
|
44e6572e12
|
Make StringyInteger and StringyFloat return None when they can't parse the string from json, and don't try to overwrite max_attempts if it's ''
|
2013-03-15 08:25:27 -04:00 |
|
Victor Shnayder
|
7eb4970f6b
|
Merge pull request #1671 from MITx/fix/will/save_button_regression
Fix/will/save button regression
|
2013-03-14 11:54:10 -07:00 |
|
Will Daly
|
ce5e86895a
|
Fixed pep8
|
2013-03-14 14:45:08 -04:00 |
|
Will Daly
|
5e433cda2e
|
Clarified comments about the logic of showing the save button
|
2013-03-14 14:43:04 -04:00 |
|
Will Daly
|
4dabb4ceb6
|
Save button no longer appears for non-randomized problems unlimited attempts
|
2013-03-14 14:34:36 -04:00 |
|
Chris Dodge
|
5070e5b209
|
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
|
2013-03-14 14:01:07 -04:00 |
|
Chris Dodge
|
d2f216615f
|
move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled
|
2013-03-14 13:57:48 -04:00 |
|
Valera Rozuvan
|
c54ad38fef
|
Better positioning of elements draggables with labels in slider.
|
2013-03-14 19:42:55 +02:00 |
|
brianhw
|
4b5837ffa6
|
Merge pull request #1668 from MITx/bugfix/dave/bad_route_in_rss
Removed reverse() call that was breaking in RSS feed.
|
2013-03-14 08:22:14 -07:00 |
|
David Ormsbee
|
e818efb098
|
Removed reverse() call that was breaking in RSS feed.
|
2013-03-14 11:19:07 -04:00 |
|
David Ormsbee
|
5576c549b3
|
Merge pull request #1667 from MITx/content/rocha/2.01x-announcement
Add 2.01x announcement to news feed
|
2013-03-14 07:31:22 -07:00 |
|
Carlos Andrés Rocha
|
80d809a86a
|
Add location note to jobs page
LMS Lighthouse [#190]
|
2013-03-14 06:52:28 -07:00 |
|
Carlos Andrés Rocha
|
b4d83a5f44
|
Add 2.01x announcement to news feed
LMS Lighthouse [#259]
|
2013-03-14 06:49:07 -07:00 |
|
Carlos Andrés Rocha
|
15d8727fce
|
Fix ids in feed.rss
|
2013-03-14 06:38:55 -07:00 |
|
David Ormsbee
|
753cc9ec2a
|
Merge pull request #1666 from MITx/feature/kevin/pinning
Feature/kevin/pinning
|
2013-03-13 18:05:24 -07:00 |
|
Kevin Chugh
|
8d766c4b51
|
fix conflict
|
2013-03-13 21:01:37 -04:00 |
|
Calen Pennington
|
3211221f98
|
Merge pull request #1664 from MITx/feature/cdodge/cache-metadata-inheritence-in-django-cache
use django caching to hold computed metadata inheritence. Also invalidat...
|
2013-03-13 17:13:02 -07:00 |
|
Your Name
|
7f877344d6
|
added comment to explain sorting
|
2013-03-13 19:47:19 -04:00 |
|
Your Name
|
896ee094c6
|
added comment to explain sorting
|
2013-03-13 19:44:41 -04:00 |
|
jkarni
|
55a9bba166
|
Merge pull request #1663 from MITx/jmclaus/genex-problem5-fix
Problem 5 grades correctly. Also added missing images for dialog box.
|
2013-03-13 16:29:03 -07:00 |
|
Your Name
|
97eb7eb58b
|
remove whitespace
|
2013-03-13 19:07:46 -04:00 |
|
Your Name
|
6ee14ec34a
|
candidate without inline
|
2013-03-13 18:51:40 -04:00 |
|
Your Name
|
fc907fe055
|
candidate without inline
|
2013-03-13 18:50:00 -04:00 |
|
Your Name
|
117be695cb
|
candidate without inline
|
2013-03-13 18:40:10 -04:00 |
|
David Ormsbee
|
c0efb0136e
|
Merge branch 'master' into jmpm-analytics
|
2013-03-13 16:55:54 -04:00 |
|
David Ormsbee
|
8d4e0f8386
|
Add ANALYTICS_API_KEY to config files and dashboard analytics call
|
2013-03-13 16:55:40 -04:00 |
|
Your Name
|
08bc073fa5
|
updates
|
2013-03-13 16:40:04 -04:00 |
|
Calen Pennington
|
131e3120b9
|
Try to make psychometrics work with new storage model code
|
2013-03-13 16:35:50 -04:00 |
|
Chris Dodge
|
c67f1677fd
|
remove imports of Mongo.py from modules. They shouldn't need them. Also, video captions shouldn't need special logic to compute the url rewrites as the main get_html() should do this.
|
2013-03-13 15:57:38 -04:00 |
|