Commits · 87408d239988ab3880abbac18bed835d125f197c · edx / edx-platform · GitLab

29 Apr, 2014 1 commit
- Revert "remove location of item from loc_mapper and cache" · 87408d23
```
This reverts commit d2b8b4f0.
```
  zubair-arbi committed Apr 29, 2014
  87408d23 Browse Files
28 Apr, 2014 10 commits
- Merge branch 'release' · b95966e9
```
Conflicts:
	CHANGELOG.rst
```
  David Baumgold committed Apr 28, 2014
  b95966e9 Browse Files
- Merge pull request #3494 from edx/sarina/fix-video-i18n · cba08d0b
```
Fix i18n of video transcript
```
  Sarina Canelake committed Apr 28, 2014
  cba08d0b Browse Files
- Merge pull request #3476 from edx/usman/lms2556-wiki-urls · 23ee963c
```
Fixed transform_url function in WikiAccessMiddleware.
```
  Adam committed Apr 28, 2014
  23ee963c Browse Files
- Fix i18n of video transcript · e76f6dc8
  Sarina Canelake committed Apr 28, 2014
  
  e76f6dc8 Browse Files
- Fixed transform_url function in WikiAccessMiddleware. · f591b1db
```
In the current implementation if the path prefix contains the
wiki_path value it gets deleted. For example if the prefix is
'/courses/edx/math101/2014' and wiki_path is '101/' the final
prefix becomes '/courses/edx/math2014'.

LMS-2556
```
  Usman Khalid committed Apr 28, 2014
  f591b1db Browse Files
- Merge pull request #3438 from edx/sarina/fix-video-i18n · 7a513820
```
Don't scrape unnecessary strings for i18n
```
  Sarina Canelake committed Apr 28, 2014
  7a513820 Browse Files
- Merge pull request #3478 from edx/sylvia/docs/TIM-476 · e4c5eb4d
```
Add info about removing prompt
```
  srpearce committed Apr 28, 2014
  e4c5eb4d Browse Files
- Merge pull request #3434 from edx/db/dev-process · 73c30e95
```
Document our development/review process
```
  David Baumgold committed Apr 28, 2014
  73c30e95 Browse Files
- Merge pull request #3440 from edx/ammar/config-youtube-stub-for-bok-choy · dfa45eac
```
Configure youtube stub for bok-choy
```
  muhammad-ammar committed Apr 28, 2014
  dfa45eac Browse Files
- Merge pull request #3483 from edx/ora2/release-2014-04-27T20.17 · 37cb0052
```
Release for Apr 27, 2014
```
  Stephen Sanchez committed Apr 28, 2014
  37cb0052 Browse Files
27 Apr, 2014 5 commits
- Merge pull request #3484 from edx/sarina/042914-language-update · 4800811f
```
Sarina/042914 language update
```
  Sarina Canelake committed Apr 27, 2014
  4800811f Browse Files
- Update translations (autogenerated message) · 51188099
  Sarina Canelake committed Apr 27, 2014
  
  51188099 Browse Files
- Update how translations are pulled · 3422fcfe
  Sarina Canelake committed Apr 27, 2014
  
  3422fcfe Browse Files
- Release for Apr 27, 2014 · c9f707f4
  Stephen Sanchez committed Apr 27, 2014
  
  c9f707f4 Browse Files
- Correct native spelling of Armenian language · cb590405
  Sarina Canelake committed Apr 27, 2014
  
  cb590405 Browse Files
25 Apr, 2014 24 commits
- Merge pull request #3450 from johncox-google/johncox/feature/buttons · 82bd46d5
```
Change signin control from text list to buttons.
```
  Ned Batchelder committed Apr 25, 2014
  82bd46d5 Browse Files
- Update changelog · 441055d8
  John Cox committed Apr 25, 2014
  
  441055d8 Browse Files
- Merge pull request #2780 from FiloSottile/progress_success_button · 5edae3ed
```
Show a success button at the top of the Progress page
```
  David Baumgold committed Apr 25, 2014
  5edae3ed Browse Files
- Fix acceptance tests · 0379bd34
  John Cox committed Apr 25, 2014
  
  0379bd34 Browse Files
- Merge pull request #3479 from edx/sylvia/docs/DOC-345 · b38a9236
```
Correct copy/paste error in Adaptive Hint section
```
  srpearce committed Apr 25, 2014
  b38a9236 Browse Files
- Correct copy/paste error in Adaptive Hint section · cc892d64
  Sylvia Pearce committed Apr 25, 2014
  
  cc892d64 Browse Files
- Add info about removing prompt · 3671b91a
  Sylvia Pearce committed Apr 25, 2014
  
  3671b91a Browse Files
- Merge pull request #2810 from edx/marco/discussions/styling-cleanup · a15e43f5
```
Forums visual styling adjustments
```
  marcotuts committed Apr 25, 2014
  a15e43f5 Browse Files
- Merge pull request #3145 from carsongee/cg/course_import_validation · 7aa627b1
```
Add test in import code to make sure two overlapping courses aren't imported
```
  David Baumgold committed Apr 25, 2014
  7aa627b1 Browse Files
- Configure youtube stub for bok-choy · 6f064e2b
  Muhammad Ammar committed Apr 25, 2014
  
  6f064e2b Browse Files
- Make dispatch logic clearer · 1192b5f7
  John Cox committed Apr 25, 2014
  
  1192b5f7 Browse Files
- Fix two error message corner cases · c80b5968
  John Cox committed Apr 25, 2014
  
  c80b5968 Browse Files
- Add third-party auth implementation and tests · ce0b6407
  John Cox committed Apr 25, 2014
  
  ce0b6407 Browse Files
- Merge pull request #3380 from fmyzjs/patch-4 · 83853098
```
install and set up paver before using it
```
  David Baumgold committed Apr 25, 2014
  83853098 Browse Files
- Fix i18n of video player string · dac62703
  Sarina Canelake committed Apr 25, 2014
  
  dac62703 Browse Files
- Merge pull request #3371 from carsongee/cg/pdf_textbook_urls · 0a022e13
```
Switch PDF Textbooks to use portable URLs
```
  David Baumgold committed Apr 25, 2014
  0a022e13 Browse Files
- Merge pull request #3475 from edx/markhoeber/documentation/doc-107 · a4f4d7ba
```
bug fix - wrong problem name
```
  Mark Hoeber committed Apr 25, 2014
  a4f4d7ba Browse Files
- bug fix - wrong problem name · 95e4728a
```
doc-289
```
  Mark Hoeber committed Apr 25, 2014
  95e4728a Browse Files
- Merge pull request #3474 from edx/sylvia/docs/typo_in_jsinput · fad631bf
```
Fix note formatting problem in JSInput doc
```
  srpearce committed Apr 25, 2014
  fad631bf Browse Files
- Fix note formatting problem in JSInput doc · 4f3efa6a
  Sylvia Pearce committed Apr 25, 2014
  
  4f3efa6a Browse Files
- Merge pull request #3473 from edx/sylvia/docs/DOC-237 · 34b17d4b
```
Update label information; correct typo; add XML to PWAH
```
  srpearce committed Apr 25, 2014
  34b17d4b Browse Files
- Update change log · 5ef9618f
  Sylvia Pearce committed Apr 25, 2014
  
  5ef9618f Browse Files
- Merge pull request #3463 from aboudreault/xblock-initialization-issue · f6fc10f3
```
XBlocks are something initialized before all resources (url) are loaded
```
  Andy Armstrong committed Apr 25, 2014
  f6fc10f3 Browse Files
- Update label information; correct typo; add XML to PWAH · faf35d42
  Sylvia Pearce committed Apr 25, 2014
  
  faf35d42 Browse Files