Commits · 766c3dca7151db76d4ce391e082d7dc1b98f238a · edx / edx-platform · GitLab

23 Dec, 2015 1 commit
- Merge pull request #11051 from Ayub-Khan/ayubkhan/TNL-3822 · 766c3dca
```
Fix escaping in studio editor
```
  Usman Khalid committed Dec 23, 2015
  766c3dca Browse Files
22 Dec, 2015 15 commits
- Merge pull request #10962 from edx/robrap/TNL-3425 · f5a63b1e
```
Deprecate escaping in display_name_with_default
```
  Robert Raposa committed Dec 22, 2015
  f5a63b1e Browse Files
- Merge pull request #11036 from edx/raees/chrome-bokchoy-test-cohort-by-csv-unicode · 62597a17
```
Fixed test cohort by csv unicode failing on Chrome
```
  raeeschachar committed Dec 22, 2015
  62597a17 Browse Files
- Deprecate escaping in display_name_with_default · 5e69224c
```
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
```
  Robert Raposa committed Dec 22, 2015
  5e69224c Browse Files
- Merge pull request #11052 from edx/clytwynec/a11y-tests · 590e0481
```
Fix exit status of A11y tests
```
  Christine Lytwynec committed Dec 22, 2015
  590e0481 Browse Files
- Update pylintrc_tweaks · 424d26c9
```
Add changes for longer names.  This will get backed out once it
makes it in to edx-pylint.

TNL-3425
```
  Robert Raposa committed Dec 22, 2015
  424d26c9 Browse Files
- Merge pull request #11044 from edx/revert-10994-mushtaq/improve_get_item · 82ca667d
```
Revert "Append block item only if it has path to root"
```
  Ben Patterson committed Dec 22, 2015
  82ca667d Browse Files
- Fix exit status of A11y tests · 51766a73
  Christine Lytwynec committed Dec 22, 2015
  
  51766a73 Browse Files
- Merge pull request #11046 from edx/merge-release-into-master · 72ed155c
```
Merge release into master
```
  Peter Fogg committed Dec 22, 2015
  72ed155c Browse Files
- Merge pull request #11043 from edx/pdesjardins/DOC-2543-b · 2bf25b2f
```
Edit text strings in default template for web certificates to make them more generally applicable
```
  Peter Desjardins committed Dec 22, 2015
  2bf25b2f Browse Files
- Merge pull request #11022 from edx/bookmarking · 5e972b2a
```
Bookmarking
```
  Usman Khalid committed Dec 22, 2015
  5e972b2a Browse Files
- Merge pull request #10988 from edx/saleem-latif/SOL-1493 · ca2b8c27
```
SOL-1493: Web Certificates: Platform Branding integration
```
  Matt Drayer committed Dec 22, 2015
  ca2b8c27 Browse Files
- Merge pull request #11038 from edx/raees/chrome-bokchoy-test-search-flaky · 05b96f8c
```
Fixed test search flaky on Firefox and Chrome
```
  raeeschachar committed Dec 22, 2015
  05b96f8c Browse Files
- Merge pull request #11016 from edx/ekafeel/bookmarks-limit · a93ef10f
```
Limit the number of bookmarks a learner can add in a course
```
  Usman Khalid committed Dec 22, 2015
  a93ef10f Browse Files
- Move get_logo_url from branding/__init__.py to branding/api.py for consistency. · 3967d809
  Saleem Latif committed Dec 22, 2015
  
  3967d809 Browse Files
- Web Certificates: Platform Branding integration · 475429c0
  Saleem Latif committed Dec 22, 2015
  
  475429c0 Browse Files
21 Dec, 2015 24 commits
- Edited text strings in the default template for web certificates to remove… · 451ae3b2
```
Edited text strings in the default template for web certificates to remove wording specific to edx.org. Addresses DOC-2543.
```
  Peter Desjardins committed Dec 21, 2015
  451ae3b2 Browse Files
- Merge pull request #11032 from edx/pmitros/external-xblock-tests · 41195761
```
Allow us to run tests from external XBlock repositories
```
  Piotr Mitros committed Dec 21, 2015
  41195761 Browse Files
- Merge remote-tracking branch 'origin/release' into merge-release-into-master · 39de6e82
  Peter Fogg committed Dec 21, 2015
  
  39de6e82 Browse Files
- Merge pull request #11026 from edx/patch/2015-12-21 · bc121bfb
```
Patch 2015-12-21
```
  Peter Fogg committed Dec 21, 2015
  bc121bfb Browse Files
- Allow us to run tests from external XBlock repositories · ea27d19c
  Piotr Mitros committed Dec 21, 2015
  
  ea27d19c Browse Files
- Revert "Append block item only if it has path to root" · 92f4d41f
  Ben Patterson committed Dec 21, 2015
  
  92f4d41f Browse Files
- Merge pull request #11041 from edx/clrux/ac-295 · ddc6b5ac
```
LMS: Adding missing third topic state
```
  clrux committed Dec 21, 2015
  ddc6b5ac Browse Files
- skip 'filtering students' only when students are given and statuses to regenerate are not · 484e6ef7
  Saleem Latif committed Dec 21, 2015
  
  484e6ef7 Browse Files
- Disable 'Generate Exception Certificates' button when there are no certificate exceptions. · 268db908
  Saleem Latif committed Dec 21, 2015
  
  268db908 Browse Files
- Remove unused imports · 5ccc520b
  Saleem Latif committed Dec 21, 2015
  
  5ccc520b Browse Files
- Add i18n to strings · 76696aeb
  Saleem Latif committed Dec 21, 2015
  
  76696aeb Browse Files
- display certificate generate history in reverse chronological order · 33bbc8d7
  Saleem Latif committed Dec 21, 2015
  
  33bbc8d7 Browse Files
- Merge pull request #11039 from edx/benp/skip-flaky-test-TNL-3943 · e6a5ef81
```
Skip test; it has become too flaky to be reliable.
```
  Ben Patterson committed Dec 21, 2015
  e6a5ef81 Browse Files
- TNL-2810 backend implementation to limit the maximum bookmarks per course · 3385d1e1
  ehtesham committed Dec 21, 2015
  
  3385d1e1 Browse Files
- LMS: Adding missing third topic state · c603380a
  Chris Rodriguez committed Dec 21, 2015
  
  c603380a Browse Files
- Merge pull request #11004 from edx/ibrahimahmed443/SOL-1479-change-time-allotment · 5832b579
```
Ibrahimahmed443/sol 1479 change time allotment
```
  Ibrahim Ahmed committed Dec 21, 2015
  5832b579 Browse Files
- Skip test; it has become too flaky to be reliable. · ff681348
  Ben Patterson committed Dec 21, 2015
  
  ff681348 Browse Files
- Merge pull request #11033 from edx/benp/better-troubleshooting · 42de6ffa
```
bok-choy: Additional detail to assist troubleshooting CourseFixture errors 
```
  Ben Patterson committed Dec 21, 2015
  42de6ffa Browse Files
- Fixed test cohort by csv unicode failing on Chrome · 289a1df6
  raeeschachar committed Dec 21, 2015
  
  289a1df6 Browse Files
- Merge pull request #11034 from edx/benp/mark-flaky · 4ea93f77
```
Mark test as flaky. See TNL-3943.
```
  Ben Patterson committed Dec 21, 2015
  4ea93f77 Browse Files
- Merge pull request #11037 from edx/ziafazal/SOL-1496 · 17d1f9be
```
SOL-1496: added a slug field to reference template asset using this field
```
  Matt Drayer committed Dec 21, 2015
  17d1f9be Browse Files
- Merge pull request #11030 from edx/ned/update-pylintrc · 190304be
```
Update to latest edx-lint
```
  Ned Batchelder committed Dec 21, 2015
  190304be Browse Files
- Merge pull request #11007 from edx/asadiqbal08/SOL-1492 · cf9468ea
```
asadiqbal08/SOL-1492 - WebCerts: Generate Cert from Support Tool
```
  Matt Drayer committed Dec 21, 2015
  cf9468ea Browse Files
- SOL-1479 set max time limit to 99:59 hours; add jasmine tests to validate time limit · f3d43ab5
  ibrahimahmed443 committed Dec 21, 2015
  
  f3d43ab5 Browse Files