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

15584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
5a2a4055f8 Added lettuce test for formula problem 2013-03-15 14:02:21 -04:00
Will Daly
4d5a8e757c Added lettuce tests for numerical problem 2013-03-15 14:02:20 -04:00
Will Daly
b3946828c0 Added lettuce tests for string problems 2013-03-15 14:02:20 -04:00
Will Daly
e6466fdddc Changed user creation so that it creates the user only if it doesn't 
already exist

Updated login dialog handling to workaround multiple login dialogs
that sometimes appear on a page (where the first one is hidden)
 2013-03-15 14:02:20 -04:00
Will Daly
56a6363d7a CSS selectors in lettuce tests for problems now include the element tag. 2013-03-15 14:02:20 -04:00
Will Daly
90213d483c Wrote lettuce tests for drop-down, multiple choice, and checkbox 
problems.
 2013-03-15 14:02:20 -04:00
Carlos Andrés Rocha
93a59f244d XBlock SDK announcement 
LMS Lighthouse [#261]
 2013-03-15 10:43:56 -07:00
Your Name
53257a3c47 i need more sleep: 2013-03-15 12:47:28 -04:00
Your Name
68cb63daa8 accidentally deleted models file 2013-03-15 12:42:59 -04:00
Brian Talbot
84a5475d5a studio - sass cleanup: resolving conflicts with local master merge 2013-03-15 12:42:33 -04:00
Arthur Barrett
20767d5cc7 create notes djangoapp for annotator.js 2013-03-15 12:41:52 -04:00
Calen Pennington
6ed279ce38 Pin versions of testing tools 2013-03-15 12:40:27 -04:00
Your Name
a761e2e829 make pinning backward compatible 2013-03-15 12:38:28 -04:00
Carlos Andrés Rocha
7697a43cf4 Fix typo in signup forms 
LMS Lighthouse [#263]
 2013-03-15 09:38:06 -07:00
Calen Pennington
3b0aed5d42 Merge pull request #1572 from MITx/feature/alex/poll-merged 
Feature/alex/poll merged
 2013-03-15 09:04:42 -07:00
Calen Pennington
0f5a05c8a2 Merge pull request #1673 from MITx/jmpm-analytics 
Addressing some pep8/pylint concerns
 2013-03-15 09:04:15 -07:00
Calen Pennington
f1d4096bcd Mark snippets as raw strings to avoid having to escape backslashes 2013-03-15 11:52:50 -04:00
Your Name
0a53ec3ee6 updates 2013-03-15 11:37:58 -04:00
Calen Pennington
10de617dea Squelch a few more pylint exceptions 2013-03-15 11:28:46 -04:00
Calen Pennington
9f99c9004b Fix up capa tests 2013-03-15 11:28:33 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
f1c66e9178 Make common/djangoapps not a python module either 2013-03-15 11:16:15 -04:00
David Ormsbee
67a0cccba9 Addressing some pep8/pylint concerns 2013-03-15 11:08:09 -04:00
Your Name
470e402723 patch for backward compatibility 2013-03-15 10:51:34 -04:00
Calen Pennington
fd3ba7db2a Don't make cms.djangoapps a python module 2013-03-15 10:50:46 -04:00
Calen Pennington
fb8352e2cc Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 2013-03-15 10:33:54 -04:00
Calen Pennington
8531d56268 Merge pull request #1665 from MITx/jmpm-analytics 
Enables basic analytics tab in instructor dashboard
 2013-03-15 07:06:02 -07:00
Calen Pennington
029d8c8085 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
 2013-03-15 09:46:47 -04:00
Calen Pennington
116ecf2a50 Disable sequence nav buttons when the sequence is empty 2013-03-15 08:39:24 -04:00
Calen Pennington
44e6572e12 Make StringyInteger and StringyFloat return None when they can't parse the string from json, and don't try to overwrite max_attempts if it's '' 2013-03-15 08:25:27 -04:00
Brian Talbot
1aa8786b53 studio - checklists: added in smoothscrolling to in-page links across Studio but used only on checklists currently 2013-03-14 19:07:03 -04:00
Brian Talbot
97b44446a0 studio - checklists: added animation to collapse/expand toggle 2013-03-14 16:30:48 -04:00
Brian Talbot
13c38fa173 studio - checklists: revised input/label HTML and adjusted styling for each 2013-03-14 16:17:47 -04:00
Victor Shnayder
7eb4970f6b Merge pull request #1671 from MITx/fix/will/save_button_regression 
Fix/will/save button regression
 2013-03-14 11:54:10 -07:00
Will Daly
ce5e86895a Fixed pep8 2013-03-14 14:45:08 -04:00
Will Daly
5e433cda2e Clarified comments about the logic of showing the save button 2013-03-14 14:43:04 -04:00
Will Daly
4dabb4ceb6 Save button no longer appears for non-randomized problems unlimited attempts 2013-03-14 14:34:36 -04:00
Chris Dodge
5070e5b209 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-03-14 14:01:07 -04:00
Chris Dodge
d2f216615f move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled 2013-03-14 13:57:48 -04:00
cahrens
ac25b02ce6 Minor updates. 2013-03-14 13:48:17 -04:00
cahrens
9a7b0fb563 Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists 
Conflicts:
	cms/templates/checklists.html
 2013-03-14 13:47:55 -04:00
Valera Rozuvan
c54ad38fef Better positioning of elements draggables with labels in slider. 2013-03-14 19:42:55 +02:00
Vik Paruchuri
10eb7e45ea Add in some docs 2013-03-14 13:42:41 -04:00
cahrens
017fd06bfc Pre-merge. 2013-03-14 13:37:22 -04:00
Vik Paruchuri
a717dffd48 Remove debug statements 2013-03-14 13:31:30 -04:00
Vik Paruchuri
4c8a45f85e Code to add in an open ended tab automatically 2013-03-14 13:29:26 -04:00
Brian Talbot
0aea85a4d9 studio - checklists: moved content to yaml file, cleaned up new checklists production view, added in page-level nav, and collapse/expand indicators 2013-03-14 12:55:44 -04:00
brianhw
4b5837ffa6 Merge pull request #1668 from MITx/bugfix/dave/bad_route_in_rss 
Removed reverse() call that was breaking in RSS feed.
 2013-03-14 08:22:14 -07:00
David Ormsbee
e818efb098 Removed reverse() call that was breaking in RSS feed. 2013-03-14 11:19:07 -04:00
David Ormsbee
5576c549b3 Merge pull request #1667 from MITx/content/rocha/2.01x-announcement 
Add 2.01x announcement to news feed
 2013-03-14 07:31:22 -07:00