Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,365 Commits 1 Branch 0 Tags
2c83dc3f09b49d740407daaffe05ab8fd549ed8a
Commit Graph

24365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
2c2c238269 Merge pull request #1817 from edx/sarina/lms-197 
Encode header row (LMS-197)
 2013-12-05 07:20:02 -08:00
Julia Hansbrough
a040f3f66d Merge pull request #1845 from edx/flowerhack/update-devstack-settings 
Added developer-specific settings to devstack
 2013-12-05 07:14:29 -08:00
Alexander Kryklia
bceadd4830 Merge pull request #1819 from edx/anton/fix-lti-scores 
Fix LTI max_score method.
 2013-12-05 02:40:19 -08:00
Anton Stupak
68e1985db1 Merge pull request #1807 from edx/anton/transcripts 
Video Transcripts: Fix clear and download buttons.
 2013-12-05 02:38:58 -08:00
polesye
b4f82b3837 BLD-438: Fix clear and download buttons. 2013-12-05 11:43:29 +02:00
Calen Pennington
72bb0f8cab Merge pull request #1854 from cpennington/wording-fixes 
modify partial recovery message
 2013-12-04 18:35:39 -08:00
Adam Palay
a458b469d1 modify partial recovery message 2013-12-04 21:26:45 -05:00
Ned Batchelder
326d9dbeac Merge pull request #1851 from edx/ned/merge-lti-hotfix 
Ned/merge lti hotfix
 2013-12-04 13:48:22 -08:00
Ned Batchelder
3118a5de1b Merge pull request #1852 from cpennington/more-db-error-fixes 
Add recovery command
 2013-12-04 13:46:56 -08:00
Calen Pennington
b9926a2fd3 Add message explaining partial recovery 2013-12-04 16:42:57 -05:00
David Baumgold
beda1f8bbf Merge pull request #1846 from edx/db/update-logging 
Update logging.getLogger() calls to use edx instead of mitx
 2013-12-04 13:37:44 -08:00
Calen Pennington
e561c1354d Add managemant command to generate sql to clean up tp truncated student ids in ORA db 2013-12-04 16:18:40 -05:00
Adam Palay
4d506016e7 Add a backwards migration to delete the archive table 2013-12-04 16:07:43 -05:00
David Baumgold
b33bb1a836 Merge pull request #1848 from edx/db/remove-deploy-rake 
Removed unused rake tasks
 2013-12-04 13:01:16 -08:00
Александр
e96108629d Fix LTI tests. 2013-12-04 15:55:47 -05:00
Александр
c4515faedf Make has_score to be XField insted of decriptor property. 
Conflicts:
	common/lib/xmodule/xmodule/lti_module.py
 2013-12-04 15:55:42 -05:00
polesye
e4403815e7 Fix LTI max_score method. 2013-12-04 15:54:51 -05:00
David Baumgold
6baf195a4a Removed unused rake tasks 2013-12-04 15:37:18 -05:00
David Baumgold
e26fc08d2b Update logging.getLogger() calls to use edx instead of mitx 2013-12-04 15:18:15 -05:00
David Baumgold
bbcd8affa9 Merge pull request #1839 from edx/db/mitx-root-url 
MITX_ROOT_URL => EDX_ROOT_URL
 2013-12-04 12:17:13 -08:00
Ned Batchelder
c7ac4100ff Merge pull request #1840 from edx/adam/db-error 
Fixes to database columns
 2013-12-04 12:07:07 -08:00
Julia Hansbrough
f06f333b8a Added developer-specific settings to devstack 2013-12-04 20:06:55 +00:00
Brian Talbot
1f056c37f0 Merge pull request #1777 from edx/talbs/studio-fix-tos 
Studio: FIX - reinstating Terms of Service and Privacy Policy references
 2013-12-04 11:50:09 -08:00
Ned Batchelder
19c6b8564d Merge pull request #1842 from edx/hotfix/error-msg-ORA-panel 
adds more temporary error messages
 2013-12-04 11:34:07 -08:00
Adam Palay
175e1aab9e adds more temporary error messages 2013-12-04 14:30:09 -05:00
Ned Batchelder
83c6a72051 Merge pull request #1841 from edx/hotfix/error-msg-ORA-panel 
Hotfix/error msg ora panel
 2013-12-04 11:12:55 -08:00
Adam Palay
eb23b65992 add temporary error message for ORA panel 2013-12-04 14:10:47 -05:00
Calen Pennington
838622f5bd Handle integrity errors when creating/retrieving AnonymousUserId entries 2013-12-04 13:56:53 -05:00
Adam Palay
7171397d95 extend max_length of anonymous_user_id (LMS-1571) 2013-12-04 13:56:53 -05:00
Mark Hoeber
7b82de53a7 Merge pull request #1835 from edx/documentation/new_studio_doc/12-04-13 
Documentation/new studio doc/12 04 13
 2013-12-04 10:29:32 -08:00
Ned Batchelder
e93e632017 Merge pull request #1825 from edx/ned/make-runone-work-with-more-test-output 
Make runone work with more test output.
 2013-12-04 10:14:13 -08:00
David Baumgold
b32f2bc170 MITX_ROOT_URL => EDX_ROOT_URL 2013-12-04 12:59:35 -05:00
David Baumgold
1a585a88a9 Merge pull request #1833 from edx/db/mitx_markdown-edx_markdown 
mitx_markdown => edx_markdown
 2013-12-04 09:58:50 -08:00
Brian Talbot
d95b46dd19 Studio: adding back in links (and supporting styling) to ToS and Privacy Policy to footer and sign up UI 
STUD-151
 2013-12-04 12:03:25 -05:00
Zubair Afzal
050031f7d5 Disable Peer Track Changes 
STUD-1008
 2013-12-04 11:21:38 -05:00
cahrens
dd5ac4cf34 Change video transcripts to use locators instead of locations. 
Part of STUD-870
 2013-12-04 11:21:19 -05:00
zubair-arbi
5347923304 Merge pull request #1829 from zubair-arbi/zub/bugfix/std1008-disablepeertrackchanges 
Disable Peer Track Changes
 2013-12-04 08:04:33 -08:00
Mark Hoeber
c63dbe87ea Continued edits 
Worked through Andy's list
 2013-12-04 11:04:26 -05:00
Mark Hoeber
c495fdd3ae Continued Editorial work 
Continued Editorial work
 2013-12-04 11:04:25 -05:00
Mark Hoeber
7c7bfc658c adding images for ORA 2013-12-04 11:04:25 -05:00
Mark Hoeber
29b49ce10d Editorial updates 
update to checking student progress, create new course, index, open
response assessment
 2013-12-04 11:04:25 -05:00
Mark Hoeber
89c2832e9e New Updated Studio Documentation 
New documentation from rewrite, audit, and integration of some
documentation from edx101.  Intent to release by training on 12/5.
 2013-12-04 11:04:25 -05:00
David Baumgold
6af8ecef03 mitx_markdown => edx_markdown 2013-12-04 10:23:47 -05:00
David Baumgold
d1f3e3a6b5 Merge pull request #1827 from edx/db/remove-mitx-from-features 
settings.MITX_FEATURES => settings.FEATURES
 2013-12-04 07:13:19 -08:00
Christina Roberts
2682a14d43 Merge pull request #1790 from edx/christina/transcripts 
Change video transcripts to use locators instead of locations.
 2013-12-04 06:41:44 -08:00
Zubair Afzal
5dba3fb47a Disable Peer Track Changes 
STUD-1008
 2013-12-04 16:43:17 +05:00
Sarina Canelake
0426e51d06 Encode header row (LMS-197) 2013-12-03 18:10:13 -05:00
David Baumgold
79815acc6e Fall back on MITX_FEATURES env variable if FEATURES isn't found 
For a smoother transition to the new world
 2013-12-03 16:29:48 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
69899e24df Merge pull request #1823 from edx/db/mitxmako-edxmako 
mitxmako => edxmako
 2013-12-03 11:36:50 -08:00