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

6607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Александр
c5f6f7ada2 html entities are renamed to work with different id's 2012-10-26 18:09:53 +03:00
Александр
948f8090eb grading for vsepr 2012-10-26 18:09:53 +03:00
Александр
5185df3805 continue vsepr grading 2012-10-26 18:09:53 +03:00
Александр
94b70fd891 start grading implementation 2012-10-26 18:09:53 +03:00
Александр
e6eedb9293 added chemtools to chem module in capa, and added it to global context 2012-10-26 18:09:53 +03:00
Александр
6306d98007 vsepr: geometries and molecules now are passed from xml as parameters 2012-10-26 18:06:17 +03:00
Piotr Mitros
495814c7f6 Hacked better alignment for VSEPR for demo 2012-10-26 18:06:16 +03:00
Александр
bf4d5bf799 starting enviroment 2012-10-26 18:06:16 +03:00
Victor Shnayder
a508556521 Fix typo 2012-10-24 11:50:38 -03:00
David Ormsbee
8ce20b5e0f Merge pull request #957 from MITx/fix/rocha/increase-upload-file-limit 
Increase the limit of files that can be uploaded by a student
 2012-10-23 15:16:15 -07:00
Carlos Andrés Rocha
76ffbfc4a1 Increase the limit of files that can be uploaded by a student 2012-10-23 17:26:00 -04:00
David Ormsbee
4db444d5fd Merge pull request #956 from MITx/feature/rocha/user-admin-commands 
Add some extra console commands for handling user permissions
 2012-10-23 14:24:01 -07:00
Carlos Andrés Rocha
3e2cf18772 Add some extra console commands for handling user permissions 2012-10-23 16:11:07 -04:00
Victor Shnayder
be947770c0 Merge pull request #917 from MITx/victor/make-problemset-sequential 
Make problemset render as a sequential, not a vertical.
 2012-10-23 10:30:52 -07:00
Victor Shnayder
f50519ae48 Merge pull request #906 from MITx/victor/test-speedup 
Victor/test speedup
 2012-10-22 10:45:23 -07:00
David Ormsbee
9a4e21c010 Merge pull request #943 from MITx/feature/rocha/dashboard-software-licenses 
Add fix for users with multiple licenses
 2012-10-22 07:29:24 -07:00
Carlos Andrés Rocha
3784c3ce18 Add fix for users with multiple licenses 2012-10-22 10:27:17 -04:00
bridger
853051bcc0 Merge pull request #941 from MITx/feature/rocha/dashboard-software-licenses 
Use test database in licenses test instead of 6.002x
 2012-10-19 15:42:00 -07:00
Carlos Andrés Rocha
f890c1dccb Use test database in licenses test instead of 6.002x 2012-10-19 17:55:55 -04:00
Victor Shnayder
cda5e1a40e Merge pull request #937 from MITx/victor/hotfix/unicode-in-code 
Catch unicode errors in contextualize_text and deal with them.
 2012-10-18 18:11:29 -07:00
Victor Shnayder
1806699f26 typos 2012-10-18 20:25:52 -04:00
Victor Shnayder
5177e8c656 Catch unicode errors in contextualize_text and deal with them. 2012-10-18 20:23:49 -04:00
David Ormsbee
2e03a4846c Merge pull request #935 from MITx/feature/rocha/cengage-press-release 
Add Cengage book press release
 2012-10-18 11:55:02 -07:00
David Ormsbee
bb3046bdc7 Merge pull request #897 from MITx/feature/dave/email_bugfixes 
Login/Profile changes
 2012-10-18 11:54:35 -07:00
Carlos Andrés Rocha
2f7733ede0 Add Cengage book press release 2012-10-18 14:45:42 -04:00
David Ormsbee
9fbdeeb6c6 Send email change notice email to both old and new email addresses. 2012-10-18 14:36:52 -04:00
David Ormsbee
ea8b9577ce Email wording changes based on Sarina's review 2012-10-18 14:28:15 -04:00
David Ormsbee
0dee2e9233 resend the same activation link instead of a new one when someone who is not active tries to log in 2012-10-18 13:33:14 -04:00
David Ormsbee
491f10d1bf Merge branch 'master' into feature/dave/email_bugfixes 2012-10-18 12:23:09 -04:00
David Ormsbee
3385e06304 As per code review, added note that accept_name_change is no longer being used. 2012-10-18 12:22:44 -04:00
David Ormsbee
dbfa7bf03a Change email change success notice to say email instead of name 2012-10-18 12:20:52 -04:00
Carlos Andrés Rocha
4cadbcc556 Merge pull request #920 from MITx/feature/rocha/ut-press-release 
Removed obsolete information from site faq
 2012-10-16 10:03:05 -07:00
Carlos Andrés Rocha
b479c85310 Change order of X Universities in the front page 2012-10-16 13:02:13 -04:00
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
1efb9711c3 Removed obsolete information from site faq 2012-10-15 14:51:16 -04:00
Victor Shnayder
38bd83858b Make problemset render as a sequential, not a vertical. 
- Piotr requested this.  Hopefully it doesn't break anything, but we should run it by the content fellows before merging.
 2012-10-15 12:52:21 -04: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