Commits · 01064fcc79d0dafb3b115961c53950d9ea1d1ad8 · edx / edx-platform · GitLab

04 Feb, 2015 3 commits
- Fix logging calls to use unicode, and lazy logging · 01064fcc
  Sarina Canelake committed Feb 04, 2015
  
  01064fcc Browse Files
- Convert shopping cart to use unicode lazy logging · 0f45724c
```
Conflicts:
	lms/djangoapps/shoppingcart/views.py
```
  Sarina Canelake committed Feb 04, 2015
  0f45724c Browse Files
- Unicode fixes for log messages and other things · 4e733c6e
  Omar Al-Ithawi committed Feb 04, 2015
  
  4e733c6e Browse Files
03 Feb, 2015 15 commits
- Merge pull request #6820 from edx/clrux/forums-assign-regions · 6266dcf1
```
Assign regions/landmarks for easier navigation
```
  Chris committed Feb 03, 2015
  6266dcf1 Browse Files
- Merge pull request #6120 from edx/dkh/add-description-field · 3b6af2df
```
Backfill course_modes migration
```
  Diana Huang committed Feb 03, 2015
  3b6af2df Browse Files
- Backfill migration of course_modes to add the description field · dcbfb1d7
  Calen Pennington committed Feb 03, 2015
  
  dcbfb1d7 Browse Files
- Merge pull request #6814 from edx/benp/lms-one-shard · b6256def
```
LMS Acceptance to one shard.
```
  Ben Patterson committed Feb 03, 2015
  b6256def Browse Files
- Merge pull request #6876 from Stanford-Online/giulio/course-price-upstream · 41475d46
```
Add cosmetic price field to studio & logic
```
  Sarina Canelake committed Feb 03, 2015
  41475d46 Browse Files
- Add cosmetic price field to studio & logic · 560ce558
```
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
```
  Giulio Gratta committed Feb 03, 2015
  560ce558 Browse Files
- Merge pull request #6872 from edx/will/country-access-message-theme · 6fa7815f
```
Country access messaging theme fixup
```
  Will Daly committed Feb 03, 2015
  6fa7815f Browse Files
- Merge pull request #6849 from edx/marco/discussions-endorse/font-awesome-fix · e0610245
```
Fixes broken answer and endorse icons on discussion forums
```
  Marco Morales committed Feb 03, 2015
  e0610245 Browse Files
- Assigning regions to forum areas and adding ARIA to new post form · 66f909cd
  Chris Rodriguez committed Feb 03, 2015
  
  66f909cd Browse Files
- Merge pull request #6874 from edx/revert-6182-giulio/course-price-upstream · ebc86895
```
Revert "Add Cosmetic Display Price field to studio & logic to show it"
```
  Ben Patterson committed Feb 03, 2015
  ebc86895 Browse Files
- Revert "Add Cosmetic Display Price field to studio & logic to show it" · b71c20c0
  Ben Patterson committed Feb 03, 2015
  
  b71c20c0 Browse Files
- Update country access message end-points to be backwards compatible with embargo theme templates · ce9c258f
```
Move default country access messages out of static_templates, so they are not served by other Django views.
```
  Will Daly committed Feb 03, 2015
  ce9c258f Browse Files
- Merge pull request #6851 from edx/ned/fix-gettext-literals · b048d98e
```
Fix a number of incorrect translation string uses.
```
  Ned Batchelder committed Feb 03, 2015
  b048d98e Browse Files
- Fix a number of incorrect translation string uses · fb595c89
```
These were found by the new pylint checker I wrote! :)
```
  Ned Batchelder committed Feb 02, 2015
  fb595c89 Browse Files
- Merge pull request #6182 from Stanford-Online/giulio/course-price-upstream · db3d6fd9
```
Add Cosmetic Display Price field to studio & logic to show it
```
  Sarina Canelake committed Feb 02, 2015
  db3d6fd9 Browse Files
02 Feb, 2015 22 commits
- This test no longer follows modern workflows. Disabling. TE-736. · 6708ed8f
```
Also cleaning up some lint.
```
  Ben Patterson committed Feb 02, 2015
  6708ed8f Browse Files
- Fix test failing under one shard. · c83ea18d
```
This test consistently fails when combining
lms acceptance onto one shard. (TE-737)
```
  Ben Patterson committed Feb 02, 2015
  c83ea18d Browse Files
- LMS Acceptance to one shard. · 407e6ec7
```
We've transitioned many lettuce tests to bok-choy. It no longer
makes sense to keep LMS acceptance in two shards (each taking less
than 5 mins to run the actual tests).
```
  Ben Patterson committed Feb 02, 2015
  407e6ec7 Browse Files
- Merge pull request #6864 from edx/will/country-access-messaging · fd4ada25
```
ECOM-998: Country access messaging
```
  Will Daly committed Feb 02, 2015
  fd4ada25 Browse Files
- Add views to the embargo app to render messages explaining why students are blocked. · 82d7e25f
  Will Daly committed Feb 02, 2015
  
  82d7e25f Browse Files
- Merge pull request #6845 from edx/will/country-access-models · 19f676a8
```
Add new models to embargo to support country access
```
  Will Daly committed Feb 02, 2015
  19f676a8 Browse Files
- Merge pull request #5123 from IONISx/tusbar/enable-https-studio · 3570e474
```
Use HTTP_X_FORWARDED_PROTO header in studio
```
  Feanil Patel committed Feb 02, 2015
  3570e474 Browse Files
- Merge pull request #6862 from edx/clytwynec/disable_flaky_tests · 74ecb84f
```
disable PayAndVerifyTest.test_immediate_verification_enrollment
```
  Christine Lytwynec committed Feb 02, 2015
  74ecb84f Browse Files
- Add new models to embargo to support country access · a5867da9
```
Add Django admin UI for configuring country access

Migrate existing embargo rules into the new tables.
```
  Will Daly committed Feb 02, 2015
  a5867da9 Browse Files
- Use HTTP_X_FORWARDED_PROTO header in studio · 4789c5c9
  Bertrand Marron committed Feb 02, 2015
  
  4789c5c9 Browse Files
- disable PayAndVerifyTest.test_immediate_verification_enrollment · e90c6643
  Christine Lytwynec committed Feb 02, 2015
  
  e90c6643 Browse Files
- Merge pull request #6856 from edx/sarina/20150202-translations-update · 4b6c62a8
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Feb 02, 2015
  4b6c62a8 Browse Files
- Update translations (autogenerated message) · 67fbfdc8
  Sarina Canelake committed Feb 02, 2015
  
  67fbfdc8 Browse Files
- Merge pull request #6825 from edx/benp/bok-choy-4shards · 5e1cc887
```
Introduce another bok-choy shard.
```
  Ben Patterson committed Feb 02, 2015
  5e1cc887 Browse Files
- Merge pull request #6852 from edx/dcikatic/SOL-302-hide-reindex · 76010467
```
SOL-302 Hide reindex button if 'ENABLE_COURSEWARE_INDEX' false
```
  Martyn James committed Feb 02, 2015
  76010467 Browse Files
- Merge pull request #6847 from edx/mjames/search_setting · 98e92bfb
```
Default search engine to None
```
  Martyn James committed Feb 02, 2015
  98e92bfb Browse Files
- Merge pull request #6837 from edx/anton/fix-flaky-unit-test · 64b3768d
```
TNL-1298: Flaky Jasmine test for Student Notes.
```
  Anton Stupak committed Feb 02, 2015
  64b3768d Browse Files
- Merge pull request #6739 from edx/clrux/lms-navigation-accessibility-update · 2967f18d
```
Accessibility fixes for UX-1572
```
  Chris committed Feb 02, 2015
  2967f18d Browse Files
- SOL-302 Hide reindex button if 'ENABLE_COURSEWARE_INDEX' false · 772908d7
  Dino Cikatic committed Feb 02, 2015
  
  772908d7 Browse Files
- Merge pull request #6833 from edx/zub/bugfix/plat-420-fix-create_child-for-split · 1b96a597
```
don't add xblock with 'detached' tag as direct child of course for split...
```
  zubair-arbi committed Feb 02, 2015
  1b96a597 Browse Files
- TNL-1298: Flaky Jasmine test for Student Notes. · bf374069
  polesye committed Feb 02, 2015
  
  bf374069 Browse Files
- don't add xblock with 'detached' tag as direct child of course for split in 'create_child' method · 7d7cb785
```
PLAT-420
```
  zubair-arbi committed Feb 02, 2015
  7d7cb785 Browse Files