Commits · abdaeef9d8ba63aa64ef9ba747f63e930e16ecc4 · edx / edx-platform

07 Oct, 2013 4 commits

Hook up js to css classes · abdaeef9
Julian Arni committed Oct 07, 2013

abdaeef9 Browse Files

Studio: revises general layout/styling of import view and adds in detail… · 59af4457

Studio: revises general layout/styling of import view and adds in detail progress feedback after import (WIP)

Studio: removes import progress bar HTML and Sass; hides import status by default

Studio: revises import file upload success copy; sets up showing/hiding states for import status and additional messages

Studio: revises iconography and adds in success step in import status feedback

Studio: adds hidden styling back into import status UI

committed Oct 07, 2013

59af4457 Browse Files

Route ajax request to appropriate view, and show feedback only then · a1088275
```
Hook up view

Fix getStatus function
```
Julian Arni committed Oct 07, 2013
a1088275 Browse Files
Scaffolding for import progress reporting · c62691e9
Julian Arni committed Oct 07, 2013

c62691e9 Browse Files

04 Oct, 2013 22 commits
- Merge pull request #1220 from edx/jmclaus/bugfix_bypass_captions · 4bb9dcf1
```
Captions are now removed from tab order when hidden
```
  jmclaus committed Oct 04, 2013
  4bb9dcf1 Browse Files
- Merge branch 'release' · f095f3c8
  Julian Arni committed Oct 04, 2013
  
  f095f3c8 Browse Files
- Merge pull request #1227 from edx/jkarni/hotfix/safetar · 602eb876
```
Use wrapped tar extraction
```
  jkarni committed Oct 04, 2013
  602eb876 Browse Files
- Merge pull request #1228 from edx/nick/fix-customization-visibility · 5d995ddb
```
Bug fix - text_customization should not show in settings
```
  Nick Parlante committed Oct 04, 2013
  5d995ddb Browse Files
- Captions are now removed from tab order when hidden · 4f59e6bb
  jmclaus committed Oct 04, 2013
  
  4f59e6bb Browse Files
- Bug fix - text_customization should not show in settings · ad7c3f93
```
Also change test to not expect text_customization
```
  Nick Parlante committed Oct 04, 2013
  ad7c3f93 Browse Files
- Use wrapped tar extraction · dadc766f
```
Signed-off-by: Julian Arni <julian@edx.org>
```
  Julian Arni committed Oct 04, 2013
  dadc766f Browse Files
- Merge pull request #1226 from edx/will/use-lettuce-fork · e11bd1d9
```
Use a forked version of lettuce that fixes a bug with tag inheritance
```
  Will Daly committed Oct 04, 2013
  e11bd1d9 Browse Files
- Merge pull request #662 from edx/db/requirejs · 715aa698
```
requirejs in Studio
```
  David Baumgold committed Oct 04, 2013
  715aa698 Browse Files
- Merge pull request #1222 from edx/usman/lms1112-register-form-help-text · a47442ed
```
register.html: Corrected help text for username & name fields
```
  Usman Khalid committed Oct 04, 2013
  a47442ed Browse Files
- Merge pull request #1225 from edx/diana/fix-dashboard-error · ab74b4d5
```
Add in the static namespace to the new template
```
  Diana Huang committed Oct 04, 2013
  ab74b4d5 Browse Files
- Use a forked version of lettuce that fixes a bug with tag inheritence · b7b8a2da
  Will Daly committed Oct 04, 2013
  
  b7b8a2da Browse Files
- Convert Studio JS to use require.js · d97921e6
  David Baumgold committed Oct 04, 2013
  
  d97921e6 Browse Files
- Add in the static namespace to the new template · f51a99c9
  Diana Huang committed Oct 04, 2013
  
  f51a99c9 Browse Files
- Merge pull request #1008 from edx/fix/ichuang/inline-for-formulaequationinput · 94ce535f
```
add inline style flag to formulaequationinput
```
  Sarina Canelake committed Oct 04, 2013
  94ce535f Browse Files
- add inline style flag to formulaequationinput · 5b460ff6
  ichuang committed Oct 04, 2013
  
  5b460ff6 Browse Files
- Merge pull request #1219 from edx/will/run-individual-tests · 54ea98d2
```
Allow rake test to run individual tests again
```
  Will Daly committed Oct 04, 2013
  54ea98d2 Browse Files
- Merge pull request #1223 from edx/zoldak/fix-acceptance-text-customization · 2d17c00e
```
Modify acceptance tests to account for the new text_customization...
```
  Jay Zoldak committed Oct 04, 2013
  2d17c00e Browse Files
- Modify acceptance tests to account for the new text_customization capa field · cce37583
  Jay Zoldak committed Oct 04, 2013
  
  cce37583 Browse Files
- Merge pull request #1216 from edx/diana/dashboard-cleanup · 3ec8df9f
```
Some dasbhoard template cleanup
```
  Diana Huang committed Oct 04, 2013
  3ec8df9f Browse Files
- Update CHANGELOG · 361fbaff
  Diana Huang committed Oct 04, 2013
  
  361fbaff Browse Files
- Register.html: Corrected help text for username & name fields · f80a32e0
  Usman Khalid committed Oct 04, 2013
  
  f80a32e0 Browse Files
03 Oct, 2013 14 commits
- Merge pull request #1106 from edx/nick/customization · 32bf5b93
```
Targeted string customization in the lms UI
```
  Nick Parlante committed Oct 03, 2013
  32bf5b93 Browse Files
- Remove more unnecessary imports · 6bb2ba28
  Diana Huang committed Oct 03, 2013
  
  6bb2ba28 Browse Files
- Merge pull request #1218 from edx/zoldak/fix-file-matcher · 23dd1661
```
Fix the matcher for the word 'test' in the upload file step of tests
```
  Jay Zoldak committed Oct 03, 2013
  23dd1661 Browse Files
- Move more dashboard logic into the views · ed5168ec
  Diana Huang committed Oct 03, 2013
  
  ed5168ec Browse Files
- Allow rake test to run individual tests again · b0878d3d
  Will Daly committed Oct 03, 2013
  
  b0878d3d Browse Files
- Fix the matcher for the word 'test' in the upload file step of acceptance tests · 855d5d9e
  Jay Zoldak committed Oct 03, 2013
  
  855d5d9e Browse Files
- Merge pull request #1217 from edx/talbs/fix-studio-bodyclasses · d32611be
```
Studio: Fix - HTML <body> class regressions
```
  Brian Talbot committed Oct 03, 2013
  d32611be Browse Files
- Merge pull request #1195 from edx/sarina/more-ins-dash · 66b8e1fc
```
Sarina/more ins dash
```
  Sarina Canelake committed Oct 03, 2013
  66b8e1fc Browse Files
- Remove enrollment from Student Admin page of new instructor dash · 1251003d
  Sarina Canelake committed Oct 03, 2013
  
  1251003d Browse Files
- I18n Student Admin page of new instructor dash · d9f7f8cf
  Sarina Canelake committed Oct 03, 2013
  
  d9f7f8cf Browse Files
- Studio: adds JS/functionality dependent class to course updates <body> elem · 39b578c0
  Brian Talbot committed Oct 03, 2013
  
  39b578c0 Browse Files
- Merge pull request #945 from cpennington/use-wrap-child · e2b54b7a
```
Use wrap_child instead of replacing get_html
```
  Calen Pennington committed Oct 03, 2013
  e2b54b7a Browse Files
- Targeted string customization in the LMS UI · cca6876a
```
Add the text_customization dict in advanced settings, which contains
customizations checked in specific spots. Here it is used to enable
the customization of the "Check" and "Final Check" button titles
under the keys custom_check and custom_final_check.
```
  Nick Parlante committed Oct 03, 2013
  cca6876a Browse Files
- Switch get_html replacement out for using wrap_child · 230bf0c6
  Calen Pennington committed Oct 03, 2013
  
  230bf0c6 Browse Files