Jay Zoldak
2b14960519
Merge pull request #1689 from MITx/fix/cale/pylint-cleanup
...
Small pylint cleanup
2013-03-18 10:14:49 -07:00
Calen Pennington
3fbde821dd
Skip over fields that are scoped to students when looping through the CourseModule fields in the instructor dashboard
2013-03-18 13:09:10 -04:00
Chris Dodge
651465f1ad
add HTML templates for 404/500 errors
2013-03-18 12:56:17 -04:00
Calen Pennington
a4f10bfdaf
Small pylint cleanup
2013-03-18 12:45:46 -04:00
Vasyl Nakvasiuk
be27dfd500
poll_module.rst done
2013-03-18 16:30:29 +02:00
Vasyl Nakvasiuk
63ecc64d82
conditional_module.rst done
2013-03-18 16:13:44 +02:00
Brian Talbot
8580e9825e
Merge branch 'master' into fix/btalbot/studio-sasscleanup
2013-03-18 09:57:53 -04:00
Vasyl Nakvasiuk
911c384527
remove old xml docs, add rake buildpubdocs, showpubdocs, pubdoc
2013-03-18 15:53:07 +02:00
Chris Dodge
2b677544a5
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio
2013-03-18 09:39:47 -04:00
Vasyl Nakvasiuk
f172405c9a
remove xml documentation from docs/source/
2013-03-18 15:37:29 +02:00
chrisndodge
27be7e159a
Merge pull request #1685 from MITx/feature/cale/string_days_early
...
Handle days_early_for_beta possibly being a string
2013-03-16 17:48:43 -07:00
Calen Pennington
9dda977ece
Handle days_early_for_beta possibly being a string
2013-03-16 20:38:32 -04:00
Carlos Andrés Rocha
1b619ac1c6
Merge pull request #1684 from MITx/content/rocha/xblock-announcement-2
...
XBlock SDK announcement
2013-03-16 14:47:50 -07:00
Carlos Andrés Rocha
a4451bdcd2
XBlock SDK announcement
...
LMS Lighthouse [#261 ]
2013-03-16 14:26:14 -07:00
Brian Talbot
a1ba97376a
studio - sass cleanup: further revisions and box-sizing all elements for consistency
2013-03-16 12:18:35 -04:00
David Ormsbee
8be15d8625
Merge pull request #1683 from MITx/feature/kevin/pinning_patch
...
Feature/kevin/pinning patch
2013-03-15 22:22:28 -07:00
Victor Shnayder
d91008b73a
Prevent random.Random() from running at import time.
2013-03-15 19:40:47 -07:00
brianhw
b5cf9b326e
Merge pull request #1679 from MITx/content/rocha/xblocks-announcement
...
Content/rocha/xblocks announcement
2013-03-15 14:27:01 -07:00
Vik Paruchuri
e4efda9a47
Reformat code
2013-03-15 16:21:36 -04:00
Will Daly
5fd1e7426d
Lettuce tests now import one_time_startup.py to ensure
...
that mongo caches are initialized for the test database.
This avoids a warning from the mongo modulestore.
2013-03-15 16:17:45 -04:00
Vik Paruchuri
cd3e88fdd5
Fix version tuples to be a dictionary
2013-03-15 16:05:38 -04:00
Vik Paruchuri
500c4ab86e
Convert versions to tuples
2013-03-15 15:40:04 -04:00
Brian Talbot
06b118ae33
studio - sass cleanup: resolved static pages display issue after local merge master
2013-03-15 15:23:03 -04:00
Vik Paruchuri
01b1974f50
Address review comment
2013-03-15 15:15:23 -04:00
Will Daly
3a13cd7b34
Merged changes in factories.py with version in master
2013-03-15 15:09:39 -04:00
Vik Paruchuri
b609ab0e6a
Convert to using versioninteger class
2013-03-15 15:05:47 -04:00
Vik Paruchuri
405ea8d675
Remove copy.copy
2013-03-15 14:57:48 -04:00
Vik Paruchuri
97839d9de5
Fix default version string integer issues
2013-03-15 14:52:55 -04:00
Victor Shnayder
64e1eb9903
Fix randomness bug in cohort placement
...
capa re-seeds the global RNG all the time, resulting in non-random
cohort placement. Switch to using a local random module.
(Thanks Cale for helping me figure this out!)
2013-03-15 11:35:27 -07:00
Vik Paruchuri
c34666af80
Fix version handling
2013-03-15 14:20:55 -04:00
Will Daly
e41bb8462c
Added lettuce tests for script (customresponse) problems.
...
Increased wait time for login screen to reduce false positives.
2013-03-15 14:04:22 -04:00
Will Daly
8423816076
LMS contentstore lettuce tests now dynamically create courses in mongo
...
using terrain.factories.py and capa.tests.response_xml_factory
2013-03-15 14:04:22 -04:00
Will Daly
a20a3a02bb
Refactored lettuce problem test assertion that a problem is
...
correct/incorrect/unanswered
2013-03-15 14:02:21 -04:00
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
Carlos Andrés Rocha
93a59f244d
XBlock SDK announcement
...
LMS Lighthouse [#261 ]
2013-03-15 10:43:56 -07:00
Your Name
53257a3c47
i need more sleep:
2013-03-15 12:47:28 -04:00
Your Name
68cb63daa8
accidentally deleted models file
2013-03-15 12:42:59 -04:00
Brian Talbot
84a5475d5a
studio - sass cleanup: resolving conflicts with local master merge
2013-03-15 12:42:33 -04:00
Calen Pennington
6ed279ce38
Pin versions of testing tools
2013-03-15 12:40:27 -04:00
Your Name
a761e2e829
make pinning backward compatible
2013-03-15 12:38:28 -04:00
Carlos Andrés Rocha
7697a43cf4
Fix typo in signup forms
...
LMS Lighthouse [#263 ]
2013-03-15 09:38:06 -07: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
