Commits · 293ac9277adbe0aed1fe81d48cdb2eb7f1d1774e · edx / edx-platform · GitLab

24 Oct, 2014 1 commit
- show warning on navigate away from import page only for first two stages · 293ac927
```
TNL-554
```
  zubair-arbi committed Oct 24, 2014
  293ac927 Browse Files
23 Oct, 2014 13 commits
- Merge pull request #5689 from edx/zoldak/solano-gitignore · 3185dc48
```
Add Solano Labs tddium artifacts to gitignore
```
  Ben Patterson committed Oct 23, 2014
  3185dc48 Browse Files
- Merge pull request #5633 from edx/ahodges/doc/DOC1001 · a3ab2ed7
```
Course keys use key introspection
```
  Alison Hodges committed Oct 23, 2014
  a3ab2ed7 Browse Files
- Course keys use key introspection · 01cd160e
```
@brianhw, @watsonemily, @srpearce, and @stroilova, please review.
Question: is there an impact on CommentThread.commentable_id for
discussion threads?
```
  Alison Hodges committed Oct 23, 2014
  01cd160e Browse Files
- Merge branch 'release' · 61436ea1
  stephensanchez committed Oct 23, 2014
  
  61436ea1 Browse Files
- Merge pull request #5660 from edx/ahodges/doc/relnotes20141021 · bfcffd2d
```
Ahodges/doc/relnotes20141021
```
  Alison Hodges committed Oct 23, 2014
  bfcffd2d Browse Files
- Release notes for 23 Oct 2014 · 7026aa40
```
initial draft
```
  Alison Hodges committed Oct 23, 2014
  7026aa40 Browse Files
- Merge pull request #5667 from lduarte1991/lduarte-harvardx-pr33 · 14209c67
```
Annotation Tools: Upgrading Share plugin from v1.0 to v1.1
```
  David Baumgold committed Oct 23, 2014
  14209c67 Browse Files
- Merge pull request #5694 from edx/sylvia/docs/DOC-842 · 46b2f0d7
```
Add note about provisional status to annotation problem type
```
  srpearce committed Oct 23, 2014
  46b2f0d7 Browse Files
- Add note about provisional status to annotation problem type · c9229108
  Sylvia Pearce committed Oct 23, 2014
  
  c9229108 Browse Files
- Merge pull request #5698 from edx/tim/django-1.4.16 · 8fbdf712
```
Update django version to 1.4.16
```
  Tim Babych committed Oct 23, 2014
  8fbdf712 Browse Files
- Merge pull request #5518 from edx/anton/requirejs-optimizer · b12aa0b1
```
Add RequireJS Optimizer.
```
  Anton Stupak committed Oct 23, 2014
  b12aa0b1 Browse Files
- Merge pull request #5545 from edx/oleg/lms-dashboard-course-start-time · f550359d
```
Add course start/end time to student dashboard.
```
  Oleg Marshev committed Oct 23, 2014
  f550359d Browse Files
- Update django version to 1.4.16 · 693089e4
  Tim Babych committed Oct 23, 2014
  
  693089e4 Browse Files
22 Oct, 2014 26 commits
- Merge pull request #5687 from edx/sanchez/no-donations-for-microsites · 3775efae
```
Adding an additional check to avoid donations showing up for microsites.
```
  Stephen Sanchez committed Oct 22, 2014
  3775efae Browse Files
- Merge pull request #5691 from edx/ahodges/doc/country_required · 72becf59
```
Registration page images out of date
```
  Alison Hodges committed Oct 22, 2014
  72becf59 Browse Files
- Change design to check for min price or suggested prices. · 128d4836
  stephensanchez committed Oct 22, 2014
  
  128d4836 Browse Files
- Merge pull request #5657 from edx/tim/mktg-iframe-trim · ffd64212
```
TNL-281: reduce amount of JS in marketing iframe
```
  Tim Babych committed Oct 22, 2014
  ffd64212 Browse Files
- Registration page images out of date · 08660da8
  Alison Hodges committed Oct 22, 2014
  
  08660da8 Browse Files
- Merge pull request #5688 from edx/cdodge/use-platform-name · 817db223
```
Dont use site_name, use platform_name in the shopping cart flow template
```
  chrisndodge committed Oct 22, 2014
  817db223 Browse Files
- pep8 error. · de4a2191
  stephensanchez committed Oct 22, 2014
  
  de4a2191 Browse Files
- Add Solano Labs tddium artifacts to gitignore · ff2f226b
  Jesse Zoldak committed Oct 22, 2014
  
  ff2f226b Browse Files
- Dont use site_name, use platform_name in the shopping cart flow template · f463aca9
  Chris Dodge committed Oct 22, 2014
  
  f463aca9 Browse Files
- Adding an additional check to avoid donations showing up for microsites. · d5966b1e
  stephensanchez committed Oct 22, 2014
  
  d5966b1e Browse Files
- Merge pull request #5532 from edx/adam/disable-pycontracts-on-startup · 7e12e401
```
disable pycontracts except in development environments (PLAT-122)
```
  Adam committed Oct 22, 2014
  7e12e401 Browse Files
- Merge pull request #5686 from edx/benp/tddium-timeout · ed59dfbc
```
Increase overall build timeout.
```
  Ben Patterson committed Oct 22, 2014
  ed59dfbc Browse Files
- TNL-281: reduce amount of JS in marketing iframe · fc6cb502
  Tim Babych committed Oct 22, 2014
  
  fc6cb502 Browse Files
- Increase overall build timeout. · 8d574a25
  Ben Patterson committed Oct 22, 2014
  
  8d574a25 Browse Files
- Merge pull request #5673 from rocha/fix-course-structure-command · 578f5b62
```
Fix dump course structure when element metadata uses opaque keys.
```
  Carlos Andrés Rocha committed Oct 22, 2014
  578f5b62 Browse Files
- Merge pull request #5654 from edx/christina/visible_graded_content · d4531201
```
Tests for conditional content (split_test module).
```
  Christina Roberts committed Oct 22, 2014
  d4531201 Browse Files
- Fix dump course structure when element metadata uses opaque keys. · a1a7504f
```
Make sure that during the serialization, all opaque keys and their
references and serialized using the `unicode` function.

AN-3821
```
  Carlos Andrés Rocha committed Oct 22, 2014
  a1a7504f Browse Files
- Tests for conditional content (split_test module). · c09632ef
```
TNL-39
```
  cahrens committed Oct 22, 2014
  c09632ef Browse Files
- Merge pull request #5598 from edx/anton/maintenance-fonts · ce4fb60b
```
Maintenance page: Serving Fonts through Platform Assets
```
  Anton Stupak committed Oct 22, 2014
  ce4fb60b Browse Files
- Merge pull request #5678 from edx/cdodge/shoppingcart-rewrite-hotfix1 · 228c513d
```
css fix of remove icon and Fixed a bug where the discount coupon applied...
```
  chrisndodge committed Oct 22, 2014
  228c513d Browse Files
- Merge pull request #5649 from edx/dhm/update_ok · 00ca7cbd
```
Update opaque_keys to new release
```
  Don Mitchell committed Oct 22, 2014
  00ca7cbd Browse Files
- Merge pull request #5653 from edx/dhm/PLAT-189 · 2ac069a6
```
Add command line command to create course in either split or mongo
```
  Don Mitchell committed Oct 22, 2014
  2ac069a6 Browse Files
- Use DATE_TIME format for course start or end time in student dashboard. · 21056b95
  Oleg Marshev committed Oct 22, 2014
  
  21056b95 Browse Files
- Annotation Tool: Fix Share Plugin style and spacing · 976c3cb1
```
 - fixed parseInt issue

 - PR fixes
```
  lduarte1991 committed Oct 22, 2014
  976c3cb1 Browse Files
- Annotation Tools: Updated Share plugin from version 1.0 to v1.1 · deefe9b1
  lduarte1991 committed Oct 22, 2014
  
  deefe9b1 Browse Files
- Merge pull request #5672 from benpatterson/testeng/rebase-upstream · def3467e
```
Testeng/rebase upstream
```
  clytwynec committed Oct 22, 2014
  def3467e Browse Files