Calen Pennington
8c54d5d610
Fix accidental force push that reset master
...
Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd410
2013-04-26 10:50:53 -04:00
Calen Pennington
9d94adbd1f
Merge pull request #1871 from MITx/feature/cale/fast-dev-server
...
Speed up local development
2013-04-24 12:12:05 -07:00
cahrens
cc2d06975e
Remove duplicated StringyX definitions.
2013-04-24 14:59:32 -04:00
Steve Strassmann
dd71ae818a
ModuleStoreTestCase moved to new location
2013-04-24 11:33:47 -04:00
Steve Strassmann
111ec62bb6
merged from master
2013-04-24 10:42:35 -04:00
Steve Strassmann
8baddc0645
Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n
2013-04-24 10:41:09 -04:00
Steve Strassmann
6f10348836
addressed comments from pull request
2013-04-23 10:07:51 -04:00
Christina Roberts
a1360a2710
Merge pull request #1879 from MITx/fix/cdodge/import-can-create-draft-sequences
...
when updating the list of children of sequentials, we must use the 'dire...
2013-04-22 12:17:30 -07:00
Chris Dodge
506a9a20aa
when updating the list of children of sequentials, we must use the 'direct' store otherwise we end up with draft revisions of sequentials, which is bad
2013-04-22 10:13:33 -04:00
Brian Talbot
ba4c0b6d53
studio - removing formatting suggestion from label
2013-04-22 09:43:57 -04:00
Brian Talbot
bcdf93fbc3
studio - fixing placeholder and label values for grace period on course grading settings
2013-04-22 09:42:47 -04:00
Calen Pennington
729daf5cbf
Move xmodule asset gathering out of server startup
...
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
2013-04-18 15:19:19 -04:00
Jay Zoldak
29ce700de6
Tag CMS lettuce tests with @skip-phantom if they aren't working under phantomjs right now.
2013-04-18 10:23:03 -04:00
Jay Zoldak
8a852f90cb
Fix or skip lettuce tests to run under phantomjs and firefox
2013-04-18 10:18:35 -04:00
Jay Zoldak
8a2d08bbd6
Refactor choosing the browser for lettuce tests to settings.py
2013-04-18 10:18:35 -04:00
Calen Pennington
346aee8863
Make django-pipeline only work with raw js and css
2013-04-18 07:18:36 -04:00
Christina Roberts
a3233b67e5
Merge pull request #1869 from MITx/fix/btalbot/studio-courseemail
...
Fix/btalbot/studio courseemail
2013-04-17 11:26:40 -07:00
Mark L. Chang
0f26be2f4d
quick fix to email copy
2013-04-17 14:12:16 -04:00
Mark L. Chang
44bf60d208
copy changes, link text change
2013-04-17 14:03:29 -04:00
Brian Talbot
423fa47811
studio - reverting back to https references in the course mailto link and url display
2013-04-17 13:47:54 -04:00
Brian Talbot
b115ad46bf
studio - changed https to http in course mailto link and added that prefix to link displayed
2013-04-17 13:44:23 -04:00
Brian Talbot
33ba38b8dd
studio - prefixed course URL with https: for individual share course mailto link on settings
2013-04-17 13:38:14 -04:00
Steve Strassmann
2f84b23047
disable i18n unit test - it wont run without creating dummy strings first
2013-04-17 13:20:20 -04:00
Brian Talbot
c4e4f73373
studio - adding in course name value in the share course mailto link
2013-04-17 13:19:42 -04:00
Calen Pennington
d4df9eebac
Merge pull request #1866 from MITx/feature/cale/enable-rednose
...
Enable test colors in nosetests
2013-04-17 10:15:25 -07:00
Steve Strassmann
e76419093d
uncommit unneeded files
2013-04-17 12:25:23 -04:00
Steve Strassmann
6e34c668bb
introduce i18n
2013-04-17 11:30:29 -04:00
Calen Pennington
3cd414afbb
Merge pull request #1825 from MITx/fix/cale/gradebook
...
Fix/cale/gradebook
2013-04-17 07:37:02 -07:00
Calen Pennington
f252c62f31
Enable test colors in nosetests
...
Use setup.cfg to set up default settings when running nose tests. Enable
the rednose library to color test output.
2013-04-17 09:58:52 -04:00
cahrens
8c336ef998
Don't try to export orphaned draft items.
...
#278
2013-04-16 17:05:11 -04:00
Calen Pennington
bf6b886ccd
Fix pylint and pep8 errors
2013-04-16 11:45:21 -04:00
Calen Pennington
d7796f4d47
Put test database into test_root
2013-04-16 11:40:04 -04:00
Calen Pennington
6644b78819
Fix gradebook when using grade cutoffs other than A/B/C
2013-04-16 11:38:58 -04:00
Jay Zoldak
3ff63f78b0
Disable nps survey in test environment
2013-04-16 10:37:43 -04:00
Chris Dodge
00674ee66b
need timedelta import
2013-04-13 21:21:15 -04:00
Chris Dodge
b4fe23f3a2
more cleanups in CMS project
2013-04-13 21:13:34 -04:00
Chris Dodge
3ca2bf4627
move lines together
2013-04-12 15:51:47 -04:00
Chris Dodge
6d6b3a59fe
violation fixes
2013-04-12 15:27:36 -04:00
Chris Dodge
4345c8e09c
add unit test to assert that get_items() is not using revision=None as a wildcard
2013-04-12 09:48:11 -04:00
Christina Roberts
c455710cca
Merge pull request #1815 from MITx/fix/cdodge/studio-forum-improvements
...
Fix/cdodge/studio forum improvements
2013-04-11 10:37:49 -07:00
Chris Dodge
e0bc823365
remove auto-provisioning because of a dependency problem between cms and lms
2013-04-11 10:42:03 -04:00
Don Mitchell
f6434ed4fb
Merge pull request #1840 from MITx/fix/cdodge/export-draft-modules
...
Fix/cdodge/export draft modules
2013-04-10 13:12:09 -07:00
cahrens
40adfa950d
Get the "Edit High Level Source" link back in. Broken with xblock work.
...
https://edx.lighthouseapp.com/projects/102637-studio/tickets/273
2013-04-10 14:53:26 -04:00
Chris Dodge
d9fa723eb2
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
...
Conflicts:
common/lib/xmodule/xmodule/modulestore/xml_importer.py
2013-04-10 12:02:16 -04:00
Brian Talbot
97e893b2ed
Merge branch 'master' into feature/btalbot/studio-courselink
2013-04-10 10:48:33 -04:00
Brian Talbot
01b2fefdd0
studio - revised course URL link label to match wording used elsewhere in the view/app
2013-04-10 10:48:12 -04:00
Chris Dodge
07b9d6353e
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
2013-04-10 09:26:51 -04:00
Christina Roberts
81f94fc4e2
Merge pull request #1832 from MITx/fix/btalbot/studio-contentmargin
...
studio - fixing a visual margin issue with the sign up/in views
2013-04-09 12:51:09 -07:00
cahrens
f36494e5dd
Need to be able to access smoothScrollTop. This is a temporary change-- I'll come up with a proposal to namespace our helper functions in a nicer way.
2013-04-09 09:41:52 -04:00
Brian Talbot
12784e3fb8
studio - course link final styling
2013-04-08 17:35:16 -04:00
