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

228 Commits

Author SHA1 Message Date
Chris Dodge
2aee549a76 don't show courses/create new course if account has not been activated. Also better error messaging on failed logins. Also redirect to index after signup. 2012-10-15 10:48:01 -04:00
Chris Dodge
13e23cbbab Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-bugs 
Conflicts:
	cms/templates/widgets/header.html
 2012-10-13 21:49:05 -04:00
Chris Dodge
ebf6d74776 Merge branch 'feature/cale/cms-master' into fix/cale/edge-bugs 
Conflicts:
	cms/static/js/base.js
 2012-10-13 21:44:15 -04:00
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
64240c441f Add date display when subsection date is set and section date isn't 2012-10-12 16:00:03 -04:00
Calen Pennington
623c756b9f Enable section and subsection reordering (with no drag between them) 2012-10-12 15:59:46 -04:00
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
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
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
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
Chris Dodge
14a1a7da31 allow importing of .tar.gz packages of courseware 2012-10-12 10:33:31 -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
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
Calen Pennington
af44d1c1cf Remove duplicate template definition 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
6da378e735 tweaked edge template to target students only 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
Lyla Fischer
6378682201 thumnail image is a thumnail image 2012-10-11 11:57:56 -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
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
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
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
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
bd5d5f1419 Make location view state update as the state changes on the unit page 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
310f26a6de Basic implementation of draft, public and private modes 2012-10-10 12:49:51 -04:00