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

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
a91f1278cb Merge pull request #1733 from MITx/bug/christina/studio 
Don't assume input fields will be within a div.
 2013-03-25 08:12:47 -07: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
Diana Huang
cda0fa0aa5 Check for None specifically when setting a new seed. 2013-03-25 11:08:51 -04:00
Mark L. Chang
d7057ef56d Merge pull request #1732 from MITx/bug/christina/studio 
Upadate link to static documentation.
 2013-03-25 07:58:14 -07:00
Victor Shnayder
235cce1323 Merge pull request #1713 from MITx/jmclaus/edit-molecule-css-fix 
CSS from JSME doesn't affect surrounding content now
 2013-03-25 07:51:02 -07:00
cahrens
ecf395d692 Upadate link to static documentation. 2013-03-25 10:39:35 -04:00
Your Name
6d9e5ef6e5 Merge branch 'master' of github.com:MITx/mitx 2013-03-25 10:17:58 -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
264ca65640 Add some comments 2013-03-25 09:37:00 -04:00
Brian Talbot
a26a7c860b Merge pull request #1728 from MITx/bug/christina/cursor-move 
Don't save subsection and unit names until the change event.
 2013-03-25 06:15:04 -07:00
Christina Roberts
a2518ff697 Merge pull request #1730 from MITx/feature/zoldak/pylint-docstring 
Pylint to not require docstring for tests
 2013-03-25 06:10:28 -07:00
Jay Zoldak
2c4506b79f Pylint to not require docstring for tests 2013-03-22 17:13:58 -04: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
Calen Pennington
b9dca0618f Merge pull request #1726 from MITx/fix/cdodge/grading-perf-regression 
if we have to reload a module and already have the descriptor, we don't ...
 2013-03-22 13:46:03 -07:00
Don Mitchell
056b7d3427 More unit tests which found another timezone assumption :-) 2013-03-22 16:45:21 -04:00
David Ormsbee
5863ba5ac4 Merge pull request #1686 from MITx/feature/vaxxxa/docs-poll-conditional-xml 
Feature/vaxxxa/docs poll conditional xml
 2013-03-22 13:30:47 -07: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
Chris Dodge
fd973442b1 if we have to reload a module and already have the descriptor, we don't need to refect the descriptor (which results in another DB round-trip. We just need the student state. 2013-03-22 13:57:53 -04:00
Christina Roberts
1ea3a4e77b Merge pull request #1724 from MITx/bug/btalbot/studio-viewlivebutton 
studio - "view live version" of unit button label change
 2013-03-22 10:34:55 -07: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
Will Daly
23f77a1571 Merge pull request #1723 from MITx/fix/zoldak/pep8-test-responsetypes 
pep8 fixes on test_responsetypes.py
 2013-03-22 08:52:12 -07:00
Jay Zoldak
08c5ab3cc9 pep8 fixes 2013-03-22 11:38: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
brianhw
45029e7023 Merge pull request #1720 from MITx/ux/marco/textbook 
Ux/marco/textbook
 2013-03-22 08:16:06 -07: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
marco
f8eacff683 styled textbook css to look closer to the discussion forum navigation 2013-03-22 11:04:44 -04:00
Christina Roberts
14e0387b20 Merge pull request #1716 from MITx/bug/orphan 
Bug/orphan
 2013-03-22 07:33:52 -07:00
marco
9fdac385e1 Merge branch 'master' into ux/marco/textbook 2013-03-22 10:29:05 -04: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
John Jarvis
ae81009a43 Changing edx marketing site cookie value to 'true' 2013-03-21 17:56:56 -04:00
Carlos Andrés Rocha
4d266fa3ca Merge pull request #1718 from MITx/victor/fewer-phds-more-associates 
In sign up form, merge PhD-science and PhD-other, add Associate's degree
 2013-03-21 14:35:16 -07:00
Victor Shnayder
3f18e5c3d7 In sign up form, merge PhD-science and PhD-other, add Associate's degree 
Includes corresponding documentation changes.

Per request from Harvard: LH #276
 2013-03-21 17:23:46 -04:00
Arthur Barrett
7120998938 refactoring notes js 2013-03-21 17:18:45 -04:00
John Jarvis
57dd2e728c Adding a new cookie to determine logged in status for the edx mktg site 
When a user logs in this will drop a new cookie 'edxloggedin' that will
match the value and expire date of the django session cookie.
When a user logs out the cookie will be removed
 2013-03-21 17:17:35 -04:00
David Ormsbee
0de9e6a6a5 Merge pull request #1717 from MITx/fix/cdodge/drive-by-fix 
drive by fix to get proper error handling on error in change_enrollment
 2013-03-21 13:38:44 -07:00
Chris Dodge
63fc2eecaf drive by fix to get proper error handling 2013-03-21 16:32:58 -04:00
Brian Talbot
7051a94e7b resolved local master merge conflicts with studio sass 2013-03-21 16:15:19 -04:00