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

657 Commits

Author SHA1 Message Date
Don Mitchell
f0c94a2c7e Beginning test of details tab. 2012-11-21 15:17:18 -05:00
Don Mitchell
f8ee5c2614 Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into 
feature/dhm/cms-settings

Conflicts:
	cms/templates/settings.html
 2012-11-20 11:55:19 -05:00
Don Mitchell
339949f934 Another checkpoint before pull/merge 2012-11-20 11:37:14 -05:00
Don Mitchell
241c9bb1ac Checkpoint to rebase 2012-11-19 16:02:30 -05:00
Don Mitchell
88cc5a080b Everything tested and ready for Tom to fix 2012-11-19 10:38:58 -05:00
chrisndodge
550114704e Merge pull request #974 from MITx/feature/cale/cas-dont-delete-subsection-children 
Only update data in modules that have been set when passing into save_it...
 2012-10-25 11:04:45 -07:00
Calen Pennington
bd1233d38c Only update data in modules that have been set when passing into save_item, and don't force callers to set everything 2012-10-25 13:56:24 -04:00
Tom Giannattasio
a0f4e67235 fixed fakepath on import 2012-10-25 12:51:21 -04:00
Calen Pennington
44bc1a06dd Merge pull request #962 from MITx/bug/cas/tom/fakepath 
fixed multiple file picker bug; removed 'fakepath' from uploading file n...
 2012-10-24 13:00:22 -07:00
Tom Giannattasio
b4ce13af8e more specific fakepath cut 2012-10-24 15:58:29 -04:00
Calen Pennington
9022c0d661 Merge pull request #964 from MITx/bug/cas/tom/section-name-alert 
replaced section name alert with a spinner
 2012-10-24 12:47:08 -07:00
Tom Giannattasio
4e3f7626be replaced section name alert with a spinner 2012-10-24 15:43:02 -04:00
Tom Giannattasio
4afda98420 fixed multiple file picker bug; removed 'fakepath' from uploading file name 2012-10-24 15:22:23 -04:00
Calen Pennington
9dc6cdbda0 Remove vestigial save-subsection button 2012-10-24 15:18:03 -04:00
Tom Giannattasio
ddf3e2e39c removed unused edit policy function 2012-10-24 14:56:30 -04:00
Tom Giannattasio
1e988c3f5e disabled policy names always and removed edit button 2012-10-24 14:46:46 -04:00
Tom Giannattasio
ef5ce4e8f4 fixed policy editing workflow 2012-10-24 14:46:45 -04:00
Tom Giannattasio
b73ceb5642 show spinner more than once 2012-10-24 14:46:45 -04:00
Calen Pennington
6083ba1dc3 Merge pull request #945 from MITx/feature/cas/tom/section-details 
Feature/cas/tom/section details
 2012-10-23 10:20:08 -07:00
Tom Giannattasio
f84b603133 wrapped up section date setting; need help with already published sections 2012-10-22 16:43:44 -04:00
Tom Giannattasio
e3457fa230 started styling section date pickers 2012-10-22 16:43:44 -04:00
Chris Dodge
90a55714c2 trim section name strings to remove whitespace 2012-10-22 16:35:22 -04:00
Tom Giannattasio
fb2925a28b changed nameString variable 2012-10-22 15:55:04 -04:00
Tom Giannattasio
2541502669 added prompt on policy delete 2012-10-22 15:55:04 -04:00
Tom Giannattasio
6d595b96fb tweaked saving mechanisms on subsection page 2012-10-22 15:55:04 -04:00
Tom Giannattasio
f6d046dd04 added autosaving to field inputs on unit and subsection pages 2012-10-22 15:55:04 -04:00
Tom Giannattasio
3a612a4da6 fixed reordering of subsection and units; they now save on update without error 2012-10-22 15:55:04 -04:00
Tom Giannattasio
7655a5adfc added toast subsection save feedback 2012-10-22 15:55:04 -04:00
Chris Dodge
424875848e remove cut/paste error which results in a server error. is not defined when there are no assets. Also fix up base.js to only register one set of handlers for file section which gets rid of the multiple file selection dialogs from appearing 2012-10-18 21:57:06 -04:00
Chris Dodge
d80c834095 catch when users empty out a section name. don't allow them to do that. 2012-10-18 21:27:45 -04:00
Chris Dodge
8ad26fc27e replaced DateJS with latest version from their repository. There was a known bug about parsing times that are 12:xxPM - believe it or not. 2012-10-18 21:11:46 -04:00
Chris Dodge
1905f5aeaf fix variable names in date/time input parsing utility 2012-10-18 10:16:40 -04:00
chrisndodge
5013ee3441 Merge pull request #931 from MITx/feature/cas/tomg/embed-links 
Feature/cas/tomg/embed links
 2012-10-17 12:34:03 -07:00
Chris Dodge
6047aae9fb get basics of set section date time. Need to pass to Tom for some styling considerations 2012-10-17 15:28:34 -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
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
60cf22e4b2 work in progress: set start date 2012-10-17 13:46:40 -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
170694e580 fix/cdodge/asset-upload-tweeks 2012-10-17 10:31:18 -04:00
Tom Giannattasio
daee441153 client-side check for a .tar.gz extension 2012-10-15 14:34:30 -04:00
Tom Giannattasio
4cae93a22e changed default form focus on new course 2012-10-15 12:10:47 -04:00
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
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
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
Chris Dodge
13e23cbbab Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-bugs 
Conflicts:
	cms/templates/widgets/header.html
 2012-10-13 21:49:05 -04:00