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

10459 Commits

Author SHA1 Message Date
Jay Zoldak
2bde448fbb Change coverage report config to reflect refactoring of terrain files 2013-02-20 09:53:12 -05:00
Jay Zoldak
67c2bac68f Pep8fix lettuce test code 2013-02-20 09:53:02 -05:00
Christina Roberts
52caae2fee Merge pull request #1515 from MITx/feature/btalbot/studio-pagechrome 
Adding in Studio Page headers and actions + help text
 2013-02-20 06:44:16 -08:00
Jay Zoldak
30edc380e1 Change coverage report config to reflect refactoring of terrain files 2013-02-20 09:31:50 -05:00
Brian Talbot
266e8951a4 made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750 2013-02-19 17:18:09 -05:00
cahrens
6981ba4e3f Get Save and Cancel working. 2013-02-19 17:08:10 -05:00
Jay Zoldak
db6fa9a3aa Pep8fix lettuce test code 2013-02-19 16:46:32 -05:00
cahrens
d5903c0e60 Make HTML better formatted. 2013-02-19 15:14:05 -05:00
cahrens
167d07037d Merged, delete Ace. 2013-02-19 14:56:37 -05:00
Jay Zoldak
8c423da6db Updated test to reflect new class name for course titles. 2013-02-19 13:50:40 -05:00
Jay Zoldak
301d58d648 Update lettuce test with new button name for add new section. 2013-02-19 13:31:11 -05:00
cahrens
f91060d197 Merge branch 'master' into feature/cas/manual-policy 
Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py
 2013-02-19 13:27:35 -05:00
Brian Talbot
585dff521a Merge branch 'master' into feature/btalbot/studio-pagechrome 2013-02-19 12:27:49 -05:00
Brian Talbot
fca98c19a5 studio - adding in info icon to page intro help and making icon classes consistent in all new references 2013-02-19 12:13:08 -05:00
cahrens
596de8ab2c Hook up "View Live" buttons and get "New Static Tab" working again. 2013-02-19 11:34:41 -05:00
Jay Zoldak
2e85ba1a27 Omit migrations from code coverage reports. 
Also omit portal and terrain, which are used for the lettuce testing framework.
 2013-02-19 10:54:02 -05:00
Chris Dodge
1a2e794126 add test of inheritance on xmodule insert 2013-02-19 09:51:07 -05:00
Don Mitchell
cfa13922f5 Change url for login from login to signin. 2013-02-15 17:30:24 -05:00
Chris Dodge
66c91b704a init work. Export the 'draft' store under a distinct folder in the export. TBD: do the import from that directory as well. 2013-02-15 17:16:05 -05:00
Brian Talbot
9eb02a8a26 studio - resolving base.js spacing/conflicts 2013-02-15 16:57:42 -05:00
Calen Pennington
2bc3000156 Fix tests 2013-02-15 15:44:11 -05:00
cahrens
5acf9cb3d2 Reformat to 4 spaces. 2013-02-15 14:46:41 -05:00
Brian Talbot
3c6caa611c resolving local merge 2013-02-15 14:24:42 -05:00
Brian Talbot
93949ab342 resolving local merge problem 2013-02-15 14:12:46 -05:00
Brian Talbot
a5e2b5c53a resolving merge conflict and missing Sass mixin 2013-02-15 14:10:52 -05:00
Jay Zoldak
34a4b35e66 Fix lettuce acceptance tests to reflect the new soft landing page changes. 2013-02-15 14:07:46 -05:00
Brian Talbot
cb127d473d studio - page headers: revised where new course form fields are placed in dashboard 2013-02-15 11:40:06 -05:00
Brian Talbot
20553b00d3 resolving merge conflict with master 2013-02-15 09:32:38 -05:00
Brian Talbot
6c95460761 studio - resolving merge from master 2013-02-15 09:15:06 -05:00
cahrens
38632c52c3 Beginnings of Selenium test. 2013-02-14 17:36:37 -05:00
Don Mitchell
bfcc0559a7 Merge pull request #1503 from MITx/fix/cdodge/export-policy-json 
add exporting of policy.json
 2013-02-14 12:47:37 -08:00
Chris Dodge
ea068d4aa8 add exporting of policy.json 2013-02-14 14:19:38 -05:00
Brian Talbot
9feb810006 studio - final prep of introduction areas (with fix for current page content margins) 2013-02-14 13:16:10 -05:00
Brian Talbot
bd98b2726a resolving local merge conflict 2013-02-14 13:00:51 -05:00
Brian Talbot
c81f958788 studio - final prep of introduction areas (with fix for current page content margins) 2013-02-14 13:00:14 -05:00
Brian Talbot
9b09d043bd studio - adding introduction areas to all templates and infrastructure for its contnet 2013-02-14 12:49:58 -05:00
Mark L. Chang
859cfff870 updated modal copy and alt text 2013-02-14 12:42:17 -05:00
Brian Talbot
47c117bf03 studio - page headers: resolved new course update creation JS issue caused by new markup 2013-02-14 10:52:25 -05:00
Brian Talbot
1a1be106ae studio - page headers: added in view live links to course dashboard 2013-02-14 10:14:10 -05:00
Brian Talbot
2024f9eeca studio - page headers: added view course button to course outline 2013-02-14 09:48:19 -05:00
Brian Talbot
6ade6983ae studio - page headers: added in logic to style page actions' height based on title having a subtitle or not 2013-02-14 09:38:32 -05:00
Brian Talbot
ff0b85ed0d studio - manual policy editor: revised CodeMirror string color for JSON fields specifically 2013-02-14 09:24:16 -05:00
Brian Talbot
41dc655cce resolving local merge conflict 2013-02-14 09:03:46 -05:00
Brian Talbot
54cc51bccf studio - soft landing: changed strong elem colors to be more subtle since we're not using new nomenclature 2013-02-14 09:02:51 -05:00
Brian Talbot
557beea31f studio - hiding mast area for subsections 2013-02-14 09:00:57 -05:00
Mark L. Chang
b7e8335a19 switched taxonomy back to section/subsection/unit 2013-02-13 22:53:46 -05:00
cahrens
4ae691e88a Convert JSON that doesn't parse to String (unless object, array, or single quote). 2013-02-13 17:41:52 -05:00
Brian Talbot
d571c7791a studio - resetting Unit UI HTML back to prev version for now 2013-02-13 17:01:45 -05:00
Brian Talbot
c250bc8b59 studio - page headers: setting up needed future CSS 2013-02-13 16:59:56 -05:00
Brian Talbot
e23c99961d studio - page headers: completed basic styling and simple page set-ups 2013-02-13 15:03:26 -05:00