Commits · 9a10c322e621f11eeb70c8e5191b9cd5ac6416d3 · edx / edx-platform · GitLab

06 Feb, 2014 17 commits
- Merge pull request #2495 from edx/sarina/update-i18n-guide · 9a10c322
```
Update i18n coding guidelines
```
  Sarina Canelake committed Feb 06, 2014
  9a10c322 Browse Files
- Update i18n coding guidelines · 5f841f28
  Sarina Canelake committed Feb 06, 2014
  
  5f841f28 Browse Files
- Merge pull request #2505 from edx/db/resolve-dev-env-script · b9edc195
```
fixup create-dev-env.sh
```
  David Baumgold committed Feb 06, 2014
  b9edc195 Browse Files
- fixup create-dev-env.sh · c2736483
  David Baumgold committed Feb 06, 2014
  
  c2736483 Browse Files
- Merge pull request #2456 from edx/gprice/i18n-extract-dependency · e1c36aa5
```
Make assets:coffee a dependency of i18n:extract
```
  Greg Price committed Feb 06, 2014
  e1c36aa5 Browse Files
- Merge pull request #2501 from edx/db/clarify-test · 44d7d952
```
Minor test cleanup
```
  David Baumgold committed Feb 06, 2014
  44d7d952 Browse Files
- better pylint formatting · 698aedc3
  David Baumgold committed Feb 06, 2014
  
  698aedc3 Browse Files
- Clarify DATA_DIR path · 2d59d44b
  David Baumgold committed Feb 06, 2014
  
  2d59d44b Browse Files
- Merge branch 'master' of https://github.com/edx/edx-platform · 37fea91d
  hkim823 committed Feb 06, 2014
  
  37fea91d Browse Files
- Merge pull request #2476 from ionis-education-group/bodyclass-without-js · a41bdb46
```
Stop using JavaScript to set the body's CSS class
```
  Brian Talbot committed Feb 06, 2014
  a41bdb46 Browse Files
- Merge pull request #2494 from edx/feanil/fix_cms_gather_assets · 4636b270
```
Pull THEME_NAME from envs tokens if it's there.
```
  Feanil Patel committed Feb 06, 2014
  4636b270 Browse Files
- fixing create-dev-env.sh to use Brewfile · 70ca3a47
  hkim823 committed Feb 06, 2014
  
  70ca3a47 Browse Files
- Merge pull request #2417 from edx/ned/add-missing-people-to-authors · e64ab5e4
```
add missing people to AUTHORS
```
  Ned Batchelder committed Feb 06, 2014
  e64ab5e4 Browse Files
- Merge pull request #2492 from edx/will/really-fix-tab-nav-test · c82e4ede
```
Skip page check in promise for Tab Nav in bok-choy suite
```
  Will Daly committed Feb 06, 2014
  c82e4ede Browse Files
- Merge pull request #2490 from edx/will/disable-js-transcripts-test · 3336cc76
```
Disabled flaky JS transcript test
```
  Will Daly committed Feb 06, 2014
  3336cc76 Browse Files
- Skip page check in promise for Tab Nav in bok-choy suite · 28c33a4f
  Will Daly committed Feb 06, 2014
  
  28c33a4f Browse Files
- Disabled flaky JS transcript test · ac4d3e10
  Will Daly committed Feb 06, 2014
  
  ac4d3e10 Browse Files
05 Feb, 2014 23 commits
- Pull THEME_NAME from envs tokens if it's there. · 2aab8f89
```
If the FEATURES['USE_CUSTOM_THEME'] flag is set but the
'THEME_NAME' is not set.  We get a compilation error during
cms gather assets.
```
  Feanil Patel committed Feb 05, 2014
  2aab8f89 Browse Files
- add missing people to AUTHORS · f900e8bb
  Ned Batchelder committed Feb 05, 2014
  
  f900e8bb Browse Files
- Merge pull request #2468 from edx/marco/studio/fix/component-header-styling · 70f064e5
```
Added back in component header visual separation from component renderin...
```
  marcotuts committed Feb 05, 2014
  70f064e5 Browse Files
- Merge remote-tracking branch 'origin/release' · 716b789e
  Feanil Patel committed Feb 05, 2014
  
  716b789e Browse Files
- Merge pull request #2487 from edx/hotfix/feb-10-2014 · 84efae5d
```
Make receipt-ids actually generate UUIDs
```
  Feanil Patel committed Feb 05, 2014
  84efae5d Browse Files
- updated csscomb ordering for css properties, moving border above padding. · 799095fd
  marco committed Feb 05, 2014
  
  799095fd Browse Files
- Merge pull request #2431 from edx/will/ora-acceptance-tests-rebase · 4c2b7695
```
Peer-grading acceptance tests
```
  Will Daly committed Feb 05, 2014
  4c2b7695 Browse Files
- Merge pull request #2416 from Bachmann1234/fix_typo_in_data_readme · ea6543cc
```
Fix typo in data readme
```
  David Baumgold committed Feb 05, 2014
  ea6543cc Browse Files
- Merge pull request #2480 from edx/zoldak/increase_lettuce_script_timeout · 0acb18fe
```
Increase async script timeout in lettuce acceptance tests
```
  Jay Zoldak committed Feb 05, 2014
  0acb18fe Browse Files
- Make receipt-ids actually generate UUIDs · a0efe6e0
```
LMS-2192
```
  Julia Hansbrough committed Feb 05, 2014
  a0efe6e0 Browse Files
- Merge pull request #2484 from edx/feanil/fix_transfer_logic · 544b4961
```
Only move students if they aren't in the new course.
```
  Feanil Patel committed Feb 05, 2014
  544b4961 Browse Files
- Added stub XQueue server to bok_choy test suite. · 0a9b4ada
```
Added feedback check for AI-assessment test
Added peer assessment feedback test
Added tests for peer grading module
Added stub peer grading module service
Updated Studio/LMS page objects and tests to use bok-choy v0.1.0
Added LMS bok-choy tests from e2e repo
Add bok-choy tests for peer grading module, including calibration.
```
  Will Daly committed Feb 05, 2014
  0a9b4ada Browse Files
- Only move students if they aren't in the new course. · 3731144d
  Feanil Patel committed Feb 05, 2014
  
  3731144d Browse Files
- Merge pull request #2481 from edx/markhoeber/documentation/stud-1246 · 60f73af5
```
First draft, course start date changes
```
  Mark Hoeber committed Feb 05, 2014
  60f73af5 Browse Files
- Course start date documentation changes · 941d3a60
```
stud-1246
```
  Mark Hoeber committed Feb 05, 2014
  941d3a60 Browse Files
- Merge pull request #2467 from edx/will/clean-test-mongo-dbs · a2502d6e
```
Clean up Mongo databases created by the test suite.
```
  Will Daly committed Feb 05, 2014
  a2502d6e Browse Files
- Merge pull request #2479 from edx/will/update-bok-choy-for-a11y-fixes · 8c46d4c6
```
Bok-choy fixes (a11y, video player bug)
```
  Will Daly committed Feb 05, 2014
  8c46d4c6 Browse Files
- Increase async script timeout in lettuce acceptance tests · a4275e90
  Jay Zoldak committed Feb 05, 2014
  
  a4275e90 Browse Files
- Revert "If unit display name is non-empty string, change it to a defaul (STUD-1284)" · f4c6bd1b
```
This reverts commit b8da1c5b.
```
  Adam Palay committed Feb 05, 2014
  f4c6bd1b Browse Files
- If unit display name is non-empty string, change it to a defaul (STUD-1284) · b8da1c5b
  Adam Palay committed Feb 05, 2014
  
  b8da1c5b Browse Files
- Merge pull request #2434 from edx/christina/preview_handler · 235d10dd
```
preview_handler changes to support Locators
```
  Christina Roberts committed Feb 05, 2014
  235d10dd Browse Files
- don't show the add response button if responses are not allowed. · 42746856
```
JIRA: FOR-452
```
  jsa committed Feb 05, 2014
  42746856 Browse Files
- Merge pull request #2477 from edx/diana/fix-sequence-titles · 7acc1161
```
Prevent bad sequential titles
```
  Diana Huang committed Feb 05, 2014
  7acc1161 Browse Files