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
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
Carlos Andrés Rocha
80d809a86a Add location note to jobs page 
LMS Lighthouse [#190]
 2013-03-14 06:52:28 -07:00
Carlos Andrés Rocha
b4d83a5f44 Add 2.01x announcement to news feed 
LMS Lighthouse [#259]
 2013-03-14 06:49:07 -07:00
Carlos Andrés Rocha
15d8727fce Fix ids in feed.rss 2013-03-14 06:38:55 -07:00
cahrens
564374048e A little cleanup. 2013-03-14 09:35:26 -04:00
cahrens
065e850449 Merge with Brian's changes. 2013-03-14 09:32:54 -04:00
cahrens
e0207432ca Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists 2013-03-14 09:23:05 -04:00
cahrens
54156b7ac1 Saving work. 2013-03-14 09:22:58 -04:00
Peter Baratta
bac9f1f571 Merge branch 'master' into peter/symbolic 2013-03-14 06:31:17 -06:00
Peter Baratta
75b561267c Script feature fix 2013-03-14 06:29:51 -06:00
David Ormsbee
753cc9ec2a Merge pull request #1666 from MITx/feature/kevin/pinning 
Feature/kevin/pinning
 2013-03-13 18:05:24 -07:00
Kevin Chugh
8d766c4b51 fix conflict 2013-03-13 21:01:37 -04:00
Calen Pennington
3211221f98 Merge pull request #1664 from MITx/feature/cdodge/cache-metadata-inheritence-in-django-cache 
use django caching to hold computed metadata inheritence. Also invalidat...
 2013-03-13 17:13:02 -07:00
Your Name
7f877344d6 added comment to explain sorting 2013-03-13 19:47:19 -04:00
Your Name
896ee094c6 added comment to explain sorting 2013-03-13 19:44:41 -04:00
jkarni
55a9bba166 Merge pull request #1663 from MITx/jmclaus/genex-problem5-fix 
Problem 5 grades correctly. Also added missing images for dialog box.
 2013-03-13 16:29:03 -07:00
Brian Talbot
1fce77d8b2 Merge branch 'master' into feature/btalbot/studio-checklists 2013-03-13 19:19:38 -04:00
Brian Talbot
7b74d972a1 studio - checklists: defaulting checklist visual progress to 0% 2013-03-13 19:18:47 -04:00
Brian Talbot
16f6744aef studio - checklists: revised task completion styles, added in checklist visual progress UI and demo/PoC JS and cleaned up some content/status states 2013-03-13 19:13:26 -04:00
Your Name
97eb7eb58b remove whitespace 2013-03-13 19:07:46 -04:00
Your Name
6ee14ec34a candidate without inline 2013-03-13 18:51:40 -04:00
Your Name
fc907fe055 candidate without inline 2013-03-13 18:50:00 -04:00
Your Name
117be695cb candidate without inline 2013-03-13 18:40:10 -04:00