Commits · bf56d303553c99eedda6522612dda861282ea43a · edx / edx-platform · GitLab

24 Apr, 2014 29 commits
- 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
- 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
- Add support for raw HTML editor. · ad3d8c78
```
STUD-1562
```
  cahrens committed Apr 24, 2014
  ad3d8c78 Browse Files
- Remove verify_html as it isn't supported in TinyMCE 4 · 01fdc223
  Andy Armstrong committed Apr 24, 2014
  
  01fdc223 Browse Files
- fixes templating error (LMS-2560) · c83797ed
  Adam Palay committed Apr 24, 2014
  
  c83797ed Browse Files
- Make TinyMCE more tolerant about HTML elements · f4e4082b
```
STUD-1565
```
  Andy Armstrong committed Apr 24, 2014
  f4e4082b Browse Files
- Merge pull request #3459 from edx/sylvia/docs/multiple_choice · 2825f432
```
Re-add mutiple choice advanced options
```
  srpearce committed Apr 24, 2014
  2825f432 Browse Files
- Re-add mutiple choice advanced options · 283e4b0b
  Sylvia Pearce committed Apr 24, 2014
  
  283e4b0b Browse Files
- add acceptance tests for user profile pagination. · f71e78b6
```
JIRA: FOR-492
```
  jsa committed Apr 24, 2014
  f71e78b6 Browse Files
- Merge pull request #3391 from edx/gprice/user-profile-pagination · 909903eb
```
Add pagination to forum user profile
```
  Greg Price committed Apr 24, 2014
  909903eb Browse Files
- Merge pull request #3456 from edx/clytwynec/remove-trailing-periods-in-scenario-names · 693e5f7b
```
Remove trailing periods in scenario names
```
  clytwynec committed Apr 24, 2014
  693e5f7b Browse Files
- Removed trailing periods in two scenario names · ea3c48cf
  Christine Lytwynec committed Apr 24, 2014
  
  ea3c48cf Browse Files
- Merge pull request #3287 from edx/ahodges/documentation/DOC115 · 2e572365
```
Ahodges/documentation/doc115
```
  Alison Hodges committed Apr 24, 2014
  2e572365 Browse Files
- DOC-115 adds topics to make data interpretation easier · 128beb5c
  Alison Hodges committed Apr 24, 2014
  
  128beb5c Browse Files
- Merge pull request #3453 from edx/sylvia/docs/DOC-224 · d599bc6f
```
Typo corrections
```
  srpearce committed Apr 24, 2014
  d599bc6f Browse Files
- Typo corrections · 61f797bb
  Sylvia Pearce committed Apr 24, 2014
  
  61f797bb Browse Files
- Merge pull request #3447 from edx/jmclaus/bugfix_hd_button_activates_by_itself · e7e9fb32
```
Set initial video quality to large instead of default to avoid automatic switch to HD when iframe resizes. [BLD 981]
```
  jmclaus committed Apr 24, 2014
  e7e9fb32 Browse Files
- Merge pull request #3360 from edx/DOC-224 · 38378cda
```
Doc 224
```
  srpearce committed Apr 24, 2014
  38378cda Browse Files
- Separate each problem type into its own file · c85a1557
```
Separate all exercise and tool types, and create a new folder to contain them.
```
  Sylvia Pearce committed Apr 24, 2014
  c85a1557 Browse Files
- Set initial video quality to large instead of default to avoid automatic switch… · 69ed95b4
```
Set initial video quality to large instead of default to avoid automatic switch to HD when iframe resizes. [BLD 981]
```
  jmclaus committed Apr 24, 2014
  69ed95b4 Browse Files
- Merge pull request #3304 from edx/zub/story/deletecoursegroups · b2933250
```
properly remove users from instructor/staff groups on a course delete
```
  zubair-arbi committed Apr 24, 2014
  b2933250 Browse Files
- properly remove users from instructor/staff groups on a course delete · 7b5c647c
```
STUD-1555
```
  zubiar-arbi committed Apr 24, 2014
  7b5c647c Browse Files
23 Apr, 2014 11 commits
- Add pagination to forum user profile page · 0e59038c
  Greg Price committed Apr 23, 2014
  
  0e59038c Browse Files
- Merge pull request #3430 from edx/markhoeber/documentation/doc-273 · 9d903396
```
Release notes draft 4-23-14
```
  Mark Hoeber committed Apr 23, 2014
  9d903396 Browse Files
- Release notes draft 4-23-14 · 74042bff
  Mark Hoeber committed Apr 23, 2014
  
  74042bff Browse Files
- Merge pull request #3341 from edx/ammar/bok-choy-video-tests-batch2 · 8da80b5e
```
Convert video tests from lettuce to bok-choy - batch 2
```
  Jay Zoldak committed Apr 23, 2014
  8da80b5e Browse Files
- Remove cruft from user profile threads · 643069c6
```
This removes the vote button from threads on the user profile, which was
the only interaction available on the page other than the link to view
the thread in the main discussion view.
```
  Greg Price committed Apr 23, 2014
  643069c6 Browse Files
- Merge pull request #3425 from edx/pk-set-can-be-none · 67731052
```
pk_set can be None
```
  David Baumgold committed Apr 23, 2014
  67731052 Browse Files
- Reword docstrings for bok-choy video tests · 6e4a451f
  Jay Zoldak committed Apr 23, 2014
  
  6e4a451f Browse Files
- Bok-Choy video tests batch2 · 1bbfbedb
  Muhammad Ammar committed Apr 23, 2014
  
  1bbfbedb Browse Files
- Merge pull request #3382 from TheJJ/patch-1 · 3b49c17c
```
fixed retry invokation for calling setState
```
  David Baumgold committed Apr 23, 2014
  3b49c17c Browse Files
- Merge pull request #3275 from edx/valera/l52a · 9d9f28da
```
TESTS: Add tests for fix of end-time functionality in the video player
```
  Valera Rozuvan committed Apr 23, 2014
  9d9f28da Browse Files
- TESTS: Add tests for fix of end-time in the video player. · 450dfe17
```
BLD-662
```
  Valera Rozuvan committed Apr 23, 2014
  450dfe17 Browse Files