Commits · ea6812e954653e65c98b9184f22ca9489d1ff8be · OpenEdx / edx-platform · GitLab

08 Jul, 2016 2 commits
- Update version of XBlock repo. · ea6812e9
  John Eskew committed Jul 08, 2016
  
  ea6812e9 Browse Files
- Change test to reflect how XBlock handles control chars. · 1131edc9
  John Eskew committed Jul 08, 2016
  
  1131edc9 Browse Files
28 Jun, 2016 25 commits
- Merge pull request #12831 from cpennington/xunit-only-in-ci · b31d1cb8
```
Clean up paver arguments
```
  Calen Pennington committed Jun 28, 2016
  b31d1cb8 Browse Files
- Merge pull request #12886 from edx/release-2016-06-28-conflict · 2b7866bf
```
Merge release into master
```
  Jeremy Bowman committed Jun 28, 2016
  2b7866bf Browse Files
- Remove MaxScoresCache (#12878) · f22d6739
```
Performance improvement, this cache is no longer needed thanks
to block_structure caching data.

TNL-4874
```
  Eric Fischer committed Jun 28, 2016
  f22d6739 Browse Files
- Remove the --pdb option, because it was just a passthrough to nose · 0e90567f
  Calen Pennington committed Jun 28, 2016
  
  0e90567f Browse Files
- Merge pull request #12667 from edx/kkim/tz_pref_AS · d0be769f
```
Time Zone in Account Settings
```
  Kevin Kim committed Jun 28, 2016
  d0be769f Browse Files
- Merge remote-tracking branch 'origin/release' into release-2016-06-28-conflict · 225768ac
  Jeremy Bowman committed Jun 28, 2016
  
  225768ac Browse Files
- ECOM-4219 - Add the course states to course cards and make sure the display… · 4911bf80
```
ECOM-4219 - Add the course states to course cards and make sure the display follows course states (#12844)

Please enter the commit message for your changes. Lines starting
```
  Simon Chen committed Jun 28, 2016
  4911bf80 Browse Files
- Merge pull request #12863 from edx/rc/2016-06-28 · 17fb156b
```
Release Candidate rc/2016-06-28
```
  Jeremy Bowman committed Jun 28, 2016
  17fb156b Browse Files
- Pwattenberger/sailthru enroll (#12816) · aa078dfd
```
* Partial changes for purchase tracking

* Continued changes for purchase tracking

* Clean up code quality issues

* Clean up code quality issues

* Responses to code review

* Fix code quality flaged issues

* Fix code quality flaged issues

* Fix code quality flaged issues

* Fix problem processing sailthru_content cookie
```
  PaulWattenberger committed Jun 28, 2016
  aa078dfd Browse Files
- Push defaults up to option definition to limit option-parsing repetitiveness · 81d347d9
  Calen Pennington committed Jun 28, 2016
  
  81d347d9 Browse Files
- Only generate xunit files during CI builds, so that pudb works during development · 2690c044
  Calen Pennington committed Jun 28, 2016
  
  2690c044 Browse Files
- Covert all paver command manipulation to happen on lists of args/options, rather than strings · 6b61bc44
  Calen Pennington committed Jun 28, 2016
  
  6b61bc44 Browse Files
- Added time zone field to user account settings, currently hidden behind a feature flag. · 059985b9
  Kevin Kim committed Jun 28, 2016
  
  059985b9 Browse Files
- Combine get_course_blocks() calls for grading performance (#12877) · 664cafc9
```
When getting progress, we need these blocks in two locations. They
do not need to be individually fetched.
```
  Eric Fischer committed Jun 28, 2016
  664cafc9 Browse Files
- Merge pull request #12819 from edx/muddasser/acceptance/setup.py · acef4fa2
```
Changed setup.py to ensure page objects have all the files needed whe…
```
  Muddasser committed Jun 28, 2016
  acef4fa2 Browse Files
- Merge pull request #12884 from… · 1136a068
```
Merge pull request #12884 from edx/revert-12833-hamzamunir/TNL-4141-problem_creation_empty_answer_not_allowed

Revert "TNL 4141"
```
  Jesse Zoldak committed Jun 28, 2016
  1136a068 Browse Files
- Revert "TNL 4141" · fcfacf22
  Jesse Zoldak committed Jun 28, 2016
  
  fcfacf22 Browse Files
- Adjusting thresholds · 02314740
  Chris Rodriguez committed Jun 28, 2016
  
  02314740 Browse Files
- Removing safe transcripts for now · 0d7bf1b7
  Chris Rodriguez committed Jun 28, 2016
  
  0d7bf1b7 Browse Files
- AC-454 adding visual clarify for selected menu options · fba37a12
  Chris Rodriguez committed Jun 28, 2016
  
  fba37a12 Browse Files
- Bump safe template linter thresholds to fix failing builds · 61d5fdcb
  Douglas Hall committed Jun 28, 2016
  
  61d5fdcb Browse Files
- Fix discussion bundling in Studio · 0488f077
  Andy Armstrong committed Jun 28, 2016
  
  0488f077 Browse Files
- Merge pull request #12833 from edx/hamzamunir/TNL-4141-problem_creation_empty_answer_not_allowed · 013bf65c
```
TNL 4141
```
  hamzamunir7300 committed Jun 28, 2016
  013bf65c Browse Files
- Merge pull request #12820 from edx/tasawer/bugfix/ecom-1730-make-student-enrollment-more-robust · e46764f5
```
Make user enrollment more robust
```
  Tasawer Nawaz committed Jun 28, 2016
  e46764f5 Browse Files
- Merge pull request #12868 from edx/asadiqbal08/WL-538 · 85b1f23a
```
WL-538 changes to make UI responsive
```
  Asad Iqbal committed Jun 28, 2016
  85b1f23a Browse Files
27 Jun, 2016 13 commits
- Merge pull request #12854 from eduNEXT/jfavellar/TR-1194-fixtures · e7527fca
```
Replacing relative imports by absolute imports for all files into com…
```
  Ben Patterson committed Jun 27, 2016
  e7527fca Browse Files
- Deprecate paver arguments with '_' in them in favor of versions with '-' · ef89c75b
  Calen Pennington committed Jun 27, 2016
  
  ef89c75b Browse Files
- Deprecate extra_args in favor of just passing through all unknown options · 206cedf5
  Calen Pennington committed Jun 27, 2016
  
  206cedf5 Browse Files
- Add a new Task subclass that will pass through unknown options as the unknown_options argument · c279eb1c
  Calen Pennington committed Jun 27, 2016
  
  c279eb1c Browse Files
- Merge pull request #12867 from edx/ahsan/ECOM-4792-Incorrect-links-on-edX-Course-Catalog-API · a980361a
```
Incorrect links on `edX Course Catalog API`
```
  Ahsan Ulhaq committed Jun 28, 2016
  a980361a Browse Files
- Merge pull request #12873 from edx/alisan/deletebadfiles · c9459eef
```
delete local pycharm files
```
  alisan617 committed Jun 27, 2016
  c9459eef Browse Files
- Merge pull request #12783 from edx/sylvia/DOC-2361 · ce3da575
```
Account registration and activation text string revisions
```
  Sylvia Pearce committed Jun 27, 2016
  ce3da575 Browse Files
- Merge pull request #12860 from edx/clrux/ac-398 · e90dad8a
```
AC-398 putting edx.org social media links in list, updating styles
```
  Chris committed Jun 27, 2016
  e90dad8a Browse Files
- Account registration and activation text string revisions · 8b1f28d3
  Sylvia Pearce committed Jun 27, 2016
  
  8b1f28d3 Browse Files
- ECOM-4804 Add the organization logo url to the program details page (#12862) · 8ad34c08
  Simon Chen committed Jun 27, 2016
  
  8ad34c08 Browse Files
- delete local pycharm files · 93395145
  alisan617 committed Jun 27, 2016
  
  93395145 Browse Files
- AC-398 putting edx.org social media links in list, updating styles · 62a6f891
  Chris Rodriguez committed Jun 27, 2016
  
  62a6f891 Browse Files
- Update BlockStructure version number · b9b16486
```
https://openedx.atlassian.net/browse/TNL-4865
Without this change, we get 500 errors when the server tries to
deserialize cached data using a previous data structure.
```
  Nimisha Asthagiri committed Jun 27, 2016
  b9b16486 Browse Files