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

6565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos Andrés Rocha
02a960e44c Merge pull request #923 from MITx/feature/rocha/dashboard-software-licenses 
Add migrations to license django application
 2012-10-16 09:05:23 -07:00
Carlos Andrés Rocha
e7c62b0fc6 Add migrations to license django application 2012-10-16 11:57:38 -04:00
Victor Shnayder
f8f2e63ed4 Merge pull request #922 from MITx/feature/rocha/dashboard-software-licenses 
Retrieve and assign course software licenses
 2012-10-16 08:38:05 -07:00
arjun810
ca7476223a Merge pull request #921 from MITx/kimth/fix-cr-show-answer 
Fix CR showanswer template
 2012-10-15 21:50:27 -07:00
Carlos Andrés Rocha
a8cedf8ab9 Update lms/djangoapps/licenses/views.py 
Remove annoying print statements
 2012-10-15 21:04:10 -03:00
Carlos Andrés Rocha
e9ec63e4b6 Add ajax endpoint to retrieve and assign course software licenses 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
3808ff85a8 Added django command to generate random serial numbers. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
9cf8c02dc6 Added import_serial_numbers command test. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
516c41f342 Added html view of serial numbers. Refactored code. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
b2de8199b7 Added licenses view helper functions. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
ed88708d71 Renamed models and commands for importing serial numbers. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
24d5c9162c Created Django App with commands to import software license numbers per class. 2012-10-15 18:46:31 -04:00
kimth
57f49353d8 Fix CR showanswer template 2012-10-15 22:09:19 +00:00
Carlos Andrés Rocha
b269215951 Merge pull request #915 from MITx/feature/rocha/ut-press-release 
Make small corrections to UT pages and announcement
 2012-10-15 09:38:47 -07:00
Carlos Andrés Rocha
c23f44b6d4 Merge pull request #902 from MITx/hotfix/rocha/openid-sreg-return-only-username 
Return only username on OpenID provider requests.
 2012-10-15 09:29:20 -07:00
Carlos Andrés Rocha
f495f219cf Update common/djangoapps/external_auth/views.py 
Corrected comments on OpenID temporal fix
 2012-10-15 13:28:54 -03:00
John Hess
a88a857723 Adjusted to return email address 
Per update from CS50 team, their client will break if not given addresses.
 2012-10-15 12:55:39 -03:00
Carlos Andrés Rocha
b121e620f8 Make small corrections to UT pages and announcement 2012-10-15 11:54:23 -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
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
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
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
arjun810
1ec0fae801 Merge pull request #891 from MITx/feature/victor/capa-ajax 
Feature/victor/capa ajax
 2012-10-13 17:05:44 -07:00
arjun810
ccc5e5771d Merge pull request #893 from MITx/kimth/toggle-stay-in-place 
Toggle shouldn't follow anchor
 2012-10-13 16:01:58 -07:00
kimth
113e8b97b6 Toggle shouldn't follow anchor 2012-10-13 16:19:54 +00:00
arjun810
a46c517a9d Merge pull request #892 from MITx/kimth/fix-mc-soln-conflict 
choicegroup should only process choices belonging to its input_id
 2012-10-12 23:27:19 -07:00
kimth
3b461ee11f choicegroup should only process choices belonging to its input_id 2012-10-13 06:13:33 +00:00
Victor Shnayder
49a921c81e Merge pull request #873 from MITx/feature-alex-crystallography-mitx 
Feature alex crystallography mitx
 2012-10-12 20:11:41 -07:00
Victor Shnayder
adae176943 merge 2012-10-12 23:06:39 -04:00
Victor Shnayder
db8639e06a Fix preview code 
- I'm starting to vaguely understand js variable scope and closures.  Long way to go though :)
 2012-10-12 22:52:41 -04:00
Victor Shnayder
48de4b40ee Fix my js_loader patch 
* still call the callback when skipping duplicate file.  This updates the completed flags, and so the overall "we're done" callback fires properly.
 2012-10-12 22:52:02 -04:00
Victor Shnayder
1c18ad9607 make loader only load scripts once per run, midway through fixing multiple chem equations per page 2012-10-12 19:18:58 -04:00
arjun810
b2afa82c8e Merge pull request #886 from MITx/hotfix/arjun/fix_integer_disc_ids_2 
more removal of data("id") in favor of attr("data-id")
 2012-10-12 14:59:20 -07:00
Arjun Singh
d7b237ce0a more removal of data("id") in favor of attr("data-id") 2012-10-12 14:47:44 -07:00
Victor Shnayder
d97533c04f Merge pull request #885 from MITx/hotfix/rocha/fix-unicode-in-custom-tabs 
Fix to read utf-8 enconded html files for custom course tabs
 2012-10-12 14:39:15 -07:00
Carlos Andrés Rocha
f1120a1139 Removed unused import 2012-10-12 17:39:05 -04:00
Carlos Andrés Rocha
e8cd125701 Fix to read utf-8 enconded html files for custom course tabs 2012-10-12 17:36:19 -04:00
Victor Shnayder
619e9f18ac Merge pull request #884 from MITx/feature/victor/capa-ajax 
address Ike's comments.
 2012-10-12 14:08:11 -07:00
Victor Shnayder
54d1f2afac address Ike's comments. 2012-10-12 17:03:11 -04:00
ichuang
fd5c7c622c Merge pull request #862 from MITx/feature/victor/capa-ajax 
Feature/victor/capa ajax

I'm happy with all the changes to inputtypes, modulo the minor comments.
I didn't read chemcalc.py closely, but the tests look good.
 2012-10-12 13:51:10 -07:00
Victor Shnayder
d78e041c2d Testing and small fixes 
- make chemical_equations_equal return False instead of raising errors.
- make tests not choke on unicode
- get full coverage
 2012-10-12 15:32:36 -04:00
David Ormsbee
f5f1e858d5 Merge pull request #874 from MITx/hotfix/arjun/fix_integer_disc_ids 
Hotfix/arjun/fix integer disc ids
 2012-10-12 11:38:28 -07:00
David Ormsbee
73bbfe8c4d Merge pull request #875 from MITx/feature/arjun/community_tas 
styles and tiny bit of logic for community tas
 2012-10-12 11:37:47 -07:00