Commits · 8554c3f0abf22996d4ae7eaf0d93fadda866722c · edx / edx-platform · GitLab

17 Dec, 2013 15 commits
- Merge pull request #1914 from edx/anton/show-answer-imageresponse · 8554c3f0
```
Show answer for imageresponse
```
  Anton Stupak committed Dec 17, 2013
  8554c3f0 Browse Files
- Merge pull request #1931 from zubair-arbi/zub/bugfix/std894-deletingfloatfield · 9c8e90a6
```
set default value for empty integer and float fields
```
  zubair-arbi committed Dec 17, 2013
  9c8e90a6 Browse Files
- Merge pull request #1969 from edx/zoldak/fix-test-name · 7add0146
```
Remove dot from a scenario name so the results roll up in Jenkins
```
  Jay Zoldak committed Dec 17, 2013
  7add0146 Browse Files
- Address comments. · 335a36f1
  polesye committed Dec 17, 2013
  
  335a36f1 Browse Files
- Add comments. · 887eea30
  polesye committed Dec 17, 2013
  
  887eea30 Browse Files
- Add unit tests. · 6e01ce50
  polesye committed Dec 17, 2013
  
  6e01ce50 Browse Files
- BLD-21: Show answer for imageresponse. · 4e10c729
  polesye committed Dec 17, 2013
  
  4e10c729 Browse Files
- Merge pull request #1811 from edx/valera/lti_graded_additional_tests_2 · ae61db9a
```
Valera/lti graded additional tests 2
```
  Oleg Marshev committed Dec 17, 2013
  ae61db9a Browse Files
- LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url. · 00792437
```
BLD-564.
```
  Valera Rozuvan committed Dec 17, 2013
  00792437 Browse Files
- Merge pull request #1947 from edx/valera/visual_ui_image_response · 11080f28
```
Improvement and update for ImageInput
```
  Valera Rozuvan committed Dec 17, 2013
  11080f28 Browse Files
- Adding Jasmine tests for ImageInput. · f03f3ebf
  Valera Rozuvan committed Dec 17, 2013
  
  f03f3ebf Browse Files
- Using jQuery for all DOM manipulation. · 06b6535f
  Valera Rozuvan committed Dec 17, 2013
  
  06b6535f Browse Files
- Updating ImageInput JS code base. · 7ebeccd4
  Valera Rozuvan committed Dec 17, 2013
  
  7ebeccd4 Browse Files
- set default value for empty integer/float fields · 8fc0590a
```
STUD-894
```
  Zubair Afzal committed Dec 17, 2013
  8fc0590a Browse Files
- Merge pull request #1970 from edx/adam/re-remove-ora-message · a78400a8
```
re-remove ora message as part of merge conflict resolution
```
  Adam committed Dec 16, 2013
  a78400a8 Browse Files
16 Dec, 2013 18 commits
- re-remove ora message as part of merge conflict resolution · 146562f3
  Adam Palay committed Dec 16, 2013
  
  146562f3 Browse Files
- Merge pull request #1960 from edx/e0d/release-merge · 4de51c8f
```
E0d/release merge
```
  e0d committed Dec 16, 2013
  4de51c8f Browse Files
- Remove dot from a scenario name so the results roll up in Jenkins · 59938839
  Jay Zoldak committed Dec 16, 2013
  
  59938839 Browse Files
- Merge pull request #1966 from edx/db/update-staticfiles-commit · 319091a2
```
Update version of django-staticfiles
```
  David Baumgold committed Dec 16, 2013
  319091a2 Browse Files
- Update version of django-staticfiles library · 132313c1
  David Baumgold committed Dec 16, 2013
  
  132313c1 Browse Files
- fixing merge conflicts · d52b959f
  e0d committed Dec 16, 2013
  
  d52b959f Browse Files
- Merge pull request #1954 from edx/dhm/loc_mapper_memoize · 3cf75198
```
loc mapper memoize
```
  Don Mitchell committed Dec 16, 2013
  3cf75198 Browse Files
- Document performance optimization and auth generality changes. · 9ad7a1c1
  Don Mitchell committed Dec 16, 2013
  
  9ad7a1c1 Browse Files
- Location map uses a separate cache and defaults to general · f6de4f21
  Don Mitchell committed Dec 16, 2013
  
  f6de4f21 Browse Files
- Merge pull request #1935 from edx/will/ignore-symlink-staticfiles · 7bf68907
```
Add ignore patterns for staticfiles to avoid processing symlink dirs
```
  Will Daly committed Dec 16, 2013
  7bf68907 Browse Files
- loc_mapper memoize all translations · 3f420e3d
```
STUD-1048
```
  Don Mitchell committed Dec 16, 2013
  3f420e3d Browse Files
- Merge pull request #1937 from edx/hotfix/2013-12-12 · 25958e87
```
Hotfix/2013 12 12
```
  John Jarvis committed Dec 16, 2013
  25958e87 Browse Files
- Merge pull request #1942 from carsongee/feature/mitx/sysadmin-dashboard · a00335ed
```
Add sysadmin dashboard
```
  Carson Gee committed Dec 16, 2013
  a00335ed Browse Files
- Merge pull request #1958 from edx/sanchez/peer-grading-typo · f1028a35
```
Fix typo in peer grading messages.
```
  Stephen Sanchez committed Dec 16, 2013
  f1028a35 Browse Files
- Fix typo in peer grading messages. · f4e95c6a
  Stephen Sanchez committed Dec 16, 2013
  
  f4e95c6a Browse Files
- Merge pull request #1959 from edx/db/revert-tusbar-merge · 807843d1
```
Revert "Studio HTTPS fonts"
```
  David Baumgold committed Dec 16, 2013
  807843d1 Browse Files
- Revert "Merge pull request #1889 from tusbar/studio-https-fonts" · 179a1dd4
```
This reverts commit 540256b2, reversing
changes made to bd04ab5a.
```
  David Baumgold committed Dec 16, 2013
  179a1dd4 Browse Files
- Add sysadmin dashboard · ccc87337
```
For seeing overview of system status, for deleting and loading
courses, for seeing log of git imports of courseware.  Includes command
for importing course XML from git repositories.

Added a lot of tests for additional coverage with some minor fixes
those tests discovered
```
  Carson Gee committed Dec 15, 2013
  ccc87337 Browse Files
13 Dec, 2013 7 commits
- Merge pull request #1889 from tusbar/studio-https-fonts · 540256b2
```
Remove protocol from font URLs in Studio and Tiny MCE
```
  David Baumgold committed Dec 13, 2013
  540256b2 Browse Files
- Merge pull request #1953 from edx/sarina/bugfix-instdash-acceptance · bd04ab5a
```
Fix data dash acceptance test to wait for text
```
  Sarina Canelake committed Dec 13, 2013
  bd04ab5a Browse Files
- Merge pull request #1907 from edx/db/whitespace-fixes · 3d2ad59c
```
whitespace-only changes
```
  David Baumgold committed Dec 13, 2013
  3d2ad59c Browse Files
- Use mongo indices for all queries · 3bd76f98
```
STUD-1039
```
  Don Mitchell committed Dec 13, 2013
  3bd76f98 Browse Files
- Reduce sql queries for groupname tests. · f4beb8b8
```
Conflicts:
	cms/djangoapps/auth/authz.py
```
  Don Mitchell committed Dec 13, 2013
  f4beb8b8 Browse Files
- Fix acceptance test to wait for text area to be populated · b2fee69c
  Sarina Canelake committed Dec 13, 2013
  
  b2fee69c Browse Files
- Merge pull request #1910 from edx/christina/locations · 17b5c212
```
Create explicit Locations.
```
  Christina Roberts committed Dec 13, 2013
  17b5c212 Browse Files