Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

9424 Commits

Author SHA1 Message Date
Brian Talbot
61de4c028a temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog) 2013-02-01 09:41:51 -05:00
e0d
969737c58e service variant code for loading different config 2013-01-31 21:43:35 -05:00
Deena Wang
7908d87902 more tests for views.py 2013-01-31 15:58:14 -05:00
Deena Wang
abc3e5b09d more tests in test_views.py 2013-01-31 14:47:59 -05:00
Don Mitchell
aad5015a82 Merge pull request #1398 from MITx/feature/christina/misc2 
Fixes date bug (#149).
 2013-01-31 10:59:07 -08:00
Don Mitchell
fbd9a126ba Merge pull request #1393 from MITx/fix/cdodge/export-static-tabs 
add exporting of course info
 2013-01-31 10:55:45 -08:00
Christina Roberts
5f170d118f Merge pull request #1395 from MITx/bug/dhm/mar13 
Remove format field as it's the one for grading type.
 2013-01-31 10:51:44 -08:00
Jay Zoldak
c590c24e25 Add vendor files to files.json for the cms jasmine tests to work. 2013-01-31 13:48:38 -05:00
cahrens
b613bdc336 Fixes date bug (#149). 2013-01-31 13:37:45 -05:00
Don Mitchell
f257f12124 Meant to add the file here 2013-01-31 12:56:18 -05:00
Don Mitchell
279747ab14 Fixed missing jasmine includes 2013-01-31 12:40:05 -05:00
Don Mitchell
6491363647 Remove format field as it's the one for grading type. 2013-01-31 12:11:11 -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
Chris Dodge
ab9d30cbc6 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-static-tabs 2013-01-31 10:51:24 -05:00
Chris Dodge
fc57e7afdb add testing for course info export. Plus DRY things out a bit 2013-01-31 10:51:20 -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
Calen Pennington
76b367e062 Merge pull request #1388 from MITx/bug/dhm/mar13 
Swallow event calls to squash 404 errors (and remove an unused var in
 2013-01-30 14:10:02 -08:00
Don Mitchell
756a071634 misspelled request (altho as an unused identifier) 2013-01-30 17:08:21 -05:00
Calen Pennington
c4f56620df Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic" 
This reverts commit ab437b9463, reversing
changes made to 7a8e87c789.
 2013-01-30 16:49:49 -05:00
Deena Wang
40ddaa9976 more tests on test_views.py 2013-01-30 16:03:16 -05:00
Don Mitchell
85faab1dc6 Swallow event calls to squash 404 errors (and remove an unused var in 
another function)
 2013-01-30 15:18:51 -05:00
Calen Pennington
ab437b9463 Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic 
Don't run collectstatic on course content
 2013-01-30 12:07:47 -08:00
Christina Roberts
54c1fe9c67 Merge pull request #1384 from MITx/fix/cdodge/export-static-tabs 
adding exporting of tabs and custom_tags. Also added unit tests
 2013-01-30 10:52:31 -08:00
Chris Dodge
c676046341 adding exporting of tabs and custom_tags. Also added unit tests 2013-01-30 13:25:17 -05:00
Deena Wang
cdbe9857d6 tests in cms.djangoapps.contentstore/tests/test_views.py 2013-01-30 12:30:48 -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
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
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
Calen Pennington
9ae83338c6 Whitespace cleanup 2013-01-30 09:12:50 -05:00
Calen Pennington
89f984c08b Prefix courseware urls with /static, since they are no longer served through collectstatic 2013-01-30 09:12:50 -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
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
Deena Wang
3858362157 more tests 2013-01-29 15:53:20 -05:00
Don Mitchell
574d6e8e28 Simple zIndex rather than fancy stack works best. 2013-01-29 15:00:49 -05:00
Deena Wang
4f58e9c177 Merge branch 'master' into feature/deena/testing to get factory files 2013-01-29 14:33:54 -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
Deena Wang
d9fdccb567 testing testing tests 2013-01-29 14:23:55 -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
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
Deena Wang
85c412fc2e changed cms/env/tests, added test_views.py 2013-01-29 11:06:32 -05:00
Deena Wang
74839663ff added cms/djangoapps/contentstore/test/tests.py 2013-01-29 10:12:39 -05:00
Chris Dodge
28a2dd9a18 support reordering of static tabs in studio 2013-01-28 16:33:28 -05:00
Victor Shnayder
6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts 
Conflicts:
	common/djangoapps/student/models.py
 2013-01-26 12:37:26 -05:00