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

9574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
d52be03446 Add ACE Editor (contents of src-min-noconflict). 
last commit: 75ba742f4f00cefadfef1ae451cfb2a4280ad367

 package 01.27.2013
 2013-01-31 14:52:06 -05:00
cahrens
c956555da4 Note the codemirror version. 2013-01-31 14:50:21 -05:00
Brian Talbot
7d871ddfc9 studio - revised manual policy UI: added key tips on focus, moved error messages to bottom of pairings 2013-01-31 11:50:07 -05:00
Brian Talbot
0e17d16dbe studio - advanced settings - added in several more static states and firmed up key/value pair styling specifically 2013-01-30 20:02:45 -05:00
Brian Talbot
06439c7b9b studio - advanced settings - initial HTML stubbing 2013-01-30 19:27:47 -05:00
Christina Roberts
91b3a220b8 Merge pull request #1367 from MITx/fix/cdodge/static-tab-reordering 
support reordering of static tabs in studio
 2013-01-30 08:51:36 -08:00
Chris Dodge
7f32aae47d rename method to something that actually better reflects what it is doing. Also rename a variable to help with readability 2013-01-30 11:50:11 -05:00
Chris Dodge
e5115953ad rework redorder tabs so that we account for the fact that static tabs can be in any arbitrary order (with respect to non-static tabs) when working with an imported course 2013-01-30 11:36:28 -05:00
Christina Roberts
8720d1ac3a Merge pull request #1379 from MITx/bug/dhm/grading 
Catch save error and throw it in the user's face (bug 147).
 2013-01-30 08:34:32 -08:00
Don Mitchell
19927a83a5 Ensure settings and course info CRUD operations tell the user if there's 
a server error and pull the server error handler into a common function.
 2013-01-30 11:24:55 -05:00
chrisndodge
67775fbfa9 Merge pull request #1377 from MITx/feature/christina/misc 
Bug fixes for problem progress not updating.
 2013-01-30 08:24:38 -08:00
David Ormsbee
d0ea29358a Merge pull request #1381 from MITx/press/bostonX 
fix copy+paste bug.
 2013-01-30 07:48:22 -08:00
Victor Shnayder
99dd9636ce fix copy+paste bug. 2013-01-30 10:43:36 -05:00
Christina Roberts
fd4b3f9489 Merge pull request #1332 from MITx/fix/cdodge/unit-test-of-draft-store 
add unit test to test DraftModuleStore.get_items() fix
 2013-01-30 06:49:53 -08:00
Chris Dodge
dbf15fc2ac add comment on draft store test which explains test success is just for get_items() not to throw an exception when passed in a course_id 2013-01-30 09:46:38 -05:00
Chris Dodge
74fcf96611 don't hard code the ordering of the tabs in the test. Take the current ordering defintion (in the test data) and reverse it 2013-01-30 09:43:57 -05:00
Don Mitchell
ab4fd03dd8 Catch any and all save errors 2013-01-30 09:43:27 -05:00
cahrens
3c1c61fb19 Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating). 2013-01-30 09:23:07 -05:00
David Ormsbee
c487e026f3 Merge pull request #1380 from MITx/press/bostonX 
BostonX press release
 2013-01-29 14:35:17 -08:00
Victor Shnayder
19c46d224f BostonX press release 2013-01-29 17:33:06 -05:00
Don Mitchell
b8c1dba1cb Catch save error and throw it in the user's face (bug 147). May need to 
add catches in more places or put in $.ajaxSetup?
 2013-01-29 17:31:12 -05:00
David Ormsbee
40d59faa68 Merge pull request #1330 from MITx/diana/open-ended-ui-updates 
Rubric Integration and other UI improvements
 2013-01-29 14:10:18 -08:00
jarv
0b9262a478 Merge pull request #1378 from MITx/feature/jarv/certificate-restriction 
Minor update to embargo text
 2013-01-29 13:48:05 -08:00
John Jarvis
615e6da2f4 Minor update to embargo text 2013-01-29 16:47:09 -05:00
cahrens
26cb1c5a25 Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating). 2013-01-29 16:30:41 -05:00
Jay Zoldak
3669ea5c97 Merge pull request #1375 from MITx/diana/fix-requirejs-jasmine-xmodule 
Add missing requirejs for xmodule jasmine tests
 2013-01-29 13:26:36 -08:00
Calen Pennington
cb66ac7192 Merge pull request #1376 from MITx/fix/zoldak/cms-requirejs 
Add RequireJS.js to files.json so that the cms jasmine tests will run
 2013-01-29 13:26:02 -08:00
Jay Zoldak
c3eba0d2da Add RequireJS.js to files.json so that the cms jasmine tests will run without erroring when importing RequireJS. 2013-01-29 16:22:37 -05:00
jarv
877f757f94 Merge pull request #1369 from MITx/feature/jarv/certificate-restriction 
Feature/jarv/certificate restriction
 2013-01-29 13:14:41 -08:00
Diana Huang
cb77209d3c Add missing requirejs for xmodule jasmine tests 2013-01-29 16:09:27 -05:00
Christina Roberts
424cfd3cd7 Merge pull request #1372 from MITx/feature/dhm/drag 
Auto expand on hover of drag&drop unit
 2013-01-29 12:10:38 -08:00
Don Mitchell
574d6e8e28 Simple zIndex rather than fancy stack works best. 2013-01-29 15:00:49 -05:00
Don Mitchell
63d269acf1 draggable is not the collapsed item :-( but ui.helper seems to be. 2013-01-29 14:31:14 -05:00
Chris Dodge
855c8bb7e7 add unit test for tab reordering 2013-01-29 13:44:42 -05:00
Don Mitchell
87d8598abe subsection drag 2013-01-29 13:43:58 -05:00
John Jarvis
3f740976bc Adding dashboard text for certificate restriction 2013-01-29 13:24:17 -05:00
Don Mitchell
b3d7dc779d Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 2013-01-29 13:17:15 -05:00
Don Mitchell
5fcb6bfcd4 Remove debug code 2013-01-29 13:16:21 -05:00
Don Mitchell
ba95cf2385 Auto expand on hover of drag&drop unit 2013-01-29 13:10:23 -05:00
David Ormsbee
a98c924d47 Merge pull request #1371 from MITx/victor/cohorts-tweaks 
make links look like links
 2013-01-29 08:35:07 -08:00
Victor Shnayder
39a9c47512 make links look like links 2013-01-29 11:33:26 -05:00
John Jarvis
a9ee71fffc Adding section on eligibility 2013-01-29 11:26:55 -05:00
David Ormsbee
0a1f5bc154 Merge pull request #1368 from MITx/feature/brian/pearson-status 
add pearson_dump command.
 2013-01-29 08:19:41 -08:00
Brian Wilson
15a11e9cb7 add validation of accommodation codes 2013-01-29 11:16:23 -05:00
Chris Dodge
5a389551b0 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/static-tab-reordering 2013-01-29 11:14:55 -05:00
John Jarvis
3a6d45e716 Grade a student even if they are on the restricted list 2013-01-29 11:13:30 -05:00
Victor Shnayder
37b82a66eb Merge pull request #1363 from MITx/marketing/victor 
Marketing/victor
 2013-01-29 08:12:33 -08:00
Brian Wilson
69ff879e95 add more validation for countries 2013-01-29 10:41:41 -05:00
Don Mitchell
17930e4186 Merge pull request #1370 from MITx/feature/cdodge/add-course-about-video-to-xlint 
imports should have a marketing video. Treat it as a warning as every co...
 2013-01-29 07:37:14 -08:00
John Jarvis
0f39e04697 Adding certificate restriction lookup 
If certificate status is 'restricted' the grade
and survey link will be shown, the download link will not
 2013-01-29 10:27:53 -05:00