Commits · f9637ec1356db642b0ea9b9cefe23642aa98e770 · edx / edx-platform

21 Apr, 2016 11 commits
- Revert "clear existing assets before copying new assets" · f9637ec1
  Kevin Falcone committed Apr 21, 2016
  
  f9637ec1 Browse Files
- Merge pull request #12206 from CredoReference/impossible-to-click-check-without-answer · 67c055e2
```
Make it impossible to click "final check" without selecting a choice
```
  Diana Huang committed Apr 21, 2016
  67c055e2 Browse Files
- Merge pull request #12051 from edx/attiya/safe-templates · fb83cd71
```
Safe Templates
```
  attiyaIshaque committed Apr 21, 2016
  fb83cd71 Browse Files
- Merge pull request #12176 from edx/robrap/linter-javascript · 74346430
```
TNL-4325: Linter Enhancements for JavaScript files
```
  Robert Raposa committed Apr 21, 2016
  74346430 Browse Files
- Merge pull request #12211 from edx/ned/update-translations · c669daa9
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Apr 21, 2016
  c669daa9 Browse Files
- Safe Templates · 002ad84d
  attiyaishaque committed Apr 21, 2016
  
  002ad84d Browse Files
- Merge pull request #12209 from edx/mushtaq/ora2_release · 2291e213
```
ORA2 Version 1.1.4 Release
```
  Mushtaq Ali committed Apr 21, 2016
  2291e213 Browse Files
- Update translations (autogenerated message) · 2248bc6c
  Ned Batchelder committed Apr 21, 2016
  
  2248bc6c Browse Files
- Merge pull request #12192 from edx/revert-12191-revert-12106-awais786/ECOM-3199-xseries-certs-view · a3fcc933
```
Revert "Revert "Adding background image for xseries certificates on dashboard side bar panel""
```
  Awais Qureshi committed Apr 21, 2016
  a3fcc933 Browse Files
- edx-ora2 release version 1.1.4 update · 8e93c69e
  Mushtaq Ali committed Apr 21, 2016
  
  8e93c69e Browse Files
- Enhance Mako linting · d1bda204
```
- Lint JavaScript context for JavaScript violations
- Lint for Mako specific JavaScript rules
- Skip commented lines
- Change unicode to decode.utf8
- Count lint violations
```
  Robert Raposa committed Apr 21, 2016
  d1bda204 Browse Files
20 Apr, 2016 15 commits
- Make it impossible to click "final check" without selecting a choice · 61127b61
  Dmitry Viskov committed Apr 21, 2016
  
  61127b61 Browse Files
- Add JavaScript linting rules · 11982461
```
- check proper use of JQuery functions
- check for concatenation with HTML strings
- add sort for output
- lint CoffeeScript
```
  Robert Raposa committed Apr 20, 2016
  11982461 Browse Files
- Merge pull request #12074 from edx/derf/clear_existing_assets_before_copying_new_assets · b6d5c614
```
clear existing assets before copying new assets
```
  Kevin Falcone committed Apr 20, 2016
  b6d5c614 Browse Files
- Merge pull request #12152 from edx/cdyer/oauth-toolkit-allow-inactive · f1c4a449
```
Fix django-oauth-toolkit email and inactive user issues
```
  Cliff Dyer committed Apr 20, 2016
  f1c4a449 Browse Files
- Merge pull request #12146 from… · 72c058f2
```
Merge pull request #12146 from edx/muddasser/updated_ff/sel_253/test_youtube_id_w_different_local_server_sub

fixed button click issue while repacing subtitles.
```
  Muddasser committed Apr 20, 2016
  72c058f2 Browse Files
- Merge pull request #12202 from edx/adam/fix-pre-1900-course-setting-date · 96cbc7c5
```
fix issue with pre-1900 course setting dates (TNL-4397)
```
  Adam committed Apr 20, 2016
  96cbc7c5 Browse Files
- Merge pull request #11810 from CredoReference/making-asides-values-db-driven · 498f3877
```
Dynamic values for the selectboxes with tags (tags are stored in the database tables)
```
  Calen Pennington committed Apr 20, 2016
  498f3877 Browse Files
- Merge pull request #12140 from edx/fix-certificate-query · 49173191
```
Fix certificate query
```
  Adam committed Apr 20, 2016
  49173191 Browse Files
- fix issue with pre-1900 course setting dates (TNL-4397) · 26377a57
  Adam Palay committed Apr 20, 2016
  
  26377a57 Browse Files
- Revert "Revert "Adding background image for xseries certificates on dashboard side bar panel"" · 88192fd4
  Adam committed Apr 20, 2016
  
  88192fd4 Browse Files
- Dynamic values for the selectboxes with tags (tags are stored in the database tables) · 18360657
  Dmitry Viskov committed Apr 20, 2016
  
  18360657 Browse Files
- update query for whitelisted users who haven't yet had certs run for them · 9a4f80e5
```
remove CertificateStatuses.regenerating
```
  Adam Palay committed Apr 20, 2016
  9a4f80e5 Browse Files
- truncate email from addresses if >320 chars when encoded (TNL-4264) (#12171) · bb5874d5
```
* truncate email from addresses if >320 chars when encoded (TNL-4264)

* use exact lengths
```
  Adam committed Apr 20, 2016
  bb5874d5 Browse Files
- Merge pull request #12175 from edx/benp/sel-253-ff42-fix-edit-test · 85453fb0
```
fix flaky condition in education dropdown.
```
  Ben Patterson committed Apr 20, 2016
  85453fb0 Browse Files
- fix flaky test for oauth redirects (TNL-4190) (#12187) · 95ae2557
  Adam committed Apr 20, 2016
  
  95ae2557 Browse Files
19 Apr, 2016 10 commits
- Merge pull request #11941 from CredoReference/invalid-order-in-problem-grade-report-csv · 47e4804b
```
EdX problem grade report doesn't order problems as shown in course
```
  Eric Fischer committed Apr 19, 2016
  47e4804b Browse Files
- Merge pull request #12191 from edx/revert-12106-awais786/ECOM-3199-xseries-certs-view · 15229ce9
```
Revert "Adding background image for xseries certificates on dashboard side bar panel"
```
  Jesse Zoldak committed Apr 19, 2016
  15229ce9 Browse Files
- Revert "Adding background image for xseries certificates on dashboard side bar panel" · 27081410
  Jesse Zoldak committed Apr 19, 2016
  
  27081410 Browse Files
- Merge pull request #12038 from edx/sstudent/seq_item_title_ · adcf4a98
```
Displaying title of item in course sequence tooltip instead of list of item's children
```
  sanfordstudent committed Apr 19, 2016
  adcf4a98 Browse Files
- Merge pull request #11808 from CredoReference/adapt-asides-to-be-exported-to-xml · b2dace80
```
Adaptation asides to be exported to the XML
```
  Calen Pennington committed Apr 19, 2016
  b2dace80 Browse Files
- Merge pull request #12173 from edx/renzo/upgrade-management-commands · c643bdf7
```
Upgrade edx-management-commands to 0.1.1
```
  Renzo Lucioni committed Apr 19, 2016
  c643bdf7 Browse Files
- displaying title of sequence item in tooltip instead of children · bbcec0cf
  Sanford Student committed Apr 19, 2016
  
  bbcec0cf Browse Files
- Merge pull request #12144 from Ayub-Khan/SUST-35-course_key_from_string_or_404 · 0becea94
```
SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404
```
  Ayub khan committed Apr 19, 2016
  0becea94 Browse Files
- fix flaky oauth test (#12168) · e8963598
  Adam committed Apr 19, 2016
  
  e8963598 Browse Files
- -fixed Tests. · 66f52ba6
  Ayub-khan committed Apr 19, 2016
  
  66f52ba6 Browse Files
18 Apr, 2016 4 commits
- Merge pull request #12106 from edx/awais786/ECOM-3199-xseries-certs-view · 298770e5
```
Adding background image for xseries certificates on dashboard side bar panel
```
  Awais Qureshi committed Apr 18, 2016
  298770e5 Browse Files
- Merge pull request #12178 from… · 75c0ec61
```
Merge pull request #12178 from edx/tasawer/story/ecom-3201-handle-empty-list-of-courses-and-programs

Updated dashboard UI for empty list of courses and programs
```
  tasawernawaz committed Apr 18, 2016
  75c0ec61 Browse Files
- ECOM-3201 · b4e1e971
```
Updated dashboard UI for empty list of courses and programs
```
  tasawernawaz committed Apr 18, 2016
  b4e1e971 Browse Files
- Adding background image for xseries certificates on programs dashboard side bar panel. · 54058f6e
```
ECOM-3199
```
  Awais committed Apr 18, 2016
  54058f6e Browse Files