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

483 Commits

Author SHA1 Message Date
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
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
Tom Giannattasio
5dba4fd6c3 tweaked window style for consistency 2012-10-11 12:29:40 -04:00
Tom Giannattasio
5ae11b8e11 changed edge course url 2012-10-11 12:29:40 -04:00
Tom Giannattasio
6da378e735 tweaked edge template to target students only 2012-10-11 12:29:40 -04:00
Tom Giannattasio
f4bdb46493 changed edge url 2012-10-11 12:29:40 -04:00
Tom Giannattasio
fec710abde added edge logo; added edge temp landing page 2012-10-11 12:29:14 -04:00
Lyla Fischer
f06c67ef08 added embeddable links 2012-10-11 11:59:17 -04:00
Lyla Fischer
0bd5446f80 fixed date display 2012-10-11 11:58:49 -04:00
Chris Dodge
115d7358fa fix up commenting after refactoring. Also, don't reraise an exception during thumbnail generation - we just want to swallow the exception, log, and continue. 2012-10-11 11:57:56 -04:00
Chris Dodge
2153aae62c schema change to better normalize asset->thumbnail relationships 2012-10-11 11:57:56 -04:00
Lyla Fischer
6378682201 thumnail image is a thumnail image 2012-10-11 11:57:56 -04:00
Lyla Fischer
83eeb1961a fixed erroneous order 2012-10-11 11:57:30 -04:00
Lyla Fischer
f26a4af75c thinks work, they just don't display prettily, and it is hard to actually use the assets due to links 2012-10-11 11:57:14 -04:00
Lyla Fischer
7791a7c4aa slight refactoring of the javascript 2012-10-11 11:56:53 -04:00
Lyla Fischer
d35ff48e5b fixed up some of the ajax feedback to display to the user 2012-10-11 11:56:53 -04:00
Lyla Fischer
65e3982fd2 things now upload 2012-10-11 11:56:53 -04:00
Tom Giannattasio
782e5f51e9 template for 404 and 500 errors 2012-10-11 09:58:35 -04:00
Calen Pennington
5eb0ca69e0 Merge pull request #858 from MITx/feature/cdodge/cas-crud-section-subsection 
a 'section' is actually a 'chapter' in previous nomenclature
 2012-10-11 06:55:12 -07:00
Chris Dodge
b77298b2ec a 'section' is actually a 'chapter' in previous nomenclature 2012-10-11 09:49:07 -04:00
Calen Pennington
bdf8a55a47 Merge pull request #852 from MITx/feature/cdodge/cas-crud-section-subsection 
Add basic section/subsection CRUD on the overview page
 2012-10-11 05:44:47 -07:00
Tom Giannattasio
8d78073a64 removed console logs 2012-10-10 15:52:49 -04:00
Tom Giannattasio
edc32e9db5 tweaks to new component animations 2012-10-10 15:46:59 -04:00
Tom Giannattasio
564c138bf5 white drag handles for components 2012-10-10 15:46:59 -04:00
Tom Giannattasio
8f488c3f7f added html icon 2012-10-10 15:46:59 -04:00
Tom Giannattasio
bbed49dbd3 styled log in and sign up errors; fixed expand/collapse transition bug 2012-10-10 15:46:59 -04:00
Tom Giannattasio
07ac0d0642 styled/tweaked users page 2012-10-10 15:46:59 -04:00
Tom Giannattasio
2efe4cf640 added ellipsis text overflow in unit tree 2012-10-10 15:45:52 -04:00
Tom Giannattasio
f98963aa8b tightened unit tree nesting 2012-10-10 15:45:51 -04:00
Tom Giannattasio
b95374c703 tightened unit treeview styles 2012-10-10 15:45:51 -04:00
Chris Dodge
7d235247e6 fix merge conflict 2012-10-10 13:55:22 -04:00
Chris Dodge
7107e3ee66 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cas-crud-section-subsection 
Conflicts:
	cms/static/js/base.js
 2012-10-10 13:50:22 -04:00
Calen Pennington
6e4fe502c7 Merge pull request #845 from MITx/feature/tomg/cas-static-tabs 
added static tab templates
 2012-10-10 10:48:51 -07:00
Chris Dodge
de3037558a Add basic section/subsection CRUD on the overview page 2012-10-10 13:45:36 -04:00
Calen Pennington
bfb49133d1 Merge pull request #843 from MITx/feature/cdodge/subsection-edit-page 
Feature/cdodge/subsection edit page
 2012-10-10 10:26:27 -07:00
Calen Pennington
c6cf4b5b61 Merge pull request #851 from MITx/feature/tomg/cas-edit-on-top 
moved component editor to top
 2012-10-10 10:07:29 -07:00
Calen Pennington
9ea3039b64 Wire component deletion back up 2012-10-10 12:49:53 -04:00
Calen Pennington
8b72de9afe Make it impossible to drag belowe New Component on views 2012-10-10 12:49:53 -04:00
Calen Pennington
95b3f0d7de Make component drag-and-drop a little nicer 2012-10-10 12:49:53 -04:00
Calen Pennington
6b3fbcf0e7 Wire up display name editor in unit editing view 2012-10-10 12:49:53 -04:00
Calen Pennington
7c3d5d58b7 Fix up how parent locations interact w/ draft mode when creating new units 2012-10-10 12:49:53 -04:00
Calen Pennington
2f675be20d Coerce location to Location when generating LMS link 2012-10-10 12:49:53 -04:00