Commits · 596de8ab2cc14581a2e17600da9e89da717670de · edx / edx-platform · GitLab

19 Feb, 2013 1 commit
- Hook up "View Live" buttons and get "New Static Tab" working again. · 596de8ab
  cahrens committed Feb 19, 2013
  
  596de8ab Browse Files
15 Feb, 2013 20 commits
- studio - resolving base.js spacing/conflicts · 9eb02a8a
  Brian Talbot committed Feb 15, 2013
  
  9eb02a8a 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 19 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
- Move foldit app into the lms. No need for it in the cms, and it was breaking tests there.. · d7f9bdda
  Victor Shnayder committed Feb 14, 2013
  
  d7f9bdda Browse Files
- studio - final prep of introduction areas (with fix for current page content margins) · 9feb8100
  Brian Talbot committed Feb 14, 2013
  
  9feb8100 Browse Files
- resolving local merge conflict · bd98b272
  Brian Talbot committed Feb 14, 2013
  
  bd98b272 Browse Files
- studio - final prep of introduction areas (with fix for current page content margins) · c81f9587
  Brian Talbot committed Feb 14, 2013
  
  c81f9587 Browse Files
- studio - adding introduction areas to all templates and infrastructure for its contnet · 9b09d043
  Brian Talbot committed Feb 14, 2013
  
  9b09d043 Browse Files
- merge · 4f875760
  Victor Shnayder committed Feb 14, 2013
  
  4f875760 Browse Files
- Foldit integration. · 5e448465
```
  - 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.
```
  Victor Shnayder committed Feb 14, 2013
  5e448465 Browse Files
- Make hidden_module not cause 500 errors by adding a get_html() · fffbb559
  Victor Shnayder committed Feb 14, 2013
  
  fffbb559 Browse Files
- fix logger name in module_render · 21dab27e
  Victor Shnayder committed Feb 14, 2013
  
  21dab27e Browse Files
- updated modal copy and alt text · 859cfff8
  Mark L. Chang committed Feb 14, 2013
  
  859cfff8 Browse Files
- Merge pull request #1501 from MITx/feature/ned/fix-firefox-gradient-buttons · f9664284
```
Firefox doesn't draw the buttons right with -90deg, but will draw it rig...
```
  Ned Batchelder committed Feb 14, 2013
  f9664284 Browse Files
- Merge pull request #1409 from MITx/feature/valera/video_alpha · 1f61f6ce
```
Feature/valera/video alpha
```
  Carlos Andrés Rocha committed Feb 14, 2013
  1f61f6ce Browse Files