Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

2460 Commits

Author SHA1 Message Date
Tom Giannattasio
61ea9d3678 fixed log in header and overview search 2012-10-04 17:08:19 -04:00
Chris Dodge
fe42f6fd22 address pull request feedback 2012-10-04 14:00:25 -04:00
Chris Dodge
48d84c2e3d support reordering of units inside subsection list 2012-10-04 13:44:46 -04:00
Chris Dodge
d93bf63dff save display_name and subtitle metadata 2012-10-04 13:05:45 -04:00
Chris Dodge
322c4c0ba6 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/templates/widgets/units.html
 2012-10-04 11:03:37 -04:00
Chris Dodge
45b82f3a45 update creating a new unit to use an empty template. Also twiddle the units.html and base.js where we put the unit Location on the <li> element 2012-10-04 10:58:48 -04:00
chrisndodge
ab7377dc98 Merge pull request #819 from MITx/feature/cale/cas-unit-location-view 
Wire up the unit location display
 2012-10-04 07:57:11 -07:00
Tom Giannattasio
92e830df24 more explicit temporary status on landing page 2012-10-04 10:37:46 -04:00
Tom Giannattasio
6b4d9ba0cd setup landing template 2012-10-03 17:26:14 -04:00
Tom Giannattasio
ea1b7caf47 consistent field labels 2012-10-03 17:23:48 -04:00
Tom Giannattasio
277cc3433c added no-header class to login.html 2012-10-03 17:23:48 -04:00
Tom Giannattasio
d44d9ff2d1 tweaked signup template 2012-10-03 17:23:48 -04:00
Chris Dodge
1240325c69 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 
Conflicts:
	cms/static/js/base.js
 2012-10-03 16:24:38 -04:00
Chris Dodge
5390a19fc0 delete unit in overview and subsection_edit pages 2012-10-03 16:19:14 -04:00
Calen Pennington
a6cf7cb0c2 Merge pull request #817 from MITx/feature/tomg/cms-library 
Feature/tomg/cms library
 2012-10-03 12:21:55 -07:00
Calen Pennington
55d6aff4c1 Wire up the unit location display 2012-10-03 14:54:17 -04:00
Calen Pennington
d80c931772 Hook up the component delete button to the backend. Don't break if the process of updating a parent unit after deleting is interrupted (leaving a pointer to a missing module) 2012-10-03 14:24:11 -04:00
chrisndodge
153d5d69b1 Merge pull request #814 from MITx/feature/cale/cas-reorder-unit 
Enable reordering on the unit page
 2012-10-03 11:22:57 -07:00
Chris Dodge
711dc55c73 add subsection edit page to the project with a shared 'unit' widget that will render out unit lists. Both edit_subsection and overview.html will share this widget 2012-10-03 14:16:23 -04:00
Chris Dodge
ca3aecd6ad add subsection edit page to the project with a shared 'unit' widget that will render out unit lists. Both edit_subsection and overview.html will share this widget 2012-10-03 14:07:21 -04:00
Calen Pennington
bd7ea4424b Enable reordering on the unit page 2012-10-03 13:24:24 -04:00
Chris Dodge
a0b3fb0ec5 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 2012-10-03 12:40:55 -04:00
Tom Giannattasio
e7db2b5571 static asset library template 2012-10-03 11:27:15 -04:00
Chris Dodge
e24dcaead6 initial subsection page converted from static HTML mockup 2012-10-03 10:44:20 -04:00
Tom Giannattasio
f2be01fd8f removed visibility toggles; added private tag 2012-10-03 09:48:50 -04:00
Tom Giannattasio
44d4a4b0d9 started asset library template -wip 2012-10-02 17:02:47 -04:00
Chris Dodge
a570702ae3 add a new subsection edit url map and reference it in the course summary page 2012-10-02 16:22:26 -04:00
Calen Pennington
f637cc5723 Merge pull request #800 from MITx/feature/tomg/cms-release-flow 
private/public unit
 2012-10-02 09:15:28 -07:00
Calen Pennington
aff44b1f11 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2012-10-02 12:12:55 -04:00
Tom Giannattasio
76559af8f1 added wip tag to unit settings 2012-10-02 10:50:23 -04:00
Tom Giannattasio
423dbd17b5 new unit publish settings 2012-10-02 10:40:05 -04:00
chrisndodge
d108af8848 Merge pull request #799 from MITx/feature/cale/cms-codemirror-background 
Feature/cale/cms codemirror background
 2012-10-02 07:10:29 -07:00
Calen Pennington
55542c1d47 Make editor display immediately, and with a white background 2012-10-02 09:42:19 -04:00
Calen Pennington
2accc77944 Adding more WIP 2012-10-02 09:22:00 -04:00
Tom Giannattasio
8478f7af64 styled course list page 2012-10-01 16:37:24 -04:00
Tom Giannattasio
8f0b068459 styled log in form 2012-10-01 16:30:28 -04:00
Tom Giannattasio
265ab4366f removed visibility toggle from subsections in overview 2012-10-01 16:15:19 -04:00
Tom Giannattasio
d2549b6346 fixed header styles 2012-10-01 16:11:04 -04:00
Tom Giannattasio
4d985dc0c7 added release button; cleaned up toggle button 2012-10-01 15:51:29 -04:00
Calen Pennington
60e7914580 Add WIP markers 2012-10-01 15:28:12 -04:00
Calen Pennington
aa0aa65301 Clean up unit.html with layout/css from tom 2012-10-01 15:28:12 -04:00
Calen Pennington
96a914216c Fix up overview page with new design mockup 2012-10-01 15:28:12 -04:00
Calen Pennington
bfeccd88f8 Enable creation of new components 2012-10-01 15:28:07 -04:00
Calen Pennington
805798600b Clean up display of templates 2012-10-01 15:19:35 -04:00
Calen Pennington
8ca10a8356 Separate unit page from vertical implementation for editing 2012-10-01 15:19:35 -04:00
Calen Pennington
82a28f069d Make overview page conform to section/subsection/unit format. Breaks CMS editing of existing courses 2012-10-01 15:18:50 -04:00
Calen Pennington
ff002e35c2 Limit the depth of items to display on the overview 2012-10-01 15:17:41 -04:00
Calen Pennington
f53217e523 Add padding around courseware content 2012-10-01 15:17:40 -04:00
Calen Pennington
8a131446fe First pass at integrating the new unit editing wireframes with the CMS 2012-10-01 15:17:40 -04:00
Calen Pennington
c0ca7fe697 Make expansion/contraction work on overview page 2012-10-01 15:16:54 -04:00