Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,977 Commits 1 Branch 0 Tags
d7e5a7df49c7f1df747550ffcf9941c3d7994839
Commit Graph

19977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gang Chen
d7e5a7df49 Move sass cache location out of synced fold 
To prevent Errno::ETXTBSY when executing sass command.
 2013-12-17 10:21:16 -05:00
Gang Chen
012862bc24 Update AUTHORS 2013-12-17 10:20:57 -05:00
Anton Stupak
8554c3f0ab Merge pull request #1914 from edx/anton/show-answer-imageresponse 
Show answer for imageresponse
 2013-12-17 07:12:25 -08:00
zubair-arbi
9c8e90a624 Merge pull request #1931 from zubair-arbi/zub/bugfix/std894-deletingfloatfield 
set default value for empty integer and float fields
 2013-12-17 06:56:13 -08:00
Jay Zoldak
7add01462d Merge pull request #1969 from edx/zoldak/fix-test-name 
Remove dot from a scenario name so the results roll up in Jenkins
 2013-12-17 05:48:35 -08:00
polesye
335a36f17c Address comments. 2013-12-17 13:22:08 +02:00
polesye
887eea30c9 Add comments. 2013-12-17 13:22:08 +02:00
polesye
6e01ce50c9 Add unit tests. 2013-12-17 13:22:08 +02:00
polesye
4e10c72988 BLD-21: Show answer for imageresponse. 2013-12-17 13:22:08 +02:00
Oleg Marshev
ae61db9a6d Merge pull request #1811 from edx/valera/lti_graded_additional_tests_2 
Valera/lti graded additional tests 2
 2013-12-17 03:07:39 -08:00
Valera Rozuvan
0079243746 LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url. 
BLD-564.
 2013-12-17 12:47:49 +02:00
Valera Rozuvan
11080f2872 Merge pull request #1947 from edx/valera/visual_ui_image_response 
Improvement and update for ImageInput
 2013-12-17 02:40:22 -08:00
Valera Rozuvan
f03f3ebf96 Adding Jasmine tests for ImageInput. 2013-12-17 12:21:27 +02:00
Valera Rozuvan
06b6535fb1 Using jQuery for all DOM manipulation. 2013-12-17 12:21:27 +02:00
Valera Rozuvan
7ebeccd4bf Updating ImageInput JS code base. 2013-12-17 12:21:19 +02:00
Zubair Afzal
8fc0590a12 set default value for empty integer/float fields 
STUD-894
 2013-12-17 14:45:33 +05:00
Adam
a78400a8d8 Merge pull request #1970 from edx/adam/re-remove-ora-message 
re-remove ora message as part of merge conflict resolution
 2013-12-16 17:24:31 -08:00
Adam Palay
146562f3f5 re-remove ora message as part of merge conflict resolution 2013-12-16 17:13:11 -05:00
e0d
4de51c8fcc Merge pull request #1960 from edx/e0d/release-merge 
E0d/release merge
 2013-12-16 14:07:56 -08:00
Jay Zoldak
599388397a Remove dot from a scenario name so the results roll up in Jenkins 2013-12-16 17:07:26 -05:00
David Baumgold
319091a213 Merge pull request #1966 from edx/db/update-staticfiles-commit 
Update version of django-staticfiles
 2013-12-16 13:53:59 -08:00
David Baumgold
132313c1bf Update version of django-staticfiles library 2013-12-16 16:12:15 -05:00
e0d
d52b959ff1 fixing merge conflicts 2013-12-16 15:02:14 -05:00
Don Mitchell
3cf75198c5 Merge pull request #1954 from edx/dhm/loc_mapper_memoize 
loc mapper memoize
 2013-12-16 10:34:12 -08:00
Don Mitchell
9ad7a1c1e0 Document performance optimization and auth generality changes. 2013-12-16 13:32:44 -05:00
Don Mitchell
f6de4f2186 Location map uses a separate cache and defaults to general 2013-12-16 12:31:19 -05:00
Will Daly
7bf68907f3 Merge pull request #1935 from edx/will/ignore-symlink-staticfiles 
Add ignore patterns for staticfiles to avoid processing symlink dirs
 2013-12-16 09:01:17 -08:00
Don Mitchell
3f420e3d63 loc_mapper memoize all translations 
STUD-1048
 2013-12-16 11:43:28 -05:00
John Jarvis
25958e87a2 Merge pull request #1937 from edx/hotfix/2013-12-12 
Hotfix/2013 12 12
 2013-12-16 08:33:08 -08:00
Carson Gee
a00335edd3 Merge pull request #1942 from carsongee/feature/mitx/sysadmin-dashboard 
Add sysadmin dashboard
 2013-12-16 08:01:38 -08:00
Stephen Sanchez
f1028a35bc Merge pull request #1958 from edx/sanchez/peer-grading-typo 
Fix typo in peer grading messages.
 2013-12-16 07:51:56 -08:00
Stephen Sanchez
f4e95c6a7f Fix typo in peer grading messages. 2013-12-16 10:24:19 -05:00
David Baumgold
807843d1ea Merge pull request #1959 from edx/db/revert-tusbar-merge 
Revert "Studio HTTPS fonts"
 2013-12-16 07:17:30 -08:00
David Baumgold
179a1dd44e Revert "Merge pull request #1889 from tusbar/studio-https-fonts" 
This reverts commit 540256b213, reversing
changes made to bd04ab5a08.
 2013-12-16 09:30:42 -05:00
Carson Gee
ccc87337d6 Add sysadmin dashboard 
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
 2013-12-15 19:06:05 -05:00
David Baumgold
540256b213 Merge pull request #1889 from tusbar/studio-https-fonts 
Remove protocol from font URLs in Studio and Tiny MCE
 2013-12-13 11:52:07 -08:00
Sarina Canelake
bd04ab5a08 Merge pull request #1953 from edx/sarina/bugfix-instdash-acceptance 
Fix data dash acceptance test to wait for text
 2013-12-13 11:49:24 -08:00
David Baumgold
3d2ad59c51 Merge pull request #1907 from edx/db/whitespace-fixes 
whitespace-only changes
 2013-12-13 11:40:54 -08:00
Don Mitchell
3bd76f98e9 Use mongo indices for all queries 
STUD-1039
 2013-12-13 14:34:34 -05:00
Don Mitchell
f4beb8b8c3 Reduce sql queries for groupname tests. 
Conflicts:
	cms/djangoapps/auth/authz.py
 2013-12-13 14:33:11 -05:00
Sarina Canelake
b2fee69c08 Fix acceptance test to wait for text area to be populated 2013-12-13 13:13:21 -05:00
Christina Roberts
17b5c2126c Merge pull request #1910 from edx/christina/locations 
Create explicit Locations.
 2013-12-13 09:18:21 -08:00
Christina Roberts
258d3227ee Merge pull request #1938 from edx/christina/common-location 
Create explicit Locations.
 2013-12-13 09:15:21 -08:00
Feanil Patel
e326fd13e3 Merge pull request #1952 from tusbar/fix-auth-email-conf 
Fix auth email configuration
 2013-12-13 08:17:28 -08:00
Bertrand Marron
ddff90c1cb Fix auth email configuration 
Fix bug introduced by #1919: usage of not-yet-defined AUTH_TOKENS dict.
 2013-12-13 17:02:50 +01:00
Diana Huang
6952aec870 Merge pull request #1941 from edx/diana/openid-fullname 
Return the full name of the student as part of the OpenId response.
 2013-12-13 07:32:34 -08:00
Mark Hoeber
3d366eb06f Merge pull request #1950 from edx/markhoeber/documentation/stud-1017 
added anonymous id template info to html component
 2013-12-13 06:18:35 -08:00
Mark Hoeber
dc2dbc32ac added anonymous id template info to html component 
STUD-1017
 2013-12-13 09:17:24 -05:00
Diana Huang
68b75086f2 Clean up test conditions. 
LMS-750
 2013-12-13 09:11:00 -05:00
Calen Pennington
bcd753cf7d Merge pull request #1945 from cpennington/cache-anonymous-student-id 
Cache anonymous user id on the user object, so that queries aren't made many times over during module rendering
 2013-12-13 05:30:06 -08:00