Commit Graph

2444 Commits

Author SHA1 Message Date
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
Brian Talbot
b51e57eddf studio - refining style and presentation of course link and invitation button on details settings 2013-04-08 17:31:14 -04:00
Brian Talbot
606469cd46 studio - fixing a visual margin issue with the sign up/in views header/content areas 2013-04-08 17:14:41 -04:00
Brian Talbot
7882845786 studio - alerts: correcting page title 2013-04-08 17:09:43 -04:00
Brian Talbot
27871ac9c9 studio - alerts: hiding alerts (in possbily inaccessible ways) in css for page load's sake 2013-04-08 16:55:06 -04:00
Brian Talbot
3f2e21f9dc Merge branch 'master' into feature/btalbot/studio-alerts 2013-04-08 16:29:18 -04:00
Brian Talbot
3f22826e26 studio - alerts: adding some ARIA-centric accessibility information to example prompts/notifications and advanced settings save notification 2013-04-08 16:28:31 -04:00
Brian Talbot
4e331a2c6a studio - restyling course basic details and adding in a course's URL more prominently WIP 2013-04-08 15:39:01 -04:00
Chris Dodge
d7b148d0d9 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
Conflicts:
	common/lib/xmodule/xmodule/modulestore/draft.py
2013-04-08 15:02:47 -04:00
Mark L. Chang
1500586f70 Merge pull request #1827 from MITx/fix/btalbot/studio-socktypo
studio - corrected a typo and adjusted copy on the help sock
2013-04-08 11:23:16 -07:00
Brian Talbot
e3a1279c8f studio - corrected a typo and adjusted copy on the help sock 2013-04-08 14:10:38 -04:00
Mark L. Chang
caa2539893 Merge pull request #1826 from MITx/fix/cdodge/dont-blowup-index-if-no-course-is-None
mark stumble on case where he had a None course
2013-04-08 11:10:15 -07:00
Brian Talbot
aaf95ddbba studio - course link: roughed in new markup/location of course link to share 2013-04-08 14:09:18 -04:00
Chris Dodge
472e657692 mark stumble on case where he had a None course 2013-04-08 14:07:37 -04:00
Chris Dodge
5137119f2b add a simple Studio walkthough to check page loads 2013-04-08 13:55:38 -04:00
Brian Talbot
bcf4775610 studio - alerts: removed banners as a design pattern (not using them) and corrected advanced setting links and smoothscrolling 2013-04-08 13:47:01 -04:00
Brian Talbot
4d0d3d3ad4 studio - alerts: refactored some alert and notification show/hide js added back to base.js 2013-04-08 11:35:27 -04:00
Brian Talbot
28334064ab studio - alerts: reducing the animation time for notification slide downs 2013-04-08 11:30:49 -04:00
Brian Talbot
4f71f53826 studio - alerts: adding back in manual close behavior to base.js (needed across app) 2013-04-08 11:18:10 -04:00
cahrens
cea0f9252c Make sure we don't mark the message bar as hiding if it is not shown. 2013-04-08 11:02:06 -04:00
cahrens
7f1c89b492 Merge branch 'master' into feature/btalbot/studio-alerts 2013-04-08 10:28:52 -04:00