Commits · f03f3ebf96837a6f9903439126561b77514e4633 · edx / edx-platform · GitLab

17 Dec, 2013 4 commits
- 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
- 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 17 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
- 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 19 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
- Merge pull request #1938 from edx/christina/common-location · 258d3227
```
Create explicit Locations.
```
  Christina Roberts committed Dec 13, 2013
  258d3227 Browse Files
- Merge pull request #1952 from tusbar/fix-auth-email-conf · e326fd13
```
Fix auth email configuration
```
  Feanil Patel committed Dec 13, 2013
  e326fd13 Browse Files
- Fix auth email configuration · ddff90c1
```
Fix bug introduced by #1919: usage of not-yet-defined AUTH_TOKENS dict.
```
  Bertrand Marron committed Dec 13, 2013
  ddff90c1 Browse Files
- Merge pull request #1941 from edx/diana/openid-fullname · 6952aec8
```
Return the full name of the student as part of the OpenId response.
```
  Diana Huang committed Dec 13, 2013
  6952aec8 Browse Files
- Merge pull request #1950 from edx/markhoeber/documentation/stud-1017 · 3d366eb0
```
added anonymous id template info to html component
```
  Mark Hoeber committed Dec 13, 2013
  3d366eb0 Browse Files
- added anonymous id template info to html component · dc2dbc32
```
STUD-1017
```
  Mark Hoeber committed Dec 13, 2013
  dc2dbc32 Browse Files
- Clean up test conditions. · 68b75086
```
LMS-750
```
  Diana Huang committed Dec 13, 2013
  68b75086 Browse Files
- Merge pull request #1945 from cpennington/cache-anonymous-student-id · bcd753cf
```
Cache anonymous user id on the user object, so that queries aren't made many times over during module rendering
```
  Calen Pennington committed Dec 13, 2013
  bcd753cf Browse Files
- Cache anonymous user id on the user object, so that queries aren't made many… · 41dfa3e5
```
Cache anonymous user id on the user object, so that queries aren't made many times over during module rendering
```
  Calen Pennington committed Dec 12, 2013
  41dfa3e5 Browse Files
- Merge pull request #1944 from edx/markhoeber/documentation/add-glossary-to-index · 560347d0
```
added glossary to index
```
  Mark Hoeber committed Dec 12, 2013
  560347d0 Browse Files
- added glossary to index · 49b6b9c5
```
and updated change file
```
  Mark Hoeber committed Dec 12, 2013
  49b6b9c5 Browse Files
- Merge pull request #1943 from edx/markhoeber/documentation/glossary · 39fddd1f
```
Markhoeber/documentation/glossary
```
  Mark Hoeber committed Dec 12, 2013
  39fddd1f Browse Files