Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

10188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
aa4361b3f0 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/signup-tweeks 2012-10-15 11:26:53 -04:00
chrisndodge
16720f517d Merge pull request #911 from MITx/feature/tomg/cas-import-progress 
polished import progress bar
 2012-10-15 08:25:38 -07:00
Chris Dodge
4d439bbe03 add a confirmation when deleting components 2012-10-15 11:24:34 -04:00
Tom Giannattasio
500738d189 polished import progress bar 2012-10-15 11:19:34 -04:00
jarv
0988810882 Merge pull request #907 from MITx/feature/rocha/ut-press-release 
UT press release and related updates
 2012-10-15 08:17:45 -07:00
Carlos Andrés Rocha
b13412d3b2 Make corrections of UT announcement 2012-10-15 11:12:35 -04:00
Chris Dodge
57df208930 return after warning user that not all create new course fields have been filled out 2012-10-15 11:09:16 -04:00
chrisndodge
60d431aa69 Merge pull request #910 from MITx/feature/tomg/cas-toast-alerts 
changed save unit alerts to toast
 2012-10-15 08:08:10 -07:00
chrisndodge
5b179ccf83 Merge pull request #908 from MITx/feature/tomg/cas-new-course-style 
polished new course form
 2012-10-15 08:07:43 -07:00
Tom Giannattasio
1cfde391ff changed save unit alerts to toast 2012-10-15 10:54:58 -04:00
chrisndodge
08f59d62d6 Merge pull request #909 from MITx/fix/cdodge/signup-tweeks 
don't show courses/create new course if account has not been activated. ...
 2012-10-15 07:50:35 -07:00
Chris Dodge
2aee549a76 don't show courses/create new course if account has not been activated. Also better error messaging on failed logins. Also redirect to index after signup. 2012-10-15 10:48:01 -04:00
Tom Giannattasio
44283497a8 removed log 2012-10-15 10:30:00 -04:00
Tom Giannattasio
168fccf7ae polished new course form 2012-10-15 10:21:39 -04:00
Carlos Andrés Rocha
40dd6fa105 Add missing text to FAQ 2012-10-15 07:16:13 -04:00
Carlos Andrés Rocha
516daa4710 Converted FAQ template to unix line endings 2012-10-15 06:58:39 -04:00
Carlos Andrés Rocha
c5a148639d Add announcement of UT joining edx and related changes 2012-10-15 06:57:50 -04:00
Victor Shnayder
4bf9323eed More test speedups: 
- Add tasks to test lib without coverage
- Add a coverage flag to test.py (set to True, for manual tweaking for now)
 2012-10-15 02:23:00 -04:00
Victor Shnayder
3f3df3fdb4 remove no-longer-used test dbs 2012-10-15 01:48:46 -04:00
Victor Shnayder
bc96203807 Use a faster hashing algorithm for testing 
http://slacy.com/blog/2012/04/make-your-tests-faster-in-django-1-4/

rake fasttest_lms goes from 48 to 26 seconds.
 2012-10-15 01:34:45 -04:00
chrisndodge
d56fb287e1 Merge pull request #905 from MITx/fix/cdodge/cas-tab-fixes 
fix preview draft link. We need to generate the link target url directly...
 2012-10-14 20:40:19 -07:00
Chris Dodge
eab5bd4c3e fix preview draft link. We need to generate the link target url directly rather than using jump_to. I think jump_to is not properly finding the draft objects and needs more investigation 2012-10-14 23:38:43 -04:00
ichuang
557b79129b added image, solution, showhide examples to latex_problem template; 
fixed x_module.py to only load *.yaml files as templates
TODO: Note that bad templates cause the CMS not to load; it should throw
exceptions instead of dying.
 2012-10-14 23:26:46 -04:00
chrisndodge
a45861e290 Merge pull request #904 from MITx/fix/cdodge/cas-tab-fixes 
always hide the pages button. We don't want it appearing in case someone...
 2012-10-14 19:47:07 -07:00
Chris Dodge
6fc07ab45e always hide the pages button. We don't want it appearing in case someone types a 'w' 2012-10-14 22:42:36 -04:00
ichuang
a8cbcca9ab fix HTML display of math (it wasn't queueing mathjax) 2012-10-14 22:14:51 -04:00
chrisndodge
5931a8d9bc Merge pull request #903 from MITx/fix/cdodge/broken-path-to-view-subsection 
when calling jump_to when location=<id-of-sequential> then Position is b...
 2012-10-14 18:33:43 -07:00
Chris Dodge
a47b2be8df set position=0 when position=None. Discuss with Dave O. 2012-10-14 21:31:45 -04:00
Chris Dodge
4ac1a74117 when calling jump_to when location=<id-of-sequential> then Position is being computed as None. The redirect then yields a 404. Force Position to be 0 when Position=None 2012-10-14 21:29:00 -04:00
ichuang
50f665311e update latex template problem; add template adaptive hint problem 2012-10-14 21:28:25 -04:00
ichuang
8742ba76a3 improved latex problem template; hls codemirror box autosizes height; 
capa responsetypes can now include "inline='1'" for their span to be inline
 2012-10-14 20:19:14 -04:00
Carlos Andrés Rocha
0f16e8a358 Return only username on OpenID provider requests. 
Temporarily return username also as the email and fullname fields of
the response using OpenID's simple registration extension.
 2012-10-14 19:45:22 -04:00
ichuang
12869ecedd fix hls modal window style (it now autosizes properly) 2012-10-14 17:48:45 -04:00
ichuang
69bfdac49f minor change in dev_ike for cms-master 2012-10-14 16:58:11 -04:00
ichuang
09d7d6d688 add AUTH_USE_MIT_CERTIFICATES feature flag to CMS, and @ssl_login_shortcut 2012-10-14 16:40:04 -04:00
ichuang
92f329ca1a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx 2012-10-14 16:36:40 -04:00
chrisndodge
f4b61e8f47 Merge pull request #901 from MITx/fix/cdodge/multiple-choice 
remove the &mdash; from the HTML, this apparently is causing the CAS and...
 2012-10-14 12:44:49 -07:00
Chris Dodge
d34075ff89 remove the &mdash; from the HTML, this apparently is causing the CAS and LMS to barf on staging, but strangly not on dev 2012-10-14 15:43:16 -04:00
Victor Shnayder
4594d37bf2 Merge pull request #900 from MITx/feature/ichuang-fix-capa_module-reset-string-bug 
reset_problem in capa_module should always return dicts not strings
 2012-10-14 10:36:49 -07:00
ichuang
3c8830f3b0 reset_problem in capa_module should always return dicts not strings 
this is for the master branch (versus cms-master)
 2012-10-14 12:57:58 -04:00
Victor Shnayder
15d4af26a5 Merge pull request #899 from MITx/feature/victor/capa-ajax 
Make chem preview more robust
 2012-10-14 08:40:39 -07:00
Victor Shnayder
f4d8df94dd Make chem preview more robust 
- give the preview div an id, use that to look it up instead of dancing around in the DOM
 2012-10-14 11:35:32 -04:00
Piotr Mitros
97233cf00e Work-around for bug in pip lookup 2012-10-14 10:33:11 -04:00
chrisndodge
f845cc4e08 Merge pull request #898 from MITx/fix/cdodge/multiple-choice 
remove HTML comment from schematiceditor template
 2012-10-13 20:44:06 -07:00
Chris Dodge
8f1336d87a remove HTML comment from schematiceditor template 2012-10-13 23:27:37 -04:00
David Ormsbee
1154c4b897 auto-resend activation email if they try to log in and aren't activated 2012-10-13 23:20:33 -04:00
ichuang
db8f69d497 fix tabs in latex_html.yaml template 2012-10-13 23:10:51 -04:00
ichuang
bf959d8fc3 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx 2012-10-13 22:54:14 -04:00
ichuang
f846f4c2ad add import filter capability to html & problem editing; provides latex2edx interface 2012-10-13 22:33:41 -04:00
chrisndodge
bdbeec9ad5 Merge pull request #895 from MITx/fix/cdodge/multiple-choice 
fix exception in LMS when rendering newly create multiple choice problem...
 2012-10-13 19:21:21 -07:00