Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

2444 Commits

Author SHA1 Message Date
Jay Zoldak
e337292b5f Fix existing advanced settings lettuce tests. 2013-02-21 18:20:42 -05:00
Victor Shnayder
8d76556729 Merge pull request #1531 from MITx/fix/cdodge/serializing-ints-as-empty-strings 
Fix/cdodge/serializing ints as empty strings
 2013-02-21 12:12:44 -08:00
Jay Zoldak
c10dc838b2 Fix tip on JSON key value pairs 2013-02-21 15:01:12 -05:00
Brian Talbot
22639adc63 studio - alerts WIP 2013-02-21 14:31:24 -05:00
Don Mitchell
e5efcf65d3 remove console.log 2013-02-21 13:34:11 -05:00
Don Mitchell
851a99cb13 remove commented out code 2013-02-21 13:32:29 -05:00
Don Mitchell
697bd5c97b also this one 2013-02-21 13:28:43 -05:00
Don Mitchell
116c74c075 Highlighting of field labels and smarter decision as to when to show the 
save cancel bar.
 2013-02-21 13:27:36 -05:00
Jay Zoldak
9eb2766943 Change test modulestore naming differentiation scheme to uuid 2013-02-21 13:07:14 -05:00
Chris Dodge
bc1ee3dbfa Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings 2013-02-21 12:56:20 -05:00
Chris Dodge
041d28f0e9 use better variable names to assert that the expected item was indeed loaded 2013-02-21 12:56:17 -05:00
Chris Dodge
fa3402a977 template name got changed. Need to reflect that on test. 2013-02-21 12:25:10 -05:00
Chris Dodge
bb75a23101 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings 2013-02-21 11:58:52 -05:00
David Ormsbee
3494d58450 Merge pull request #1532 from MITx/feature/ned/clean_up_tests 
Make sure temp directories are properly cleaned up so running tests does...
 2013-02-21 08:52:09 -08:00
Ned Batchelder
c3b571bf9b Make sure temp directories are properly cleaned up so running tests doesn't leave them behind. 2013-02-21 11:38:45 -05:00
Don Mitchell
ba7959fc4d Merge pull request #1511 from MITx/feature/cdodge/metadata-inheritence-crawling 
Feature/cdodge/metadata inheritence crawling
 2013-02-21 08:29:54 -08:00
Chris Dodge
a7f6545cbc add unit test 2013-02-21 11:22:20 -05:00
cahrens
cc63f9c2db Unique IDs, other cleanup. 2013-02-20 17:11:34 -05:00
Brian Talbot
8b5f088eb9 studio - fixed alignment of new section field and controls 2013-02-20 16:43:13 -05:00
Brian Talbot
4b850f4da9 studio - notifications: made icon/copy area more bulletproof for longer lines of text 2013-02-20 16:24:50 -05:00
Chris Dodge
bd188f92ef put back the inheritable_metadata list into the XModuleDescriptor class. Also extend the metadata_inheritance test case 2013-02-20 16:20:39 -05:00
cahrens
c572ba862a Delete unused method. 2013-02-20 15:47:07 -05:00
cahrens
d9fb067355 Test point for formatting of JSON entry. 2013-02-20 15:34:53 -05:00
cahrens
dd959d1123 Longer warning got merged out. 2013-02-20 15:01:41 -05:00
Brian Talbot
7b60ec380a Merge branch 'master' into feature/cas/manual-policy-merged 2013-02-20 14:58:50 -05:00
Brian Talbot
e157fd26c8 studio - manual policy editor: policy item spacing and overflow hidden on CodeMirror value fields 2013-02-20 14:58:19 -05:00
Brian Talbot
ef3492aa40 studio - resolving local merge 2013-02-20 14:48:21 -05:00
Brian Talbot
c7f5b74225 studio - manual policy editor: converting to new page layout and styling 2013-02-20 14:46:54 -05:00
Jay Zoldak
1ccf0d48a8 Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into feature/cas/manual-policy-merged 2013-02-20 14:30:49 -05:00
Jay Zoldak
05f32f4bc9 Update tests for the advanced policy settings feature. 
Includes adding a method for css_click_at.
 2013-02-20 14:30:39 -05:00
Brian Talbot
ad770a5ec8 studio - manual policy editor: converting to new page layout - WIP 2013-02-20 14:24:13 -05:00
Brian Talbot
453e249f16 studio - manual policy editor: converting to new page layout - WIP 2013-02-20 13:54:19 -05:00
cahrens
8acbeec3ad Comment out validation, update warning message. 2013-02-20 12:23:19 -05:00
cahrens
cbc0406df2 Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into feature/cas/manual-policy-merged 2013-02-20 10:57:35 -05:00
cahrens
305f0b2a54 Add number of spaces for formatting of JSON. 2013-02-20 10:56:49 -05:00
Jay Zoldak
2bde448fbb Change coverage report config to reflect refactoring of terrain files 2013-02-20 09:53:12 -05:00
Jay Zoldak
67c2bac68f Pep8fix lettuce test code 2013-02-20 09:53:02 -05:00
Christina Roberts
52caae2fee Merge pull request #1515 from MITx/feature/btalbot/studio-pagechrome 
Adding in Studio Page headers and actions + help text
 2013-02-20 06:44:16 -08:00
Jay Zoldak
30edc380e1 Change coverage report config to reflect refactoring of terrain files 2013-02-20 09:31:50 -05:00
Brian Talbot
266e8951a4 made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750 2013-02-19 17:18:09 -05:00
cahrens
6981ba4e3f Get Save and Cancel working. 2013-02-19 17:08:10 -05:00
Jay Zoldak
db6fa9a3aa Pep8fix lettuce test code 2013-02-19 16:46:32 -05:00
cahrens
d5903c0e60 Make HTML better formatted. 2013-02-19 15:14:05 -05:00
cahrens
167d07037d Merged, delete Ace. 2013-02-19 14:56:37 -05:00
Jay Zoldak
8c423da6db Updated test to reflect new class name for course titles. 2013-02-19 13:50:40 -05:00
Jay Zoldak
301d58d648 Update lettuce test with new button name for add new section. 2013-02-19 13:31:11 -05:00
cahrens
f91060d197 Merge branch 'master' into feature/cas/manual-policy 
Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py
 2013-02-19 13:27:35 -05:00
Brian Talbot
585dff521a Merge branch 'master' into feature/btalbot/studio-pagechrome 2013-02-19 12:27:49 -05:00
Brian Talbot
fca98c19a5 studio - adding in info icon to page intro help and making icon classes consistent in all new references 2013-02-19 12:13:08 -05:00
cahrens
596de8ab2c Hook up "View Live" buttons and get "New Static Tab" working again. 2013-02-19 11:34:41 -05:00