Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,532 Commits 1 Branch 0 Tags
8acbeec3add4e65149f2ccb9dbca44bbc4e4dfc0
Commit Graph

1401 Commits

Author SHA1 Message Date
cahrens
8acbeec3ad Comment out validation, update warning message. 2013-02-20 12:23:19 -05:00
cahrens
cbc0406df2 Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into feature/cas/manual-policy-merged 2013-02-20 10:57:35 -05:00
cahrens
305f0b2a54 Add number of spaces for formatting of JSON. 2013-02-20 10:56:49 -05:00
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
cahrens
6981ba4e3f Get Save and Cancel working. 2013-02-19 17:08:10 -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
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
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
Don Mitchell
cfa13922f5 Change url for login from login to signin. 2013-02-15 17:30:24 -05:00
cahrens
5acf9cb3d2 Reformat to 4 spaces. 2013-02-15 14:46:41 -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
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
Mark L. Chang
859cfff870 updated modal copy and alt text 2013-02-14 12:42:17 -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
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
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
0af6b991f0 studio - nav: generalizing is-selected styling 2013-02-13 13:40:46 -05:00
Brian Talbot
03e7d2e77b studio - soft landing: changing 'sign into' to 'sign in to' copy 2013-02-13 12:18:27 -05:00
Brian Talbot
b09c3b6aff studio - resolving local merge due to editor alias 2013-02-13 12:06:54 -05:00
Brian Talbot
d3e67be766 studio: nav - clicking anywhere but nav's dropdowns will close them, fixed link outline and is-selected styling 2013-02-13 12:03:30 -05:00
Don Mitchell
7f7fb60b7d Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 2013-02-13 11:53:42 -05:00
Don Mitchell
6e5968e2cd html changed; so, removed mostly meaningless comparison and fixed one. 2013-02-13 11:53:26 -05:00
Brian Talbot
3088e60d79 resolving local merge issues 2013-02-13 11:38:12 -05:00
Brian Talbot
fdd809409f studio - nav: resolved Firefox browser chrome page-shifting bug 2013-02-13 11:37:47 -05:00
Don Mitchell
f7e635a7cd fix npe w/ prev commit 2013-02-13 11:22:35 -05:00
Don Mitchell
4e3e2ec707 If user was trying to get to a specific page but had to log in, let them 
get to that page once they've logged in.
 2013-02-13 11:20:08 -05:00
Don Mitchell
3450c72833 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 2013-02-13 09:31:09 -05:00
Don Mitchell
6f3a954d7b howitworks is default home page if not logged in. Otherwise course 
index. NOTE: didn't fix old wrong behavior of going to index if not
logged in and tried to navigate to a specific page. Will work on that
next.
 2013-02-13 09:30:54 -05:00
Christina Roberts
0b91c1c346 Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates 
clean up templates that were removed from disk - we need to remove from ...
 2013-02-13 06:29:35 -08:00
Chris Dodge
fbe3d29f19 added tests 2013-02-13 09:25:09 -05:00
Brian Talbot
714f69a57e studio - resolving merge conflicts in settings from a recent rebase 2013-02-13 09:07:53 -05:00
Carlos Andrés Rocha
dff0c10b7a Merge pull request #1493 from MITx/bug/dhm/misc 
Fix broken test and don't pass time units as strings but as ints.
 2013-02-12 15:14:37 -08:00
Brian Talbot
fccb3d7a73 studio - nav and soft landing various QA fixes 2013-02-12 17:36:36 -05:00
Don Mitchell
c904174bb7 Fix broken test and don't pass time units as strings but as ints. 2013-02-12 17:30:57 -05:00
Brian Talbot
0a2b74110e studio - nav and soft landing various QA fixes 2013-02-12 17:03:48 -05:00
Don Mitchell
d569c559ca Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/views/settings/main_settings_view.js
	cms/templates/index.html
	cms/templates/settings.html
 2013-02-12 16:57:00 -05:00
chrisndodge
af364166fe Merge pull request #1491 from MITx/bug/dhm/misc 
lms required grace period fields to be in specific order
 2013-02-12 12:42:53 -08:00
cahrens
f56729dbdb Turn off line wrapping. 2013-02-12 15:27:38 -05:00
Don Mitchell
76d675ba16 fix npe for time (bug 185) 2013-02-12 15:20:02 -05:00
Brian Talbot
dd50313f82 studio - revised manual policy editor scss to have value field height match key values' and condensed error message UI 2013-02-12 15:19:08 -05:00
Don Mitchell
40668133f7 Fix bug which I know I fixed before (perhaps on another branch?) to 
ensure old time had a value before comparing it to new time.
 2013-02-12 15:11:35 -05:00
Brian Talbot
540710f553 studio - nav revamp: added in dynamic course org and number to header 2013-02-12 14:22:42 -05:00