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
cahrens
fa63bcce94 Allow clearing of dates (except for course start date). 
https://edx.lighthouseapp.com/projects/102637/tickets/231
 2013-03-25 17:25:49 -04:00
cahrens
ccd4db9ac3 Writing test. 2013-03-25 15:24:53 -04:00
Brian Talbot
66ba0f9b81 studio - resolving local merge with master 2013-03-25 15:21:25 -04:00
cahrens
c39ff353ea Don't assume input fields will be within a div. 
https://edx.lighthouseapp.com/projects/102637/tickets/232
 2013-03-25 11:09:33 -04:00
chrisndodge
71712ef05d Merge pull request #1729 from MITx/bug/dhm/date-parse 
Bug/dhm/date parse
 2013-03-25 07:15:04 -07:00
Don Mitchell
884019b14c Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse 
Conflicts:
	cms/djangoapps/models/settings/course_metadata.py
	cms/urls.py
 2013-03-22 16:56:31 -04:00
Don Mitchell
056b7d3427 More unit tests which found another timezone assumption :-) 2013-03-22 16:45:21 -04:00
Don Mitchell
862a7d13e9 pep8: line length 2013-03-22 16:17:37 -04:00
Don Mitchell
8370124e2b Make to and from json for dates use iso format esp for timezone. 2013-03-22 16:16:32 -04:00
cahrens
dfdc2cb7d8 Remove console.log. 2013-03-22 16:11:43 -04:00
cahrens
39714a17d9 Merge branch 'master' into bug/christina/cursor-move 
Conflicts:
	cms/static/js/base.js
 2013-03-22 16:03:52 -04:00
Don Mitchell
2dcfd1eba1 Merge pull request #1719 from MITx/feature/btalbot/studio-checklists 
Add course checklists to Studio
 2013-03-22 12:49:30 -07:00
cahrens
eebef1e647 Don't save subsection and unit names until the change event. Fixes bugs #18 and #228. 2013-03-22 15:32:13 -04:00
Christina Roberts
1069c2c40a Merge pull request #1722 from MITx/bug/btalbot/studio-pagetitles 
Synced up Studio View <titles> with UI headings
 2013-03-22 11:02:16 -07:00
cahrens
505a382421 Re-enable all the tests! 2013-03-22 14:00:20 -04:00
Brian Talbot
b4e6b792cf studio - changed the label of view published/live version of unit presented to a user while editing a draft of the same unit 2013-03-22 12:01:58 -04:00
Brian Talbot
420c8216aa demo change to resolve push error 2013-03-22 11:31:47 -04:00
Brian Talbot
22fd8432c3 demo change to resolve push error 2013-03-22 11:31:43 -04:00
Brian Talbot
f11e54ddc7 studio - syncing up page <title> values with UI titles/headings 2013-03-22 11:27:16 -04:00
Chris Dodge
dc983cb9a5 add checking for metadata that we can't support editing for in Studio. This is now an error and will have to be addressed by course authors 2013-03-22 11:15:14 -04:00
Christina Roberts
14e0387b20 Merge pull request #1716 from MITx/bug/orphan 
Bug/orphan
 2013-03-22 07:33:52 -07:00
cahrens
d631509afa Re-enable all the tests! 2013-03-22 10:28:36 -04:00
cahrens
a2a1478d92 Fix caching bug on back button. 2013-03-22 09:51:45 -04:00
cahrens
be4045cb86 Reduce pep8 warnings, move Checklistst to top of menu. 2013-03-21 22:17:46 -04:00
cahrens
8385db8518 Clean up comments. 2013-03-21 21:40:38 -04:00
cahrens
016fe196ae Add Python unit tests, don't convert URLs every time. 2013-03-21 21:21:24 -04:00
Brian Talbot
7051a94e7b resolved local master merge conflicts with studio sass 2013-03-21 16:15:19 -04:00
cahrens
6b3b7fe277 Some cleanup. 2013-03-21 15:19:45 -04:00
Jay Zoldak
25ceea175c Merge pull request #1710 from MITx/feature/will/speed_up_lettuce_tests 
Feature/will/speed up lettuce tests
 2013-03-21 12:17:07 -07:00
cahrens
0a063342cf Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists 2013-03-21 13:56:32 -04:00
cahrens
1ae9e9bde3 Tests for opening action links. 2013-03-21 13:56:11 -04:00
Don Mitchell
e7727fcc6e Pylint muting via docstrings and line wraps 2013-03-21 12:30:33 -04:00
cahrens
8ca6e324af Merge branch 'master' into feature/btalbot/studio-checklists 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/sass/base-style.scss
	cms/urls.py
 2013-03-21 12:23:13 -04:00
Christina Roberts
e8401cf2bb Merge pull request #1643 from MITx/fix/btalbot/studio-sasscleanup 
Studio Sass Cleanup
 2013-03-21 08:45:48 -07:00
Don Mitchell
11c9028f52 Merge pull request #1712 from MITx/fix/cdodge/get-import-to-work-with-conditionals 
import needs to enumerate through the fields for all content scopes. Als...
 2013-03-21 08:44:16 -07:00
cahrens
f44989e516 Use Brian's open external method. 2013-03-21 11:17:31 -04:00
Don Mitchell
bc8c0b6db2 Added unit test for what broke the system, but won't catch such a 
regression in future b/c the problem was persisting under one parser and
reading under another.
 2013-03-21 11:09:55 -04:00
chrisndodge
37a673012f Merge pull request #1701 from MITx/bug/orphan 
Fix bug 249 the ugly way (decerebrate the moronically impotent model)
 2013-03-21 07:21:16 -07:00
Brian Talbot
67c6852b5c studio - checklists: removing not needed sass variable for animating height 2013-03-21 10:01:39 -04:00
Don Mitchell
ae55cd7533 One more unit test for json not containing expected fields. 2013-03-21 09:40:57 -04:00
Chris Dodge
9cd38d115e import needs to enumerate through the fields for all content scopes. Also add unit test 2013-03-20 21:37:09 -04:00
Don Mitchell
9413364e55 Disambiguate the course_info url names. 2013-03-20 18:00:25 -04:00
Don Mitchell
3ea70eac9d Also clean up children after sort saved. 2013-03-20 17:59:24 -04:00
Don Mitchell
bd2dd9408d Unit tests and minor fixes to course_info_updates. Main fix was 
returning the content in same form as it was saved rather than parroting
it back.
 2013-03-20 17:49:03 -04:00
Brian Talbot
481aa063c4 Merge branch 'master' into feature/btalbot/studio-checklists 2013-03-20 17:10:07 -04:00
Brian Talbot
2876554cd7 Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-20 17:09:38 -04:00
Brian Talbot
3b80a90bd0 studio - sass cleanup: adding in more color variables, proofing box-sizing and older/rougher unit scss 2013-03-20 16:54:14 -04:00
cahrens
fd9c29f449 Merge branch 'master' into feature/btalbot/studio-checklists 2013-03-20 16:37:56 -04:00
cahrens
284cfcc941 Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists 2013-03-20 16:37:26 -04:00
cahrens
6d6e144c35 Urls working. 2013-03-20 16:37:08 -04:00