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

2914 Commits

Author SHA1 Message Date
chrisndodge
60d431aa69 Merge pull request #910 from MITx/feature/tomg/cas-toast-alerts 
changed save unit alerts to toast
 2012-10-15 08:08:10 -07:00
Tom Giannattasio
1cfde391ff changed save unit alerts to toast 2012-10-15 10:54:58 -04:00
Tom Giannattasio
44283497a8 removed log 2012-10-15 10:30:00 -04:00
Tom Giannattasio
168fccf7ae polished new course form 2012-10-15 10:21:39 -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
258a467fa6 make delete unit delete both the draft and non-draft versions 2012-10-13 20:55: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
4e4b6accda wip: create new course 2012-10-12 16:11:55 -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
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
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
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
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
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
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
51a19b3d7e transferred edge styles from cms to lms 2012-10-11 14:02:13 -04:00
Calen Pennington
d21c5761df Minor bug fixes from edge-configs merge 2012-10-11 12:49:48 -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
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
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
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
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