Commit Graph

58450 Commits

Author SHA1 Message Date
Tom Giannattasio
005cf66e2e removed box shadow on embed xmls 2012-10-17 15:20:03 -04:00
Tom Giannattasio
a91a19e7a8 adjustments for newly inserted assets 2012-10-17 15:12:50 -04:00
Tom Giannattasio
e9b42d7a15 added embeddable xml input text to modal 2012-10-17 15:10:06 -04:00
Tom Giannattasio
edacd22c16 added xml embed text field to table 2012-10-17 15:07:44 -04:00
Lyla Fischer
374413a012 Merge branch 'cas' into bug/lyla/templates 2012-10-17 14:32:37 -04:00
Lyla Fischer
094382d588 added solutions and basic metadata to templates 2012-10-17 14:30:31 -04:00
Lyla Fischer
b0e62b08fa added solutions and basic metadata to templates 2012-10-17 14:28:47 -04:00
Chris Dodge
2fd86bd783 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/edit-section-info 2012-10-17 13:49:16 -04:00
chrisndodge
6011d6d333 Merge pull request #928 from MITx/fix/cdodge/asset-upload-tweeks
improvements on asset upload refresh. Now we don't need to refresh the w...
2012-10-17 10:47:47 -07:00
Chris Dodge
82e77a26c6 add mustache.js to common static repo 2012-10-17 13:47:07 -04:00
Chris Dodge
60cf22e4b2 work in progress: set start date 2012-10-17 13:46:40 -04:00
Tom Giannattasio
4772bf68d6 transition added to log in button 2012-10-17 12:55:53 -04:00
Tom Giannattasio
a961ac9331 more prominent log in link on sign up form 2012-10-17 12:51:48 -04:00
Tom Giannattasio
fed5a12b92 reworked log in page to emphasize sign up 2012-10-17 12:45:45 -04:00
Chris Dodge
90861c22d0 improvements on asset upload refresh. Now we don't need to refresh the whole page, just insert the table tow 2012-10-17 12:26:56 -04:00
chrisndodge
b76556b932 Merge pull request #926 from MITx/fix/cdodge/asset-upload-tweeks
fix/cdodge/asset-upload-tweeks
2012-10-17 07:35:23 -07:00
Chris Dodge
5964ecc70c remove work in progress regarding convert datetime to localtime 2012-10-17 10:34:23 -04:00
Chris Dodge
170694e580 fix/cdodge/asset-upload-tweeks 2012-10-17 10:31:18 -04:00
chrisndodge
b91f1886b1 Merge pull request #924 from MITx/fix/cdodge/manage-users
fix 403 error when editors visit page (make read only). Don't allow user...
2012-10-16 13:20:16 -07:00
chrisndodge
908a25d243 Merge pull request #925 from MITx/feature/cdodge/forgot-password
tie in 'forgot password' workflow in CAS LMS
2012-10-16 13:19:47 -07:00
Chris Dodge
554f179957 tie in 'forgot password' workflow in CAS LMS 2012-10-16 16:18:21 -04:00
Chris Dodge
ed2febe44e fix 403 error when editors visit page (make read only). Don't allow user to remove him/herself. Rewire up the remove user callback. 2012-10-16 13:17:41 -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
chrisndodge
0b83366041 Merge pull request #896 from MITx/feature/ichuang/cms-input-filter-latex2edx
Add "high level source" editing capability for problems & html; provides latex2edx I/F
2012-10-16 06:44:55 -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
chrisndodge
146ad77cc1 Merge pull request #919 from MITx/feature/tomg/cas-import-text
tweaked import text; added check for .tar.gz
2012-10-15 11:46:03 -07:00
Tom Giannattasio
f10d1773c7 added open sans pull 2012-10-15 14:44:53 -04:00
Tom Giannattasio
c9abddc9a8 removed css comment 2012-10-15 14:37:05 -04:00
Tom Giannattasio
c542ac5bd6 added link to documentation 2012-10-15 14:35:44 -04:00
Tom Giannattasio
daee441153 client-side check for a .tar.gz extension 2012-10-15 14:34:30 -04:00
chrisndodge
158c000af1 Merge pull request #918 from MITx/feature/tomg/cas-tree-tweaks
Tweaks to the unit location pane
2012-10-15 10:54:02 -07:00
Chris Dodge
3d67c9606e fix bug where activation page was blank 2012-10-15 13:52:41 -04:00
Tom Giannattasio
83b32987e6 removed extra ol element from unit location pane 2012-10-15 13:07:53 -04:00
Tom Giannattasio
c3bffe3e21 update name in unit location pane whenever display name is changed 2012-10-15 13:04:06 -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