Commits · 585dff521a77ac4219b1e4d7858bad42d736ee7e · edx / edx-platform · GitLab

19 Feb, 2013 11 commits
- 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
15 Feb, 2013 22 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
- 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
- studio - page headers: revised where new course form fields are placed in dashboard · cb127d47
  Brian Talbot committed Feb 15, 2013
  
  cb127d47 Browse Files
- resolved local merge · c5d041a7
  Brian Talbot committed Feb 15, 2013
  
  c5d041a7 Browse Files
- resolved local merge · 995ec8db
  Brian Talbot committed Feb 15, 2013
  
  995ec8db Browse Files
- Merge pull request #1507 from MITx/bugfix/valera/video_alpha · 86865a68
```
Bugfix/valera/video alpha
```
  Carlos Andrés Rocha committed Feb 15, 2013
  86865a68 Browse Files
- Removed debugging comments. · c7679ea6
  Valera Rozuvan committed Feb 15, 2013
  
  c7679ea6 Browse Files
- Fixed bug that prevented Firefox from playing HTML5 video content. · a0f46dae
  Valera Rozuvan committed Feb 15, 2013
  
  a0f46dae Browse Files
- resolving merge conflict with master · 20553b00
  Brian Talbot committed Feb 15, 2013
  
  20553b00 Browse Files
- studio - resolving merge from master · 6c954607
  Brian Talbot committed Feb 15, 2013
  
  6c954607 Browse Files
14 Feb, 2013 7 commits
- Merge pull request #1503 from MITx/fix/cdodge/export-policy-json · bfcc0559
```
add exporting of policy.json
```
  Don Mitchell committed Feb 14, 2013
  bfcc0559 Browse Files
- Merge pull request #1468 from MITx/feature/ichuang/fix-module-staff-access-v2 · cc7a9708
```
fix module staff accesss - by has_access, not by user.is_staff
```
  Victor Shnayder committed Feb 14, 2013
  cc7a9708 Browse Files
- Merge pull request #1504 from MITx/feature/victor/foldit-api · cb37bf73
```
Better logging, and make view csrf exempt...
```
  Victor Shnayder committed Feb 14, 2013
  cb37bf73 Browse Files
- Better logging, and make view csrf exempt... · 723012b2
  Victor Shnayder committed Feb 14, 2013
  
  723012b2 Browse Files
- add exporting of policy.json · ea068d4a
  Chris Dodge committed Feb 14, 2013
  
  ea068d4a Browse Files
- Merge pull request #1502 from MITx/feature/victor/foldit-api · 2388770c
```
Feature/victor/foldit api
```
  Victor Shnayder committed Feb 14, 2013
  2388770c Browse Files
- Address Cale's comment--make property a simple class var · 1108137d
  Victor Shnayder committed Feb 14, 2013
  
  1108137d Browse Files