Jay Zoldak
301d58d648
Update lettuce test with new button name for add new section.
2013-02-19 13:31:11 -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
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
cahrens
596de8ab2c
Hook up "View Live" buttons and get "New Static Tab" working again.
2013-02-19 11:34:41 -05: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
Brian Talbot
9eb02a8a26
studio - resolving base.js spacing/conflicts
2013-02-15 16:57:42 -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
3c6caa611c
resolving local merge
2013-02-15 14:24:42 -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
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
c5d041a7a3
resolved local merge
2013-02-15 11:29:56 -05:00
Brian Talbot
995ec8db62
resolved local merge
2013-02-15 11:28:54 -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
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
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
Victor Shnayder
d7f9bdda66
Move foldit app into the lms. No need for it in the cms, and it was breaking tests there..
2013-02-14 13:23:58 -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
Victor Shnayder
4f8757600a
merge
2013-02-14 12:49:14 -05:00
Victor Shnayder
5e44846596
Foldit integration.
...
- ops view for the desktop app to talk to
- xmodule that talks to the foldit model and displays the student's state
- grading tweak to make grade updates from an external service work:
- Add an always_recalculate_grades property to XModuleDescriptor.
2013-02-14 12:45:06 -05:00
Victor Shnayder
fffbb55944
Make hidden_module not cause 500 errors by adding a get_html()
2013-02-14 12:45:01 -05:00
Victor Shnayder
21dab27ed6
fix logger name in module_render
2013-02-14 12:45:01 -05:00
