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

375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
f9f9dbdf53 Merged profile-cache updates 2012-02-21 19:45:05 -05:00
Piotr Mitros
3037a0c8ab Fixed bad commit 2012-02-21 18:36:36 -05:00
Piotr Mitros
10732cbcc2 Support for sections outside of course.xml 2012-02-21 18:11:19 -05:00
Piotr Mitros
2033b065f0 Merge with subtitles 2012-02-21 18:09:16 -05:00
David Ormsbee
7e79e9f34a emergency move of askbot settings back into settings.py so staging doesn't blow up 2012-02-21 15:09:45 -05:00
David Ormsbee
2a5ba5d0c7 Force askbot config to draw all config values from askbotsettings.py, and not hit the database 2012-02-21 14:43:05 -05:00
Piotr Mitros
024da20b48 Subtitle support working 
--HG--
branch : pmitros-subtitles
 2012-02-20 20:58:47 -05:00
Piotr Mitros
2416587c19 Minor cleanup 
--HG--
branch : pmitros-section
 2012-02-20 16:47:53 -05:00
Piotr Mitros
f83c492720 per-section rendering works, if unclean 
--HG--
branch : pmitros-section
 2012-02-20 16:35:12 -05:00
Piotr Mitros
086523e0fa Bug in urls file 2012-02-20 16:10:55 -05:00
Piotr Mitros
9812fda559 Minor bug when restarting server with custom tags 
This patch has limited testing w.r.t. whether the bug is completely
gone, but it appears to have no negative side effects, and fix at
least one case.
 2012-02-20 15:46:31 -05:00
Piotr Mitros
0888eed906 Post-merge cleanup 2012-02-20 13:06:13 -05:00
Piotr Mitros
34affdabde Merge with new settings 
--HG--
rename : settings_new_askbot.py => settings.py
 2012-02-20 12:14:48 -05:00
Piotr Mitros
8dec0aa7cd Merging with fixes to Capa 2012-02-20 12:06:19 -05:00
Piotr Mitros
c16ac4fb4e Merge with local template paths 2012-02-20 12:03:59 -05:00
Piotr Mitros
7bd509b7ed Beginning to merge new settings file 
--HG--
branch : pmitros-dormsbee-settings2
rename : settings_new_askbot.py => settings.py
 2012-02-20 11:29:12 -05:00
Piotr Mitros
e57fc19045 Including namespace for sections 
--HG--
branch : pmitros-mod-template
 2012-02-20 07:16:22 -05:00
Piotr Mitros
1befa20b12 Last commit tested and debugged 
--HG--
branch : pmitros-mod-template
 2012-02-20 07:08:22 -05:00
Piotr Mitros
0d9a24e4f4 Templates broken into namespaces 
--HG--
branch : pmitros-mod-template
 2012-02-19 20:12:34 -05:00
Piotr Mitros
5fe68e3a43 Merge to default for next developments 
--HG--
branch : pmitros-mod-template
 2012-02-19 19:34:36 -05:00
Piotr Mitros
622c4e3427 Eliminated save button where not relevant 
--HG--
branch : pmitros-capa-fixes
 2012-02-19 17:27:21 -05:00
Piotr Mitros
cb27c471ff Capa problems handle case sensitivity and give better errors 
--HG--
branch : pmitros-capa-fixes
 2012-02-19 17:03:46 -05:00
Piotr Mitros
ab0f07ebd1 Code cleaned up to be slighlty more explicit 
--HG--
branch : profile-cache
 2012-02-19 12:30:08 -05:00
Piotr Mitros
7bea938246 Handling case of response not in cache explicitly 
--HG--
branch : profile-cache
 2012-02-19 12:21:57 -05:00
Piotr Mitros
88adbc9593 Merge 
--HG--
branch : profile-cache
 2012-02-19 12:18:34 -05:00
Piotr Mitros
b2f3a75d86 Working on case where id not in cache. Committing to merge with mainline 
--HG--
branch : profile-cache
 2012-02-19 12:18:19 -05:00
David Ormsbee
ffba3c59a5 Merge AB testing branch I should have pulled in a week ago. 2012-02-17 15:26:58 -05:00
Bridger Maxwell
2c634d35cd Merge 2012-02-17 00:40:27 -05:00
Piotr Mitros
085cc17178 Caching problem maximum scores in profile (~10x performance boost in that section of the code) 
--HG--
branch : profile-cache
 2012-02-16 19:52:52 -05:00
Piotr Mitros
93011db4e3 Staff can see problem XML 2012-02-16 14:55:27 -05:00
Piotr Mitros
c02502b34b New constant for calculator and new tests 2012-02-16 13:36:09 -05:00
Bridger Maxwell
3a515bfdf8 Merged in profilecleanup 2012-02-15 14:26:47 -05:00
Piotr Mitros
a8bcd38b04 merge 2012-02-14 17:40:57 -05:00
Piotr Mitros
d946621915 Fixed course check 2012-02-14 17:40:46 -05:00
David Ormsbee
a5b9372e4f document inability to run evaluator with non-float variables 2012-02-14 16:50:18 -05:00
David Ormsbee
ed9f2f421b sort keys so evaluation takes longer terms first - vars like 'e2' will be substituted in before mathematical constants like 'e' 2012-02-14 12:10:09 -05:00
David Ormsbee
8174e49690 echo change in 1a68a3047124 to remove outdated call to modules.get_module_class 
--HG--
branch : pmitros-mod-template
 2012-02-14 11:49:47 -05:00
Piotr Mitros
6e9c320a5a Major bug -- using obsolete ID type in modx_render. Minor bug -- profile page broken 2012-02-13 18:05:23 -05:00
Piotr Mitros
c943065931 Merge with template view 2012-02-13 17:11:09 -05:00
Piotr Mitros
20ada529f6 Help file added to static views 2012-02-13 17:10:52 -05:00
Piotr Mitros
9ab2f59130 Removed debug print code for merge 
--HG--
branch : pmitros-mod-template
 2012-02-13 17:07:31 -05:00
Piotr Mitros
44e124c46f Removed file system hackery 
--HG--
branch : pmitros-mod-template
 2012-02-13 17:06:16 -05:00
Piotr Mitros
7c5d93a514 Commented out debug print statements for possible merge 
--HG--
branch : pmitros-mod-template
 2012-02-13 16:46:01 -05:00
Piotr Mitros
caa2ed9195 Removed comments and obsolet error codes 2012-02-13 16:36:48 -05:00
Piotr Mitros
126c1f982c Removed extra print statement 2012-02-13 13:10:14 -05:00
Piotr Mitros
e05e05f445 merge in tolerance bug fix 2012-02-13 13:08:36 -05:00
Piotr Mitros
fca78b83ba Relative tolerance, minor clean-up, as per Dave 
--HG--
branch : tolerance_bug
 2012-02-13 08:10:32 -05:00
Piotr Mitros
a4dc01509a Bug fix. Not very tested 
--HG--
branch : tolerance_bug
 2012-02-13 00:30:22 -05:00
Piotr Mitros
7b49f21ec7 Merge 2012-02-12 09:48:47 -05:00
Piotr Mitros
d22c0cd5fb Legal name required, better error messages 2012-02-12 09:48:06 -05:00