Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,228 Commits 1 Branch 0 Tags
4e3e2ec707ff409ec8a2fb4a332cfc19a744a28e
Commit Graph

10228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christina Roberts
8c4b661292 Merge pull request #1434 from MITx/bug/btalbot/studio-boldblockquote 
studio - resolved HTML display issue with bold and blockquote
 2013-02-05 13:13:44 -08:00
Diana Huang
a7588410b2 Fix tests 2013-02-05 16:11:04 -05:00
Vik Paruchuri
8ab76f72ad Switching over to a versioning system 2013-02-05 16:07:35 -05:00
Diana Huang
31c89e6d03 Consolidate error messages. 2013-02-05 16:06:14 -05:00
Diana Huang
c70531ae27 Move closed check logic into the OpenEndedChild 2013-02-05 16:00:16 -05:00
Diana Huang
120aa3cd3b Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule 
Feature/vik/peer grading xmodule
 2013-02-05 12:55:48 -08:00
Diana Huang
018412ca26 Return False to make this code clearer 2013-02-05 15:41:23 -05:00
Diana Huang
37900c3f76 Add more error logging for date parsing and make 
the closure checking more robust
 2013-02-05 15:37:20 -05:00
Brian Talbot
d713b288b5 studio - resolved HTML display issue where bold and blockquote elements didn't match LMSs style 2013-02-05 15:21:41 -05:00
Vik Paruchuri
ce87e6f221 Skip two tests 2013-02-05 14:57:59 -05:00
Brian Talbot
b0d843e38d studio - soft landing: removed forgot password link from tab order of sign in form 2013-02-05 14:55:58 -05:00
Vik Paruchuri
cae65706fd Pare down on peer grading service 2013-02-05 14:37:08 -05:00
Vik Paruchuri
8027cc7024 Fix some issues with tests 2013-02-05 14:35:44 -05:00
Vik Paruchuri
134f2f7af7 Fix tests, bugfix for problem url error 2013-02-05 14:21:08 -05:00
Brian Talbot
cdf28f6183 studio - soft landing: added in edX Studio logo 2013-02-05 14:14:14 -05:00
Vik Paruchuri
e13de7543f Test fixes, err response fixes, address review comments 2013-02-05 14:12:11 -05:00
Vik Paruchuri
34dc6e6320 Fix some issues with peer grading service 2013-02-05 13:37:55 -05:00
David Ormsbee
74c112e5cc Merge pull request #1373 from MITx/feature/zoldak/django-comment-client-tests 
Add unit tests for django comment client
 2013-02-05 10:37:18 -08:00
David Ormsbee
e50652e733 Merge pull request #1397 from MITx/feature/cale/no-course-collectstatic 
Free courses from the confines of collectstatic
 2013-02-05 10:32:54 -08:00
Vik Paruchuri
7984c4dfcb Move over grading service to xmodule 2013-02-05 13:10:56 -05:00
Brian Talbot
8bb5cc1c23 studio - course nav: added in root link to main nav 2013-02-05 11:50:58 -05:00
Brian Talbot
afa5b75de2 studio - soft landing: optimizing/compressing new images 2013-02-05 11:48:30 -05:00
Calen Pennington
69ee6b584e Merge pull request #1430 from MITx/feature/jarv/remove-repos-cfg 
Removing repos.json import
 2013-02-05 08:43:47 -08:00
John Jarvis
bff477e8d3 Removing repos.json import 2013-02-05 11:35:12 -05:00
Brian Talbot
b456281a8f studio - soft landing/nav: added in functionality/content to soft landing view and started punch list 2013-02-05 11:34:28 -05:00
Calen Pennington
4d8165b2b6 Remove bad import of replace_urls 2013-02-05 11:06:46 -05:00
Calen Pennington
0350d15e29 Make static_replace fall back to data_directory prefix, if it doesn't find the file anywhere else 2013-02-05 11:06:46 -05:00
Calen Pennington
90107fa88f Import cache function correctly 2013-02-05 11:06:46 -05:00
Calen Pennington
10f8dbfa46 Handle options passed to clear_collectstatic_cache 2013-02-05 11:06:46 -05:00
Calen Pennington
2551243dfa Install the static_replace app for the management command 2013-02-05 11:06:46 -05:00
Calen Pennington
ae5d3cbc57 Add admin command to flush the staticfiles cache 2013-02-05 11:06:46 -05:00
Calen Pennington
8592db92bf Add more tests of static_replace 2013-02-05 11:06:46 -05:00
Calen Pennington
5eae9c3a40 Make lms and cms coverage reports cover common/djangoapps 2013-02-05 11:06:46 -05:00
Calen Pennington
f1f2bd8fd2 Start adding tests for static replacement 2013-02-05 11:06:46 -05:00
Calen Pennington
401f564e6a Fix data directory passed to replace_static_urls 2013-02-05 11:06:46 -05:00
Calen Pennington
ba7bd9022b Replace the correct /course/ urls, rather than /courses/ 2013-02-05 11:06:46 -05:00
Calen Pennington
0da1467a90 Pull out missing variable 2013-02-05 11:06:46 -05:00
Calen Pennington
88fc2e3756 Fix unbalanced paren in regex 2013-02-05 11:06:45 -05:00
Calen Pennington
04879a83d3 Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible 2013-02-05 11:06:45 -05:00
Calen Pennington
b05ead864f Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" 
This reverts commit c4f56620df.
 2013-02-05 11:06:45 -05:00
Vik Paruchuri
e8a690df5e Update peer grading tests 2013-02-05 10:46:00 -05:00
Don Mitchell
82b2dc7193 Merge pull request #1427 from MITx/feature/christina/misc2 
Do not do finds within the event method. Decreases likelihood of hitting...
 2013-02-05 07:19:40 -08:00
cahrens
286616e659 Do not do finds within the event method. Decreases likelihood of hitting bug in older versions of Chrome. 
https://edx.lighthouseapp.com/projects/102637/tickets/153
 2013-02-05 09:50:34 -05:00
Diana Huang
f3be02d772 Merge branch 'master' into diana/rubric-ui-improvements 2013-02-05 09:13:14 -05:00
Diana Huang
4bb4c458a8 Merge branch 'master' into feature/diana/close-oe-problems 2013-02-05 09:12:08 -05:00
David Ormsbee
ecce3e5761 Merge pull request #1426 from MITx/debug/dave/sass 
Comment out YUI compressor (cause *something* is still causing CSS compression)
 2013-02-05 05:59:59 -08:00
David Ormsbee
818cd3aa48 Comment out YUI compressor (cause *something* is still causing CSS compression) 2013-02-05 08:58:59 -05:00
Victor Shnayder
2ab3d1b167 Merge pull request #1425 from MITx/feature/ichuang/conditional-module-text-improvement 
for conditional require_attempted display "attempted" instead of "completed"
 2013-02-04 18:54:56 -08:00
Brian Talbot
b654ee4006 studio - soft landing: further styling and modal set-up - WIP 2013-02-04 20:25:58 -05:00
Your Name
837f54c055 inline cohorting almost done 2013-02-04 20:10:08 -05:00