Commits · 2f68cba24dd78c9e30acabb9a88c7cab8d6f42a9 · edx / edx-platform · GitLab

20 Feb, 2013 4 commits
- merged from master · 2f68cba2
  Arthur Barrett committed Feb 20, 2013
  
  2f68cba2 Browse Files
- Merge pull request #1515 from MITx/feature/btalbot/studio-pagechrome · 52caae2f
```
Adding in Studio Page headers and actions + help text
```
  Christina Roberts committed Feb 20, 2013
  52caae2f Browse Files
- Merge pull request #1517 from MITx/feature/zoldak/refactor-terrain · 7dd1515f
```
Refactor lettuce tests to move common stuff out of lms and cms and into common
```
  Jay Zoldak committed Feb 20, 2013
  7dd1515f Browse Files
- Change coverage report config to reflect refactoring of terrain files · 30edc380
  Jay Zoldak committed Feb 20, 2013
  
  30edc380 Browse Files
19 Feb, 2013 20 commits
- made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750 · 266e8951
  Brian Talbot committed Feb 19, 2013
  
  266e8951 Browse Files
- Pep8fix lettuce test code · db6fa9a3
  Jay Zoldak committed Feb 19, 2013
  
  db6fa9a3 Browse Files
- Remove portal (fake) app, move tests to courseware. · 040f840c
```
Comment out tests that don't run correctly without prerequisites.
```
  Jay Zoldak committed Feb 19, 2013
  040f840c Browse Files
- Move terrain module from lms to common. · 90969147
  Jay Zoldak committed Feb 19, 2013
  
  90969147 Browse Files
- Saving work in progress on annotations v2 with classification problems. · 34cc112c
  Arthur Barrett committed Feb 19, 2013
  
  34cc112c Browse Files
- Merge pull request #1466 from MITx/feature/ichuang/fix-idashboard-error-message · 821e2d06
```
Fix error message provided by Instructor dashboard datadump - make it more useful
```
  David Ormsbee committed Feb 19, 2013
  821e2d06 Browse Files
- Updated test to reflect new class name for course titles. · 8c423da6
  Jay Zoldak committed Feb 19, 2013
  
  8c423da6 Browse Files
- Update lettuce test with new button name for add new section. · 301d58d6
  Jay Zoldak committed Feb 19, 2013
  
  301d58d6 Browse Files
- Merge branch 'master' into feature/btalbot/studio-pagechrome · 585dff52
  Brian Talbot committed Feb 19, 2013
  
  585dff52 Browse Files
- studio - adding in info icon to page intro help and making icon classes… · fca98c19
```
studio - adding in info icon to page intro help and making icon classes consistent in all new references
```
  Brian Talbot committed Feb 19, 2013
  fca98c19 Browse Files
- Merge pull request #1510 from MITx/bug/btalbot/html-strongspan · 94a28f60
```
xmodule scss - resolved studio bug #191
```
  Christina Roberts committed Feb 19, 2013
  94a28f60 Browse Files
- Hook up "View Live" buttons and get "New Static Tab" working again. · 596de8ab
  cahrens committed Feb 19, 2013
  
  596de8ab Browse Files
- Merge pull request #1513 from MITx/feature/vik/improve-oe-ui · 0db6247d
```
Skip self assessment test (fails due to need for querydict for getlist t...
```
  VikParuchuri committed Feb 19, 2013
  0db6247d Browse Files
- Skip self assessment test (fails due to need for querydict for getlist to work,… · 9ee956a3
```
Skip self assessment test (fails due to need for querydict for getlist to work, but mocking querydict is painful)
```
  Vik Paruchuri committed Feb 19, 2013
  9ee956a3 Browse Files
- Merge pull request #1512 from MITx/fix/zoldak/coveragerc · 956789e5
```
Omit migrations from code coverage reports.
```
  Calen Pennington committed Feb 19, 2013
  956789e5 Browse Files
- Omit migrations from code coverage reports. · 2e85ba1a
```
Also omit portal and terrain, which are used for the lettuce testing framework.
```
  Jay Zoldak committed Feb 19, 2013
  2e85ba1a Browse Files
- Merge pull request #1484 from MITx/feature/vik/improve-oe-ui · f4addddf
```
Feature/vik/improve oe ui
```
  Diana Huang committed Feb 19, 2013
  f4addddf Browse Files
- xmodule scss - resolved some general span styling that would override basic em… · 6d2ada50
```
xmodule scss - resolved some general span styling that would override basic em or strong type styling
```
  Brian Talbot committed Feb 19, 2013
  6d2ada50 Browse Files
- Merge pull request #1506 from MITx/feature/btalbot/studio-softlanding · a62a575a
```
Soft Landing UI, Studio Nav Revamp, Sign In/Up Revisions
```
  Christina Roberts committed Feb 19, 2013
  a62a575a Browse Files
- Saving work-in-progress of guided classification exercise. · 72d9c1d7
  Arthur Barrett committed Feb 18, 2013
  
  72d9c1d7 Browse Files
15 Feb, 2013 16 commits
- Change url for login from login to signin. · cfa13922
  Don Mitchell committed Feb 15, 2013
  
  cfa13922 Browse Files
- studio - resolving base.js spacing/conflicts · 9eb02a8a
  Brian Talbot committed Feb 15, 2013
  
  9eb02a8a Browse Files
- Merge pull request #1480 from MITx/diana/staff-grading-flagging · 3e23b9e1
```
Flag submissions from staff grading view
```
  Diana Huang committed Feb 15, 2013
  3e23b9e1 Browse Files
- Reformat to 4 spaces. · 5acf9cb3
  cahrens committed Feb 15, 2013
  
  5acf9cb3 Browse Files
- Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into… · 2486ebc2
```
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
```
  cahrens committed Feb 15, 2013
  2486ebc2 Browse Files
- resolving local merge · 3c6caa61
  Brian Talbot committed Feb 15, 2013
  
  3c6caa61 Browse Files
- resolving local merge · 86d9f0b6
  Brian Talbot committed Feb 15, 2013
  
  86d9f0b6 Browse Files
- Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into… · 37e4cd81
```
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
```
  cahrens committed Feb 15, 2013
  37e4cd81 Browse Files
- resolving local merge problem · 93949ab3
  Brian Talbot committed Feb 15, 2013
  
  93949ab3 Browse Files
- resolving merge conflict and missing Sass mixin · a5e2b5c5
  Brian Talbot committed Feb 15, 2013
  
  a5e2b5c5 Browse Files
- Fix lettuce acceptance tests to reflect the new soft landing page changes. · 34a4b35e
  Jay Zoldak committed Feb 15, 2013
  
  34a4b35e Browse Files
- Removed console.log. · 9fb80ec3
  Arthur Barrett committed Feb 15, 2013
  
  9fb80ec3 Browse Files
- Moved the return link above the inline discussion and updated the header styling… · 24f519e3
```
Moved the return link above the inline discussion and updated the header styling so the hide annotations button is right-aligned with the help icon.
```
  Arthur Barrett committed Feb 15, 2013
  24f519e3 Browse Files
- Merge branch 'master' into feature/btalbot/studio-softlanding · b4932500
  cahrens committed Feb 15, 2013
  
  b4932500 Browse Files
- Merge pull request #1494 from MITx/feature/marco/addcomponent · dceb8fee
```
Feature/marco/addcomponent
```
  Christina Roberts committed Feb 15, 2013
  dceb8fee Browse Files
- Change hardcoded template names to the newer hardcoded template names · c4586edb
```
:-(
```
  Don Mitchell committed Feb 15, 2013
  c4586edb Browse Files