Commits · f591b1db28e84a3fb2919d75dc040a3cf2f980f8 · edx / edx-platform

28 Apr, 2014 1 commit

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

committed Apr 28, 2014

f591b1db Browse Files

25 Apr, 2014 22 commits
- 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
- no need for $.when() here.. · 901920b0
  Alan Boudreault committed Apr 25, 2014
  
  901920b0 Browse Files
- Merge pull request #3455 from edx/usman/lms1466-email-formatting · 9d3ea699
```
Wraps long lines in bulk email messages.
```
  Usman Khalid committed Apr 25, 2014
  9d3ea699 Browse Files
- Merge pull request #3472 from edx/zoldak/disable-video-test · 76b9ecf4
```
Disable flaky video test
```
  Jay Zoldak committed Apr 25, 2014
  76b9ecf4 Browse Files
- Merge pull request #3379 from edx/ahodges/documentation/AN870 · dfa83a81
```
AN-900: new event types for PDFs
```
  Mark Hoeber committed Apr 25, 2014
  dfa83a81 Browse Files
- AN-900: new event types for PDFs · 1203001c
  Alison Hodges committed Apr 25, 2014
  
  1203001c Browse Files
- Merge pull request #3465 from edx/sylvia/docs/TIM-463 · 1499f0b9
```
Add information about per-criterion feedback
```
  srpearce committed Apr 25, 2014
  1499f0b9 Browse Files
- Minor change · 7411bc62
  Sylvia Pearce committed Apr 25, 2014
  
  7411bc62 Browse Files
- Wraps long lines in bulk email messages. · 8fd14bfc
```
RFC 2822 states that line lengths in emails must be less than 998.
Some MTA's add newlines to messages if any line exceeds a certain
limit (the exact limit varies). Sendmail goes so far as to add
'!\n' after the 990th character in a line. To ensure that bulk
mail messages look consistent long lines are wrapped to a
conservative length.

LMS-1466
```
  Usman Khalid committed Apr 25, 2014
  8fd14bfc Browse Files
- Disable flaky video test · 490d2fef
  Jay Zoldak committed Apr 25, 2014
  
  490d2fef Browse Files
- Merge pull request #3384 from edx/oleg/fix-matlab-timeout · 7966ca45
```
Run Code infinite queueing fix. BLD-994.
```
  Oleg Marshev committed Apr 25, 2014
  7966ca45 Browse Files
- Merge pull request #3445 from edx/waheed/stud1514-toggle-cheatsheet-not-working · 9fc190dd
```
Added code to remove css on closing cheatsheet.
```
  Waheed Ahmed committed Apr 25, 2014
  9fc190dd Browse Files
- Add timestamp and wait for 35 sec. · 0f70a997
  Oleg Marshev committed Apr 25, 2014
  
  0f70a997 Browse Files
- Added code to remove css on closing cheatsheet. · 49ef8c56
  Waheed Ahmed committed Apr 25, 2014
  
  49ef8c56 Browse Files
24 Apr, 2014 17 commits
- Merge pull request #3454 from edx/markhoeber/documentation/stud-1566 · dead7801
```
HTML Editor Changes - Raw Editor
```
  Mark Hoeber committed Apr 24, 2014
  dead7801 Browse Files
- HTML Editor Changes - Raw Editor · a75b6ea5
```
stud-1566
```
  Mark Hoeber committed Apr 24, 2014
  a75b6ea5 Browse Files
- Merge pull request #3468 from edx/ahodges/documentation/chglogchgs · 6994f256
```
Removed evil HEAD line
```
  Alison Hodges committed Apr 24, 2014
  6994f256 Browse Files
- Removed evil HEAD line · 015b1c3a
  Alison Hodges committed Apr 24, 2014
  
  015b1c3a Browse Files
- Merge pull request #3390 from edx/ahodges/documentation/LMS2476 · 1e2adc68
```
Ahodges/documentation/lms2476
```
  Alison Hodges committed Apr 24, 2014
  1e2adc68 Browse Files
- Add information about per-criterion feedback · e7144091
  Sylvia Pearce committed Apr 24, 2014
  
  e7144091 Browse Files
- Changes for batch add beta testers feature · bb4b5474
  Alison Hodges committed Apr 24, 2014
  
  bb4b5474 Browse Files
- Merge pull request #3458 from edx/jsa/user-profile-pagination-acceptance · bf56d303
```
add acceptance tests for user profile pagination.
```
  Jim Abramson committed Apr 24, 2014
  bf56d303 Browse Files
- Wait that all resources are loaded and fragments rendered before initializing the xblock · 4d1d1a75
  Alan Boudreault committed Apr 24, 2014
  
  4d1d1a75 Browse Files
- Merge pull request #3460 from edx/release · d1d3e6b1
```
Merging release back to master
```
  David Baumgold committed Apr 24, 2014
  d1d3e6b1 Browse Files
- Merge pull request #3448 from edx/ahodges/documentation/DOC275 · 6686eb54
```
DOC-275, location & Language columns
```
  Mark Hoeber committed Apr 24, 2014
  6686eb54 Browse Files
- DOC-275, location & Language columns · b7c75751
```
additional small typos and fixes
```
  Alison Hodges committed Apr 24, 2014
  b7c75751 Browse Files
- Merge pull request #3461 from edx/sylvia/docs/table_images · e629e884
```
Experiment with cell widths to see if images will appear
```
  srpearce committed Apr 24, 2014
  e629e884 Browse Files
- Experiment with cell widths to see if images will appear · 3c9b79dc
  Sylvia Pearce committed Apr 24, 2014
  
  3c9b79dc Browse Files
- Tests for raw editor and minor wording changes. · 29d32d35
  cahrens committed Apr 24, 2014
  
  29d32d35 Browse Files
- UI String Updates for Raw HTML Editor Change · abc6d49c
```
Modified the Raw HTML template text and the help string for the Editor
setting.
```
  Mark Hoeber committed Apr 24, 2014
  abc6d49c Browse Files
- adjust codemirror window on raw HTML editor · 4960026b
  Frances Botsford committed Apr 24, 2014
  
  4960026b Browse Files