Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,581 Commits 1 Branch 0 Tags
11399d60313afb805aa633b53bd38dc6ccd64d3d
Commit Graph

5581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos Andrés Rocha
11399d6031 Added protored exam press release page 2012-09-06 16:06:57 -04:00
David Ormsbee
bea6db620a Merge pull request #533 from MITx/feature/halogenandtoast/calculator 
Put in calculator in courseware
 2012-09-06 13:00:09 -07:00
Calen Pennington
c49bcf5709 Merge pull request #638 from MITx/feature/cale/progress-handle-extra-credit 
Feature/cale/progress handle extra credit
 2012-09-06 12:54:52 -07:00
David Ormsbee
1acb7dc24f Add a short delay to calculator input focus so it doesn't jump to the bottom of the screen when you open it. 2012-09-06 15:52:31 -04:00
Calen Pennington
8030fdce80 Fix test and assertion reversal in progress test 2012-09-06 15:47:45 -04:00
Calen Pennington
5f261ec335 Test that values are clamped between 0 and 100% for progresses 2012-09-06 15:47:12 -04:00
kimth
f4f2efc30d Merge pull request #636 from MITx/feature/cale/progress-handle-extra-credit 
Feature/cale/progress handle extra credit
 2012-09-06 12:24:11 -07:00
Calen Pennington
5ce516a3a0 Clamp progress to be greater than zero 2012-09-06 15:23:19 -04:00
Calen Pennington
a1b3b6ba3c Merge pull request #635 from MITx/jarv/edX-template-updates 
more template updates to rename MITx to edX
 2012-09-06 12:19:41 -07:00
Calen Pennington
14eb160eea Just return a null progress if something goes wrong when retrieving capa_module progress (and log the error) 2012-09-06 15:18:59 -04:00
Calen Pennington
897a87646c Make progress handle extra credit by capping at 100%, and handle malformed progress stuff by ignoring any changes 2012-09-06 15:16:24 -04:00
John Jarvis
587725ee61 more template updates to rename MITx to edX 2012-09-06 15:12:19 -04:00
David Ormsbee
7eeedd4751 Merge pull request #634 from MITx/feature/victor/per-run-info 
Feature/victor/per run info
 2012-09-06 11:45:45 -07:00
Victor Shnayder
550889ea30 fix typo 2012-09-06 11:42:19 -04:00
Victor Shnayder
a1286b1c7d add some docs for new policy folder locations, per-course about and info pages 2012-09-06 11:39:43 -04:00
David Ormsbee
978ff5b4e9 Merge pull request #633 from MITx/feature/ichuang/histogram-try-catch 
put try-catch around histogram coffeescript code
 2012-09-06 08:34:13 -07:00
Calen Pennington
34f2309c15 Merge pull request #631 from MITx/feature/victor/url_name-duplication 
fix for multiple url_name hashing bug
 2012-09-06 08:32:14 -07:00
David Ormsbee
3a40a55c76 Merge pull request #620 from MITx/jarv/add-local-logging 
Jarv/add local logging
 2012-09-06 08:25:17 -07:00
ichuang
56951e9961 put try-catch around histogram coffeescript code 2012-09-06 11:18:00 -04:00
Victor Shnayder
f44898677a Allow course info and course about pages to vary per-run 
* looks in about/{course.url_name}/ first, then in about/
* same for info/
 2012-09-06 11:17:55 -04:00
David Ormsbee
39a773616b Merge pull request #630 from MITx/jarv/update-email 
Jarv/update email
 2012-09-06 08:10:32 -07:00
Tom Giannattasio
efd8a77bf1 Merge pull request #632 from MITx/feature/kfiedler/problems 
Fix list item issues in problems
 2012-09-06 07:42:39 -07:00
Kyle Fiedler
3ab85d470a Fix before element 2012-09-06 10:39:19 -04:00
Kyle Fiedler
54f621a329 Added fix for pre as a first child in a list item 2012-09-06 10:21:34 -04:00
Kyle Fiedler
54caa320ef fixed list items in html in the courseware 2012-09-06 10:21:33 -04:00
Victor Shnayder
739dd8e3f9 fix for multiple url_name hashing bug 2012-09-06 10:12:48 -04:00
John Jarvis
517e6ddeda Contact email address updates 2012-09-06 09:26:52 -04:00
John Jarvis
26ff14172c Email update for module-error template 2012-09-06 09:24:20 -04:00
kimth
d3cd85d81f Merge pull request #627 from MITx/feature/kfiedler/problems 
Style changes to problems
 2012-09-05 16:06:16 -07:00
Victor Shnayder
d0fcbdda8c convert answers to strings to make sure they're hashable 2012-09-05 16:00:04 -04:00
Calen Pennington
cd6b21472d Merge pull request #628 from MITx/feature/cale/manual-git-reload-feature-flag 
Isolate manual git reload behind a feature flag
 2012-09-05 12:29:31 -07:00
Calen Pennington
4088ac5428 Isolate manual git reload behind a feature flag 2012-09-05 15:16:40 -04:00
Kyle Fiedler
7c8838a6b2 Added some different style for the select problems 2012-09-05 15:02:50 -04:00
Kyle Fiedler
f785f6f8a1 Added some nicer styles for dynamic math 2012-09-05 14:24:12 -04:00
Kyle Fiedler
8a5e872c8f Removed a bunch of font tags 2012-09-05 14:24:12 -04:00
Calen Pennington
579544ec6a Merge pull request #626 from MITx/feature/victor/answer-export 
Feature/victor/answer export
 2012-09-05 11:04:34 -07:00
David Ormsbee
5e9fce5cae Merge branch 'master' into feature/halogenandtoast/calculator 2012-09-05 13:58:12 -04:00
Victor Shnayder
a8cd4633c0 remove debugging statements 2012-09-05 13:46:15 -04:00
Victor Shnayder
f04cd838e5 Integrate csv export of answer distributions with Ike's sweet dashboard 2012-09-05 13:40:29 -04:00
Victor Shnayder
c89031b077 Export of answer distibutions to csv 
- go through all students, all of their problems, save count for each answer
- return csv
- url exists, but no links to it yet
- Will need to integrate with Ike's new dashboard code
 2012-09-05 13:40:29 -04:00
Calen Pennington
7702907662 Make module system handle not having a user, and pass a user in when previewing in the cms 2012-09-05 13:29:30 -04:00
John Jarvis
f7baa0d8f0 * By default local dev environments will be setup to send tracking 
logs and application logs (DEBUG) to ENV_ROOT/log. Logs are rotated
  using the RotatingFileHandler
* For non dev environments logging will continue to be handled by
  rsyslogd
 2012-09-05 11:25:33 -04:00
Calen Pennington
82c877c036 Merge pull request #598 from MITx/kimth/solutions 
Let admins see answers of problems at any time
 2012-09-05 08:24:45 -07:00
Calen Pennington
5a137cf3ec Merge pull request #625 from MITx/feature/ichuang/fix-force-univ-domain 
fix FORCE_UNIVERSITY_DOMAIN check in student.views
 2012-09-05 08:22:24 -07:00
Calen Pennington
8c301e04ae Merge pull request #614 from MITx/feature/arjun/fix_customresponse_msg 
Clean up customresponse messages + points
 2012-09-05 08:20:54 -07:00
ichuang
34ea1e0b95 fix FORCE_UNIVERSITY_DOMAIN check in student.views 2012-09-05 11:19:02 -04:00
Calen Pennington
a0608df706 Merge pull request #621 from MITx/feature/victor/fewer-xml-warnings 
Remove lots of loud warnings about duplicate url names for things which ...
 2012-09-05 08:17:02 -07:00
Calen Pennington
2f3f9e5ce9 Merge pull request #624 from MITx/rocha/master 
Cleanup of 'About Course' page link to its Courseware
 2012-09-05 08:15:33 -07:00
Calen Pennington
54e8819fb1 Merge pull request #615 from MITx/feature/ichuang/instructor-dashboard-upgrade 
Upgrade to instructor dashboard
 2012-09-05 08:03:55 -07:00
Carlos Andrés Rocha
2d42c91b9d Cleanup of 'About Course' page link to its Courseware 2012-09-05 10:22:36 -04:00