Commits · f0bbd34ad660a54ea771385bbfdfc1576dac4205 · edx / edx-platform · GitLab

21 Nov, 2013 1 commit
- Merge pull request #1715 from robertjmarks/master · f0bbd34a
```
changes to allow multiple choicetextresponses in one problem

@adampalay will do!
```
  Valera Rozuvan committed Nov 20, 2013
  f0bbd34a Browse Files
20 Nov, 2013 14 commits
- Merge pull request #1730 from edx/db/remove-backbone-sourcemap-comment · 2b3d6b23
```
Removed Backbone sourcemap comment
```
  David Baumgold committed Nov 20, 2013
  2b3d6b23 Browse Files
- Removed Backbone sourcemap comment · e4817f5b
```
Because the resulting 404 was causing confusion
```
  David Baumgold committed Nov 20, 2013
  e4817f5b Browse Files
- Merge pull request #1729 from edx/adam/more-granular-grading-transactions-2 · 92238d7f
```
more granular transactions in grading [LMS-1480]
```
  Adam committed Nov 20, 2013
  92238d7f Browse Files
- Merge pull request #1725 from edx/anton/transcripts-fix-acceptance-test · 538be891
```
BLD-524: Add missing assert in video test.
```
  polesye committed Nov 20, 2013
  538be891 Browse Files
- more granular transactions in grading [LMS-1480] · 7b72a185
```
remove field_data_cache from grades.grade and grades.progress_summary

cleans grading code by adding wrappers
```
  Adam Palay committed Nov 20, 2013
  7b72a185 Browse Files
- Merge pull request #1707 from edx/gprice/forum-thread-list-focus-trap · 21169cbb
```
Add error recovery and focus trap to thread loading in forum sidebar
```
  Greg Price committed Nov 20, 2013
  21169cbb Browse Files
- Merge pull request #1697 from edx/christina/i4x_test · 82092bdd
```
Test HTML returned from view methods for "i4X".
```
  Christina Roberts committed Nov 20, 2013
  82092bdd Browse Files
- Test for i4x on returned pages. · f01b36b5
```
STUD-941
```
  cahrens committed Nov 20, 2013
  f01b36b5 Browse Files
- Merge pull request #1637 from edx/feanil/aws_creds · 729f2e3b
```
Set empty aws credentials to None.
```
  Feanil Patel committed Nov 20, 2013
  729f2e3b Browse Files
- Merge pull request #1333 from edx/dhm/separate_pymongo · df349b97
```
Pull all db (mongo) functions into another file to enable easier replacement
```
  Don Mitchell committed Nov 20, 2013
  df349b97 Browse Files
- Merge pull request #1719 from danielcebrian/patch-1 · d8215533
```
Update AUTHORS
```
  David Baumgold committed Nov 20, 2013
  d8215533 Browse Files
- Merge pull request #1680 from edx/christina/preview · c9416925
```
Change preview view method to use RESTful URL.
```
  Christina Roberts committed Nov 20, 2013
  c9416925 Browse Files
- Merge pull request #1722 from edx/will/fix-html-failure · 29c8a0e2
```
Increased timeout for element count in HTML test
```
  Will Daly committed Nov 20, 2013
  29c8a0e2 Browse Files
- BLD-524: Add missing assert in video test. · cc2f1e73
  polesye committed Nov 20, 2013
  
  cc2f1e73 Browse Files
19 Nov, 2013 25 commits
- Separate all db ops from modulestore ops · cb113dea
  Don Mitchell committed Nov 19, 2013
  
  cb113dea Browse Files
- Change preview view method to use RESTful URL. · e7c06e3a
```
STUD-848
```
  cahrens committed Nov 19, 2013
  e7c06e3a Browse Files
- Increased timeout for element count in HTML test · bcb5f1b3
  Will Daly committed Nov 19, 2013
  
  bcb5f1b3 Browse Files
- Merge pull request #1693 from edx/flowerhack/fix/password-reset-messages · bc4ebfdc
```
Fixed password reset message
```
  Julia Hansbrough committed Nov 19, 2013
  bc4ebfdc Browse Files
- Removed null bits · 87238e6d
  Julia Hansbrough committed Nov 19, 2013
  
  87238e6d Browse Files
- Merge pull request #1718 from edx/jarv/fix-static-url · 7a24f203
```
'ignore' shouldn't be use for ascii conversion
```
  John Jarvis committed Nov 19, 2013
  7a24f203 Browse Files
- Update AUTHORS · 954ca83c
  danielcebrian committed Nov 19, 2013
  
  954ca83c Browse Files
- 'ignore' shouldn't be use for ascii conversion · 693cfdea
```
The input string is not expected to contain any unicode characters
```
  John Jarvis committed Nov 19, 2013
  693cfdea Browse Files
- Merge pull request #1702 from edx/giulio/anon-user-id-yml · 745f4509
```
Adding a YAML file to demonstrate how to include anonymized user IDs in Studio elements.
```
  Giulio Gratta committed Nov 19, 2013
  745f4509 Browse Files
- Merge pull request #1714 from edx/christina/fix-children · d4082859
```
The forcing of IDs to non-draft must happen in base.py instead of draft....
```
  Christina Roberts committed Nov 19, 2013
  d4082859 Browse Files
- Merge pull request #1713 from edx/jarv/fix-static-url · 9206f33f
```
fixes issue where STATIC_URL was overwritten without git.revision
```
  John Jarvis committed Nov 19, 2013
  9206f33f Browse Files
- An empty category will result in InvalidLocationErrors. · 705ccd01
  cahrens committed Nov 19, 2013
  
  705ccd01 Browse Files
- STATIC_URL_BASE for lms config · 4067a084
  John Jarvis committed Nov 19, 2013
  
  4067a084 Browse Files
- changes to allow multiple choicetextresponses in one problem · e3b8ce70
  RobertMarks committed Nov 19, 2013
  
  e3b8ce70 Browse Files
- convert STATIC_URL to ascii · 71184220
  John Jarvis committed Nov 19, 2013
  
  71184220 Browse Files
- The forcing of IDs to non-draft must happen in base.py instead of draft.py. · ed9a61e2
```
The draft.py solution only worked when the parent was also in the draft store.
```
  cahrens committed Nov 19, 2013
  ed9a61e2 Browse Files
- adding slash · 0e6b21ef
  John Jarvis committed Nov 19, 2013
  
  0e6b21ef Browse Files
- fixes issue where STATIC_URL was overwritten without git.revision · 54bb55fa
```
fixes this commit - https://github.com/edx/edx-platform/commit/5ec77010e3bc0303cdb06ebf32e806936fd36ce6
```
  John Jarvis committed Nov 19, 2013
  54bb55fa Browse Files
- Merge pull request #1641 from manuel-freire/master · 69ef7531
```
298.15 K is 25 C, not 0 (0 is defined to be at 273.15)

#os
```
  Sarina Canelake committed Nov 19, 2013
  69ef7531 Browse Files
- Merge pull request #1701 from edx/documentation/hoeber/stud-924 · 4efafe41
```
Review all panel help text in Studio UI for Studio-924
```
  Mark Hoeber committed Nov 19, 2013
  4efafe41 Browse Files
- Merge pull request #1709 from edx/sarina/change-dummy-i18n-language · afaf0f57
```
Change dummy locale to Esperanto
```
  Sarina Canelake committed Nov 19, 2013
  afaf0f57 Browse Files
- Merge pull request #1704 from edx/release-hotfix-2013-11-15 · 57cb9833
```
merge 2013-11-15 hotfix branch to master
```
  Jim Abramson committed Nov 19, 2013
  57cb9833 Browse Files
- Studio: Review all panel help copy · f5ae957a
```
Reviewed and updated all on-page panel help text in Studio for clarity,
consistency, and brevity.  Updated template HTML files to change text

STUD-924
```
  Mark Hoeber committed Nov 19, 2013
  f5ae957a Browse Files
- Fix for advanced settings failure · a2057273
  Will Daly committed Nov 19, 2013
  
  a2057273 Browse Files
- Change dummy locale to Esperanto · bd8fce5a
  Sarina Canelake committed Nov 19, 2013
  
  bd8fce5a Browse Files