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

525 Commits

Author SHA1 Message Date
Chris Dodge
2e43d2ebcc don't display a broken thumbnail image if a thumbnail is not available 2012-10-13 15:43:50 -04:00
Chris Dodge
f1517fefa6 hide search button on asset index page 2012-10-13 10:45:52 -04:00
Chris Dodge
8151b1030f remove wip on Import header button 2012-10-13 10:42:49 -04:00
Chris Dodge
a58e6ce9e4 create course. Quick review on import. Add progress bar stuff to import as well as redirect 2012-10-12 20:54:27 -04:00
Chris Dodge
26e735b178 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cas-new-course 2012-10-12 16:11:59 -04:00
Chris Dodge
4e4b6accda wip: create new course 2012-10-12 16:11:55 -04:00
Calen Pennington
d10f56dd08 Only try to remove a directory if it exists during import 2012-10-12 14:10:32 -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
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
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
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
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
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
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
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
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
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
Tom Giannattasio
648792b7d3 changed studio to edge in emails 2012-10-11 16:25:39 -04:00
Tom Giannattasio
5f66be503c changed edx to edx studio in email templates (hopefully this is right) 2012-10-11 14:53:45 -04:00
Tom Giannattasio
8da5087de8 polished policy styles 2012-10-11 14:53:45 -04:00
Tom Giannattasio
c3e2a544da tweaks to datepicker and calendar 2012-10-11 14:53:45 -04:00
Tom Giannattasio
fcc725e76d finished calendar styles 2012-10-11 14:53:45 -04:00
Tom Giannattasio
b685af44eb started calendar styles 2012-10-11 14:53:45 -04:00
Tom Giannattasio
427462348d tweaked published messaging styles 2012-10-11 14:53:45 -04:00
Tom Giannattasio
093d8385f7 removed search 2012-10-11 14:53:44 -04:00
Tom Giannattasio
df09990a0a removed dropdown in header 2012-10-11 14:53:44 -04:00
Tom Giannattasio
51a19b3d7e transferred edge styles from cms to lms 2012-10-11 14:02:13 -04:00
Chris Dodge
a521ea239f baseline working for importing courseware and static assets 2012-10-11 13:41:16 -04:00
Chris Dodge
bb46c5f909 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import 2012-10-11 12:51:37 -04:00
Chris Dodge
ab1decd97b import static assets. Also consolidate asset import/thumbnail generation into a single code base 2012-10-11 12:51:33 -04:00
Calen Pennington
d21c5761df Minor bug fixes from edge-configs merge 2012-10-11 12:49:48 -04:00
Calen Pennington
cf19a43268 Set SESSION_COOKIE_DOMAIN from env.json 2012-10-11 12:32:23 -04:00
Calen Pennington
5ae34aa4ed Add heartbeat to cms 2012-10-11 12:32:23 -04:00
Calen Pennington
d4405375e5 Read contentstore from auth.json 2012-10-11 12:31:52 -04:00
Calen Pennington
658bb622ba Always import logsettings after common, so that paths are set 2012-10-11 12:31:52 -04:00
Calen Pennington
bc69ed8c9e Move logsettings to common, so that it's shared between cms and lms 2012-10-11 12:31:52 -04:00
Calen Pennington
af44d1c1cf Remove duplicate template definition 2012-10-11 12:30:03 -04:00
Tom Giannattasio
19f8266b6a removed dup edge def and changed to university_profile/edge template 2012-10-11 12:30:03 -04:00
Tom Giannattasio
a1a13eb4f2 added studio logo to log in and sign up pages 2012-10-11 12:29:40 -04:00