Calen Pennington
a160f6144f
Fix date display in unit page
2012-10-12 15:16:44 -04:00
Calen Pennington
4005cbf455
Hide/show wips w/ press of 'w' key
2012-10-12 15:11:02 -04:00
Calen Pennington
607b99dece
Make separate links for lms_preview and lms as needed
2012-10-12 15:03:06 -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
David Ormsbee
01ac01b62c
Re-enable change name, and fix up change email styles
2012-10-12 14:31:20 -04:00
Calen Pennington
d10f56dd08
Only try to remove a directory if it exists during import
2012-10-12 14:10:32 -04:00
Victor Shnayder
f6f2663b77
fix arrows list
2012-10-12 14:08:21 -04:00
Calen Pennington
fb48a4fb8f
Remove scheme on jquery.form.js load so that it works over https
2012-10-12 14:02:51 -04:00
Victor Shnayder
b6f7427e22
make tests pass again
2012-10-12 14:02:22 -04:00
Victor Shnayder
19d3cb3870
Add a chemicalequationinput with live preview
...
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one. This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
2012-10-12 13:52:48 -04:00
Calen Pennington
ab913cb5ac
Fix edit_unit header to point to the correct course module
2012-10-12 13:22:53 -04:00
Calen Pennington
90a847cb26
Fix context course on edit subsection
2012-10-12 13:19:25 -04:00
Calen Pennington
0e277277a8
Merge pull request #881 from MITx/fix/cdodge/cas-thumbnail-exception-handling
...
swallow exceptions when generating thumbnails
2012-10-12 10:12:36 -07:00
Chris Dodge
d31a7c6d6b
log and continue on thumbnail generation exception
2012-10-12 13:11:55 -04:00
Chris Dodge
78df26605d
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-thumbnail-exception-handling
2012-10-12 13:03:02 -04:00
chrisndodge
5aa474a10d
Merge pull request #879 from MITx/feature/cale/cas-import-ui
...
Feature/cale/cas import ui
2012-10-12 10:02:43 -07:00
Calen Pennington
c70f29e83a
Wire up import to the frontend, and make sure that it puts it into the already extant course
2012-10-12 12:40:03 -04:00
Chris Dodge
b17836f232
swallow exceptions when generating thumbnails
2012-10-12 12:27:21 -04:00
Tom Giannattasio
3d2a1c2493
removed red import button – drawing too much attention; this will be reworked onto a different page at some point anyways
2012-10-12 11:58:43 -04:00
Tom Giannattasio
c7cdaf8080
styled import page
2012-10-12 11:58:43 -04:00
Calen Pennington
c2abd4b537
Add import page template
2012-10-12 11:58:43 -04:00
Calen Pennington
02a325b018
First stab at an import page. Needs styling
2012-10-12 11:58:43 -04:00
Calen Pennington
9cf5cd088a
Merge pull request #880 from MITx/feature/cale/edge-landing-page
...
styled edge registration form
2012-10-12 08:38:44 -07:00
Tom Giannattasio
a9ba3543d3
styled edge registration form
2012-10-12 11:18:55 -04:00
Calen Pennington
ac71da1535
Make header tabs work
2012-10-12 11:18:40 -04:00
chrisndodge
ff25d13256
Merge pull request #868 from MITx/fix/cdodge/cas-delete-regression
...
DraftMongoContentStore needs to both delete the draft *and* the non-draf...
2012-10-12 08:17:35 -07:00
Calen Pennington
3c8de11f09
Standardize on how we bypass the draft-aware modulestore
2012-10-12 11:10:12 -04:00
chrisndodge
750e70e842
Merge pull request #878 from MITx/feature/cale/edge-landing-page
...
Feature/cale/edge landing page
2012-10-12 08:01:46 -07:00
Chris Dodge
281f194b2a
per feedback, change back 'draft-aware' modulestore to not delete the published copy. In delete_item in views.py do the logic to determine whether we should be using a 'draft-aware' modulestore or not, based on the category type
2012-10-12 11:00:34 -04:00
Chris Dodge
1015b3a974
DraftMongoContentStore needs to both delete the draft *and* the non-draft entities
2012-10-12 11:00:34 -04:00
Calen Pennington
73a80ec4eb
Merge pull request #877 from MITx/feature/cdodge/cas-tarball-import
...
allow importing of .tar.gz packages of courseware
2012-10-12 07:38:24 -07:00
Chris Dodge
14a1a7da31
allow importing of .tar.gz packages of courseware
2012-10-12 10:33:31 -04:00
Calen Pennington
4814f8c38e
Cleaning up logos for edge landing page
2012-10-12 10:31:46 -04:00
Calen Pennington
c41c084b39
Wire up login and register forms for edx landing page
2012-10-12 09:55:32 -04:00
David Ormsbee
96bdd03406
re-enable email change functionality
2012-10-12 09:54:47 -04:00
chrisndodge
b2d70e2801
Merge pull request #872 from MITx/feature/cale/edge-landing-page
...
Edge landing page, styled, not wired up yet
2012-10-12 06:27:19 -07:00
Arjun Singh
71201a73b2
styles and tiny bit of logic for community tas
2012-10-12 04:54:56 -07:00
Arjun Singh
c28c3f9916
Merge branch 'master' into hotfix/arjun/fix_integer_disc_ids
2012-10-12 04:23:29 -07:00
Arjun Singh
6fbf2f9720
revert toString changes; use attr('data-id') instead of data('id') when mongo ids are involved
2012-10-12 04:22:27 -07:00
Calen Pennington
c814758715
Merge pull request #866 from MITx/feature/cdodge/cms-import
...
Feature/cdodge/cms import
2012-10-11 19:22:19 -07:00
Calen Pennington
d1b7bcef16
Merge pull request #867 from MITx/feature/tomg/cas-cleanup
...
various style updates
2012-10-11 19:21:10 -07:00
Calen Pennington
3751bc05a5
Merge pull request #870 from MITx/fix/cdodge/cas-bugs
...
Fix/cdodge/cas bugs
2012-10-11 19:20:20 -07:00
Chris Dodge
e2be559ab0
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-bugs
2012-10-11 20:55:29 -04:00
chrisndodge
64c3bbdc7d
Merge pull request #869 from MITx/fix/cdodge/cas-logger-crash
...
fix up dev.py to include the new flag
2012-10-11 17:54:33 -07:00
Chris Dodge
e27dea0fec
fix up dev.py to include the new flag
2012-10-11 20:52:28 -04:00
Chris Dodge
466e4cbd17
Fix regression on creating new sections and subsections. They were being set into 'draft' when we are not currently supporting draft modes for those areas of the hierarchy
2012-10-11 20:48:45 -04:00
Victor Shnayder
c420c67b82
Actually implement exact vs factors-don't-matter comparisons in chemcalc
2012-10-11 17:40:26 -04:00
Tom Giannattasio
648792b7d3
changed studio to edge in emails
2012-10-11 16:25:39 -04:00
Chris Dodge
82abdd07dc
respond to some of Cale's comments
2012-10-11 16:23:28 -04:00
