Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,427 Commits 1 Branch 0 Tags
d4536c657de3a3df94eaf2798adeb07bcbd96428
Commit Graph

12427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
d4536c657d Merge pull request #1852 from MITx/feature/diana/textline-trailing 
Pylint and Pep8 fixes for InputTypes
 2013-04-12 10:47:32 -07:00
Diana Huang
ff1189c5e8 Pylint and Pep8 fixes 2013-04-12 13:23:42 -04:00
Diana Huang
13aed41790 Merge pull request #1843 from MITx/feature/diana/textline-trailing 
Add the ability to add trailing text to textlines
 2013-04-12 08:50:38 -07:00
Diana Huang
06a54a8c38 Consolidate tests into one larger test 2013-04-12 10:59:03 -04:00
Diana Huang
ab7a616552 Add the ability to handle escaped HTML characters in trailing text 
Add tests for unicode and escaped HTML characters
 2013-04-12 10:59:03 -04:00
Diana Huang
d6e722a698 Remove unnecessary check and add better textline documentation 2013-04-12 10:59:03 -04:00
Diana Huang
fd35b2c7e3 Fix and create new test for trailing text 2013-04-12 10:59:03 -04:00
Diana Huang
c93b8076bf Add trailing text to textlines, most useful for units. 2013-04-12 10:59:03 -04:00
Calen Pennington
734b169ebd Merge pull request #1851 from MITx/fix/zoldak/test-login-pylint 
fix pylint errors in test_login.py
 2013-04-12 07:46:35 -07:00
Jay Zoldak
d8c186d3a1 fix pylint errors in test_login.py 2013-04-12 10:25:12 -04:00
Don Mitchell
e4c9e1bb9e Merge pull request #1850 from MITx/fix/cdodge/studio-forum-improvements 
Fix/cdodge/studio forum improvements
 2013-04-12 06:58:54 -07: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
Jay Zoldak
fc221a09b0 Merge pull request #1848 from MITx/fix/zoldak/test-login-pylint 
Fix pylint errors
 2013-04-12 06:33:56 -07:00
Chris Dodge
1a3c622bb6 actually the query parameter is '_id.revision' not just 'revision' 2013-04-11 22:32:35 -04:00
Chris Dodge
cf7d7bd2d9 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 2013-04-11 22:12:17 -04:00
Chris Dodge
8fd8574357 get_items has an query ambiguity with respect to revision=None. None has a special semantic in get_items as a wildcard, so if we query with 'None' then we'll get back both draft and non-draft items. 2013-04-11 22:10:30 -04:00
Jay Zoldak
1cc6a0a60d Fix pylint errors 2013-04-11 17:20:38 -04:00
Will Daly
7e35bf1912 Merge pull request #1846 from MITx/feature/zoldak/test-user-profile-factory 
Convert login tests to use factories
 2013-04-11 13:57:29 -07:00
Jay Zoldak
bb1134b8ee Convert login tests to use factories 2013-04-11 16:54:16 -04:00
Will Daly
dce0b53ca5 Merge pull request #1844 from MITx/feature/zoldak/cs-mock 
Create a mock comment service that will listen for HTTP requests on a port
 2013-04-11 11:26:08 -07:00
Jay Zoldak
88852c4b26 pep8 and pylint cleanup of new files 2013-04-11 14:11:30 -04:00
Jay Zoldak
442141fa04 Create a mock comment service that will listen for HTTP requests on a port 2013-04-11 14:08:32 -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
chrisndodge
4d9dd40268 Merge pull request #1842 from MITx/feature/christina/metadata 
Get the "Edit High Level Source" link back in for LaTeX problems. Broken with xblock work.
 2013-04-10 12:05:06 -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
0a2937311d remove commented out code. Also fix up indents and other violations 2013-04-10 12:34:18 -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
Christina Roberts
276b86a779 Merge pull request #1833 from MITx/feature/btalbot/studio-courselink 
Feature/btalbot/studio courselink
 2013-04-10 07:52:19 -07: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
5e3ca48c8d address some violations 2013-04-10 09:40:23 -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
Ned Batchelder
d2ed6e2c02 Merge pull request #1830 from MITx/fix/cale/violations 
Clean up violations from ichuang's PR
 2013-04-09 10:21:49 -07:00
Calen Pennington
5b8a410d12 Merge pull request #1829 from MITx/marketing/cale/delftx-header 
Marketing request: Lighthouse [#338, fixed]
 2013-04-09 10:14:19 -07:00
chrisndodge
2fce096e1c Merge pull request #1834 from MITx/bug/christina/base 
Need to be able to access smoothScrollTop.
 2013-04-09 06:52:55 -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
Sarina
74104d6081 Merge pull request #1831 from MITx/vik/fix/pg-and-progress 
Fix weighting and score generation
 2013-04-08 14:37:07 -07: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
Christina Roberts
7fd8a33b3c Merge pull request #1816 from MITx/feature/btalbot/studio-alerts 
Feature/btalbot/studio-alerts
 2013-04-08 14:19:12 -07: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
Vik Paruchuri
7d09617ec9 Fix weighting and score generation 2013-04-08 16:52:18 -04:00
Calen Pennington
45bb4d3754 Merge pull request #1828 from MITx/fix/cdodge/import-nesting-definition-data 
import was putting the xml data into definition.data.data rather than de...
 2013-04-08 13:50:36 -07: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