Brian Talbot
|
e157fd26c8
|
studio - manual policy editor: policy item spacing and overflow hidden on CodeMirror value fields
|
2013-02-20 14:58:19 -05:00 |
|
Brian Talbot
|
ef3492aa40
|
studio - resolving local merge
|
2013-02-20 14:48:21 -05:00 |
|
Brian Talbot
|
c7f5b74225
|
studio - manual policy editor: converting to new page layout and styling
|
2013-02-20 14:46:54 -05:00 |
|
Jay Zoldak
|
1ccf0d48a8
|
Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into feature/cas/manual-policy-merged
|
2013-02-20 14:30:49 -05:00 |
|
Jay Zoldak
|
05f32f4bc9
|
Update tests for the advanced policy settings feature.
Includes adding a method for css_click_at.
|
2013-02-20 14:30:39 -05:00 |
|
Brian Talbot
|
ad770a5ec8
|
studio - manual policy editor: converting to new page layout - WIP
|
2013-02-20 14:24:13 -05:00 |
|
Brian Talbot
|
453e249f16
|
studio - manual policy editor: converting to new page layout - WIP
|
2013-02-20 13:54:19 -05:00 |
|
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 |
|
Jay Zoldak
|
562fb67671
|
Remove portal (fake) app, move tests to courseware.
Comment out tests that don't run correctly without prerequisites.
|
2013-02-20 09:52:51 -05:00 |
|
Jay Zoldak
|
7495bd0ae4
|
Move terrain module from lms to common.
|
2013-02-20 09:52:32 -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 |
|
Christina Roberts
|
94a28f600b
|
Merge pull request #1510 from MITx/bug/btalbot/html-strongspan
xmodule scss - resolved studio bug #191
|
2013-02-19 09:09:47 -08:00 |
|
VikParuchuri
|
0db6247d96
|
Merge pull request #1513 from MITx/feature/vik/improve-oe-ui
Skip self assessment test (fails due to need for querydict for getlist t...
|
2013-02-19 08:15:42 -08:00 |
|
Vik Paruchuri
|
9ee956a397
|
Skip self assessment test (fails due to need for querydict for getlist to work, but mocking querydict is painful)
|
2013-02-19 11:05:43 -05:00 |
|
Calen Pennington
|
956789e510
|
Merge pull request #1512 from MITx/fix/zoldak/coveragerc
Omit migrations from code coverage reports.
|
2013-02-19 07:57:09 -08: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 |
|
Diana Huang
|
f4addddf42
|
Merge pull request #1484 from MITx/feature/vik/improve-oe-ui
Feature/vik/improve oe ui
|
2013-02-19 07:27:29 -08:00 |
|
Brian Talbot
|
6d2ada5084
|
xmodule scss - resolved some general span styling that would override basic em or strong type styling
|
2013-02-19 09:59:36 -05:00 |
|
Christina Roberts
|
a62a575a33
|
Merge pull request #1506 from MITx/feature/btalbot/studio-softlanding
Soft Landing UI, Studio Nav Revamp, Sign In/Up Revisions
|
2013-02-19 06:34:32 -08:00 |
|
Don Mitchell
|
cfa13922f5
|
Change url for login from login to signin.
|
2013-02-15 17:30:24 -05:00 |
|
Diana Huang
|
3e23b9e1f2
|
Merge pull request #1480 from MITx/diana/staff-grading-flagging
Flag submissions from staff grading view
|
2013-02-15 13:08:16 -08:00 |
|
cahrens
|
5acf9cb3d2
|
Reformat to 4 spaces.
|
2013-02-15 14:46:41 -05:00 |
|
cahrens
|
2486ebc22a
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-15 14:45:20 -05:00 |
|
Brian Talbot
|
86d9f0b65c
|
resolving local merge
|
2013-02-15 14:15:51 -05:00 |
|
cahrens
|
37e4cd81b1
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-15 14:15:03 -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 |
|
cahrens
|
b49325009a
|
Merge branch 'master' into feature/btalbot/studio-softlanding
|
2013-02-15 13:14:46 -05:00 |
|
Christina Roberts
|
dceb8fee5e
|
Merge pull request #1494 from MITx/feature/marco/addcomponent
Feature/marco/addcomponent
|
2013-02-15 10:13:24 -08:00 |
|
Don Mitchell
|
c4586edb2e
|
Change hardcoded template names to the newer hardcoded template names
:-(
|
2013-02-15 12:03:04 -05:00 |
|
Carlos Andrés Rocha
|
86865a6823
|
Merge pull request #1507 from MITx/bugfix/valera/video_alpha
Bugfix/valera/video alpha
|
2013-02-15 08:22:25 -08:00 |
|
Valera Rozuvan
|
c7679ea624
|
Removed debugging comments.
|
2013-02-15 18:12:53 +02:00 |
|
Valera Rozuvan
|
a0f46dae49
|
Fixed bug that prevented Firefox from playing HTML5 video content.
|
2013-02-15 18:10:14 +02: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 |
|
Victor Shnayder
|
cc7a97082a
|
Merge pull request #1468 from MITx/feature/ichuang/fix-module-staff-access-v2
fix module staff accesss - by has_access, not by user.is_staff
|
2013-02-14 12:08:56 -08:00 |
|
Victor Shnayder
|
cb37bf7326
|
Merge pull request #1504 from MITx/feature/victor/foldit-api
Better logging, and make view csrf exempt...
|
2013-02-14 12:05:04 -08:00 |
|
Victor Shnayder
|
723012b2bb
|
Better logging, and make view csrf exempt...
|
2013-02-14 14:50:18 -05:00 |
|
Chris Dodge
|
ea068d4aa8
|
add exporting of policy.json
|
2013-02-14 14:19:38 -05:00 |
|
Victor Shnayder
|
2388770c25
|
Merge pull request #1502 from MITx/feature/victor/foldit-api
Feature/victor/foldit api
|
2013-02-14 10:36:12 -08:00 |
|
Victor Shnayder
|
1108137dc3
|
Address Cale's comment--make property a simple class var
|
2013-02-14 13:24:21 -05:00 |
|