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

11247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
a496cc0a1e studio - Sass Cleanup: moved all page/view specific css to their own views and created forms specific sheet 2013-03-11 13:28:28 -04:00
Brian Talbot
524db5e3f9 Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-11 11:35:25 -04:00
David Ormsbee
7806acc7cb Merge pull request #1638 from MITx/feature/diana/show-correctness 
Add the ability to hide correctness markers
 2013-03-11 08:14:18 -07:00
Brian Talbot
7a9fdb9069 studio - sass clean up: in progress business with git ignore issues 2013-03-11 11:04:43 -04:00
Calen Pennington
fcc3113bbf Merge pull request #1637 from MITx/fix/cdodge/performance-optimize-comment-client-use-jumpto 
Fix/cdodge/performance optimize comment client use jumpto
 2013-03-11 08:02:28 -07:00
e0d
5b0849d4fc Merge pull request #1640 from MITx/feature/cale/specify-ruby-1.9.3 
Specify that mitx should use ruby 1.9.3-p374 for consistancy with prod
 2013-03-11 07:37:58 -07:00
Calen Pennington
a1febce86b Specify that mitx should use ruby 1.9.3-p374 for consistancy with prod 2013-03-11 10:33:09 -04:00
Diana Huang
421e169e1e Update tests with new attributes. 2013-03-11 10:29:18 -04:00
David Ormsbee
43ec6eaa52 Merge pull request #1639 from MITx/feature/dave/delft_logo 
Update of Delft logo (lighthouse ticket #234)
 2013-03-11 07:21:55 -07:00
David Ormsbee
a8ff7911f6 Update of Delft logo (lighthouse ticket #234) 2013-03-11 10:21:03 -04:00
Diana Huang
0c949d20c9 Add the ability to hide correctness markers 
with a custom message for when they submit something.
 2013-03-11 10:12:33 -04:00
Chris Dodge
cbcda0fc65 oops didn't mean to commit the test API key 2013-03-10 11:14:25 -04:00
Chris Dodge
18ee1018e6 optimize forum page rendering as we don't pre-compute the link urls to inline discussions. We can use jump_to urls and then figure out the link path if/when end-user clicks on it. This saves a lot of unnecessary round trips to the DB as path computation is expensive, especially when it being done for every discussion module in a course in a loop. 2013-03-10 11:11:17 -04:00
Carlos Andrés Rocha
fb407e3cb8 Merge pull request #1633 from MITx/fix/will/choicegroup_html_render_error 
Fixed undefined variable error in choicegroup.html
 2013-03-08 14:30:59 -08:00
e0d
7eee7a0d2a Merge pull request #1635 from MITx/fix/cale/handle-grading-json-breakage 
Set grading policy to an empty dict if it can't be decoded from json
 2013-03-08 12:47:37 -08:00
Calen Pennington
8bb0c64ff9 Set grading policy to an empty dict if it can't be decoded from json 2013-03-08 15:36:19 -05:00
Don Mitchell
3d9878515e Merge pull request #1634 from MITx/bug/christina/advanced-settings 
Need to trigger invalid instead of error, after changes for new version ...
 2013-03-08 12:03:51 -08:00
cahrens
f5dd5d35e9 Need to trigger invalid instead of error, after changes for new version of Backbone. 2013-03-08 14:51:29 -05:00
Will Daly
607f27e715 Fixed undefined variable error in choicegroup.html 2013-03-08 14:06:45 -05:00
Christina Roberts
5eb43a627c Merge pull request #1632 from MITx/fix/zoldak/lettuce-click 
Fix lettuce tests so all studio ones are working and faster
 2013-03-08 11:04:50 -08:00
Jay Zoldak
c5a9ec5e86 Speed up the lettuce test for no policy settings. 2013-03-08 13:34:28 -05:00
Jay Zoldak
3c3f6c3cbe Revert lettuce css_find function to not fail if it does not find the element. 2013-03-08 13:34:28 -05:00
Brian Talbot
3bc73de1b4 studio - changed order of Sass import to account for variables needed in architecture 2013-03-08 12:56:00 -05:00
Brian Talbot
786ffd1092 studio - further small cleanup on Sass 2013-03-08 12:44:24 -05:00
Brian Talbot
e9a2413c04 studio - further small cleanup on Sass 2013-03-08 12:35:28 -05:00
Brian Talbot
f2a495bfeb Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-08 12:23:10 -05:00
Brian Talbot
6418d033dd studio - adding files I forgot to add when cleaning up Sass and originally committing 2013-03-08 12:20:40 -05:00
Calen Pennington
d9b68e2de2 Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics 
Add datadog metrics capture around heartbeat timing
 2013-03-08 08:59:44 -08:00
Calen Pennington
fab07597d2 Use https to talk to rubygems 2013-03-08 11:59:02 -05:00
Brian Talbot
928ecb98fc Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-08 11:47:51 -05:00
Brian Talbot
3b2c970248 studio - reorganized and documented used Sass for studio 2013-03-08 11:47:11 -05:00
Christina Roberts
849e8d6cdc Merge pull request #1630 from MITx/fix/zoldak/lettuce-click 
Fix lettuce tests to work with phantomJS
 2013-03-08 08:23:01 -08:00
Jay Zoldak
55eefd0ef6 Fix test that sets release date to work on all platforms 2013-03-08 11:15:15 -05:00
Jay Zoldak
24d088933e Fix intermittent lettuce test failure on ubuntu. 2013-03-08 11:15:15 -05:00
Jay Zoldak
1f30baabfd Change default browser for lettuce back to chrome. 2013-03-08 11:15:14 -05:00
Jay Zoldak
21e7bc5128 More robust handling for finding and clicking on objects by css. 
Tag tests not working under PhantomJS to skip for now.
 2013-03-08 11:15:14 -05:00
Jay Zoldak
b66d0cf5da Fix signup test on ubuntu 2013-03-08 11:15:14 -05:00
Jay Zoldak
ad5d2a9624 Update update_templates reference 2013-03-08 11:15:14 -05:00
Jay Zoldak
e84fa63826 Catch WebDriverException 2013-03-08 11:15:14 -05:00
Jay Zoldak
21c15d8f1f Click in the upper left of an element instead of the middle. 2013-03-08 11:15:14 -05:00
Jay Zoldak
3cec8f1a76 Catch WebDriverException 2013-03-08 11:15:14 -05:00
Jay Zoldak
b9e5ed9525 Click in the upper left of an element instead of the middle. 2013-03-08 11:15:14 -05:00
Calen Pennington
ae610aebaa Set the dogapi version 2013-03-08 10:48:55 -05:00
Calen Pennington
cd802d8e14 Add datadog metrics capture around heartbeat timing 2013-03-08 10:36:59 -05:00
Jay Zoldak
e7bf05ea54 Merge pull request #1627 from MITx/fix/will/update_correctmap_npoints_test 
Updated tests for correct_map to match changes made to get_npoints
 2013-03-08 07:29:34 -08:00
David Ormsbee
ffec9c4866 Merge pull request #1626 from MITx/fix/cale/module-render-500-fix 
Fix https://edx.lighthouseapp.com/projects/101932-lms/tickets/237-Produc...
 2013-03-08 07:09:48 -08:00
Calen Pennington
a44c0932d2 Fix https://edx.lighthouseapp.com/projects/101932-lms/tickets/237-Production-500-error-for-undefined-variable-user 2013-03-08 10:08:39 -05:00
Will Daly
352126b417 Updated tests for correct_map to match changes made to get_npoints 2013-03-08 10:08:20 -05:00
Victor Shnayder
5644d08172 Merge pull request #1625 from MITx/hotfix/dave/missing_npoints 
Hotfix/dave/missing npoints
 2013-03-07 20:54:19 -08:00
David Ormsbee
5f44b2de04 minor comment on partial credit 2013-03-07 23:52:01 -05:00