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

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Александр
f374a33606 added not hidden field 2012-10-10 20:54:17 +03: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
a9560cdfc7 Merge pull request #834 from MITx/feature/cale/cas-draft-mode 
CAS Draft Mode
 2012-10-10 09:50:13 -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
Calen Pennington
5f0e237ab0 Store the id of the publishing user on publish 2012-10-10 12:49:53 -04:00
Calen Pennington
208857ed4f Fix bug from rebase 2012-10-10 12:49:52 -04:00
Calen Pennington
b19627ccf3 Add configs for lms and lms preview running against mongo 2012-10-10 12:49:52 -04:00
Calen Pennington
ebf2f7de60 Make enum for unit states 2012-10-10 12:49:52 -04:00
Calen Pennington
0aa79ed479 Remove extraneous TODO comment 2012-10-10 12:49:52 -04:00
Calen Pennington
bd5d5f1419 Make location view state update as the state changes on the unit page 2012-10-10 12:49:52 -04:00
Tom Giannattasio
81b6d75796 tweaked disabled button 2012-10-10 12:49:52 -04:00
Calen Pennington
bfb5f333a9 Disable save draft button when there is nothing to save 2012-10-10 12:49:52 -04:00
Calen Pennington
28ea662855 Save a draft before publishing it 2012-10-10 12:49:52 -04:00
Calen Pennington
7ccdc5d42a Grey out inactive items when changing state in unit editing view 2012-10-10 12:49:52 -04:00
Calen Pennington
9d6a7ffed1 Link release dates message to correct subsection edit page 2012-10-10 12:49:52 -04:00
Calen Pennington
5dcf388b1c Add line numbers and wrapping to xml, json, and html editors 2012-10-10 12:49:52 -04:00
Calen Pennington
e99aa117d7 Make publish and unpublish recursive operations 2012-10-10 12:49:51 -04:00
Calen Pennington
b079b336db Make updating children and data of a draft make the correct checks for whether the document is already a draft or not 2012-10-10 12:49:51 -04:00
Calen Pennington
310f26a6de Basic implementation of draft, public and private modes 2012-10-10 12:49:51 -04:00
Calen Pennington
2b030f7aaf Clean up how tests use modulestores 2012-10-10 12:49:51 -04:00
Calen Pennington
05c02f0d5f Fixing tests from changes around draft mode 2012-10-10 12:49:51 -04:00
Calen Pennington
1585286c55 Pass onDelete to newly created ModuleEdit views 2012-10-10 12:49:51 -04:00
Calen Pennington
b6c93b61fd Mark published_date as system metadata 2012-10-10 12:49:51 -04:00
Calen Pennington
1328fc5ac0 Store published date in module metadata, and display it on draft pages 2012-10-10 12:49:51 -04:00
Calen Pennington
1a8532d8ad Make it possible to create, edit, and publish a draft 2012-10-10 12:49:51 -04:00
Calen Pennington
8da3723445 Clone the full item as a draft if it doesn't already exist when doing a draft editing operation 2012-10-10 12:42:15 -04:00
Calen Pennington
75f8b7c98d Add Draft module store that is used whenever any item is update in the CAS (but not during import, and not for templates) 2012-10-10 12:42:14 -04:00
Александр
42bd9e8b9e added test information 2012-10-10 19:36:03 +03:00
Александр
c4359b6f24 added crystresponse 2012-10-10 19:35:09 +03:00
Calen Pennington
bb50402b3f Merge pull request #850 from MITx/feature/jarv/staff-account 
Adding django-admin/rake command to set the staff bit
 2012-10-10 06:55:41 -07:00
John Jarvis
bd45dbd8d4 Adding django-admin/rake command to set the staff bit 2012-10-10 09:46:30 -04:00
Tom Giannattasio
5fd912baa9 moved component editor to top; polished editor styles 2012-10-10 09:41:47 -04:00
Tom Giannattasio
6d7fff1f50 fixed occassional stacking glitch on header 2012-10-10 09:41:47 -04:00
arjun810
c38aec5ba2 Merge pull request #849 from MITx/kimth/fix-html-js 
Don't function call on null
 2012-10-09 21:16:46 -07:00
kimth
61b3857134 Don't function call on null 2012-10-10 03:46:17 +00:00
Carlos Andrés Rocha
386480905f Fix openid provider URL matching for usernames with non-word characters 2012-10-09 17:48:46 -04:00
Calen Pennington
6079c57111 Merge pull request #846 from MITx/feature/tomg/waiting-class 
waiting class added
 2012-10-09 12:39:10 -07:00
Tom Giannattasio
9cb6331c06 removed users template 2012-10-09 15:32:23 -04:00
Calen Pennington
008b8a686d Merge pull request #844 from MITx/feature/cdodge/cms-unified-user-database 
adhere to the naming conventions of user groups (instructor_* and staff_...
 2012-10-09 12:29:30 -07:00
Tom Giannattasio
002f813b75 pulled spinner out into its own class in case we need to add it directly 2012-10-09 15:28:53 -04:00
Tom Giannattasio
2441f8960e added waiting classes 2012-10-09 15:26:12 -04:00