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

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
6d415e484c Last reference removed in 2bfe0cb92d 2014-11-07 11:18:48 -05:00
Sarina Canelake
b16d04afec Last reference removed in 300d55cbd5 2014-11-07 11:18:48 -05:00
Sarina Canelake
826251c166 Last reference removed in 81a56a35ab 2014-11-07 11:18:48 -05:00
Sarina Canelake
ae1343ba2c Last references removed in 14345401cc 2014-11-07 11:18:48 -05:00
Sarina Canelake
f15ddb8e8c Last reference removed in e21e5284de 2014-11-07 11:18:48 -05:00
Sarina Canelake
4ebd5c188d Last reference removed in 89ba90a695 2014-11-07 11:18:48 -05:00
Sarina Canelake
6584df39e1 Last reference removed in 58c5066e66 2014-11-07 11:18:48 -05:00
Sarina Canelake
92b86af2c1 Last reference removed in 5ef94f1496 2014-11-07 11:18:47 -05:00
Sarina Canelake
f3aa21f5ba Last reference removed in 988e4e6da5 2014-11-07 11:18:47 -05:00
Sarina Canelake
a0b3ab2a0a References removed in 4dc527d119 2014-11-07 11:18:47 -05:00
Sarina Canelake
759fae2978 Can't find any references (current or historical) to these files 2014-11-07 11:18:47 -05:00
Sarina Canelake
6a5bb4f20d References removed in e1113d9ca9 2014-11-07 11:18:47 -05:00
Sarina Canelake
b69169a690 Remove unused images 
Moved images in folders to top level where appropriate, and change references.

OPEN-297
 2014-11-07 11:18:47 -05:00
Sarina Canelake
2cdbabc0b8 Merge pull request #5880 from edx/sarina/name-branded-assets-in-common 
Sarina/name branded assets in common
 2014-11-07 11:13:51 -05:00
Renzo Lucioni
1a5cc86783 Merge pull request #5877 from edx/renzo/test-validation-utility 
Jasmine tests of validation utility
 2014-11-07 10:45:23 -05:00
Renzo Lucioni
bedd6cc2f5 Jasmine tests of validation utility 
Includes a modification of validation logic which performs min and max length checks on optional fields in addition to required fields.
 2014-11-07 10:44:25 -05:00
Waheed Ahmed
dbc47600fc Merge pull request #5809 from edx/waheed/tnl729-fix-jump-to-id-in-problem-solution 
Fixed jump_to_id in problem solution.
 2014-11-07 20:30:04 +05:00
Sarina Canelake
4e9bf5e104 Last reference removed in 3b2c970248 [OPEN-299] 2014-11-07 09:50:45 -05:00
Sarina Canelake
5cedbc7ee6 Rename branded asset; moved to LMS as that's where it is referenced [OPEN-302] 2014-11-07 09:50:45 -05:00
Mark Hoeber
831453c531 Merge pull request #5817 from edx/markhoeber-1138 
Export Template Update with Caution
 2014-11-07 09:39:03 -05:00
Mark Hoeber
5015aa5515 Export Template Update with Caution 2014-11-07 09:38:27 -05:00
Waheed Ahmed
b6d4a533a9 Fixed jump_to_id in problem solution. 
TNL-729
 2014-11-07 19:16:49 +05:00
AlasdairSwan
e7e2574754 Merge pull request #5872 from edx/alasdair/logistration-form-errors-and-submit-methods 
Moved to setting ajaxType with passed in method for models and now handl...
 2014-11-07 08:48:20 -05:00
Renzo Lucioni
0459094968 Fix logistration Jasmine tests 
Includes several bug fixes caught during test writing, general clean-up, and adds js-url, a lightweight URL parser
Moved to setting ajaxType with passed in method for models and now handling form load fail errors
Added tests.
 2014-11-07 08:47:16 -05:00
chrisndodge
01c029aa9f Merge pull request #5805 from edx/cdodge/make-customizeable-region-in-receipt-page 
allow for a customized region on the receipt page that is microsite bran...
 2014-11-06 21:13:43 -05:00
Adam
893cb9c21a Merge pull request #5873 from edx/release 
Release
 2014-11-06 16:53:05 -05:00
Christina Roberts
fd587b976c Merge pull request #5710 from edx/christina/general-component-errors 
Support validation messages for any xblock (on container page).
 2014-11-06 16:47:49 -05:00
Brian Talbot
181715f200 Studio: revising xblock validation message list styling 2014-11-06 15:49:10 -05:00
Brian Talbot
31dce7671e Studio: revising element-level xblock information styling 2014-11-06 15:49:10 -05:00
cahrens
08ce09bde7 Display validation messages for any xblock on the container page. 
TNL-683
 2014-11-06 15:48:55 -05:00
Adam
8fee031873 Merge pull request #5869 from edx/adam/unicode-fix 
add logging for cybersource errors; fix minor unicode bug
 2014-11-06 15:43:52 -05:00
David Baumgold
f0a37cf43a Merge pull request #5841 from edx/cms-consistent-branding-image-names 
Rename Studio logo
 2014-11-06 14:56:31 -05:00
Renzo Lucioni
a86c80bb3c Merge pull request #5857 from edx/renzo/add-js-tests 
Fix logistration Jasmine tests
 2014-11-06 14:22:43 -05:00
Don Mitchell
e4e45018fe Merge pull request #5871 from edx/dhm/remove_test 
Remove multi-threading test as unnecessary and flakey
 2014-11-06 14:21:13 -05:00
Diana Huang
a0fbb45ca8 Merge pull request #5868 from edx/diana/add-created-to-orderitem 
Add a `created_at` field to OrderItem.
 2014-11-06 14:03:36 -05:00
Adam Palay
459e4696c0 change djfs settings not to throw an error when the app starts up 2014-11-06 13:56:33 -05:00
Carlos Andrés Rocha
fac73e88d0 Cache user course privileges during OpenID Connect authorization. 2014-11-06 13:46:32 -05:00
Dennis Jen
d3e051ce29 fixed quaility errors in instructor_dashboard.py, moved test_instructor_dashboard under tests/views directory 2014-11-06 13:42:00 -05:00
Don Mitchell
396a8aca07 Remove multi-threading test as unnecessary and flakey 
also fix other users of check_mongo_calls to use None if they don't care about sends
PLAT-239
 2014-11-06 13:22:48 -05:00
Renzo Lucioni
f9ecd8849a Fix logistration Jasmine tests 
Includes several bug fixes caught during test writing, general clean-up, and adds js-url, a lightweight URL parser
 2014-11-06 12:07:49 -05:00
Diana Huang
e932820ae1 Add a created field to OrderItem. 2014-11-06 11:29:31 -05:00
Nimisha Asthagiri
5d920190a9 Merge pull request #5867 from edx/mobile/fix-broken-master 
Fix mobile_api broken test (due to merge conflict).
 2014-11-06 11:17:14 -05:00
Adam Palay
31b200cdcb add logging for cybersource errors; fix minor unicode bug 2014-11-06 10:25:42 -05:00
Usman Khalid
5fa1104787 Wrapped Split MongoConnection in MongoProxy. 
PLAT-71
 2014-11-06 20:13:45 +05:00
Usman Khalid
4a969f9f1b Added autoretry_read decorator to methods which use mongo cursor. 
PLAT-71
 2014-11-06 20:13:45 +05:00
Usman Khalid
328a79cc60 Wrap pymongo connections in MongoProxy. 
PLAT-71
 2014-11-06 20:13:45 +05:00
Renzo Lucioni
d512fe8673 Merge pull request #5859 from edx/renzo/track-form-expansions 
Track logistration form toggles and password reset form views
 2014-11-06 10:05:52 -05:00
Renzo Lucioni
5edb7b9c87 Track logistration form toggles and password reset form views 2014-11-06 10:00:42 -05:00
Renzo Lucioni
5d1143ad06 Merge pull request #5858 from edx/renzo/resource-conflict-error-messages 
Return more helpful error messages when a resource conflict occurs
 2014-11-06 09:52:32 -05:00
David Baumgold
cfaa9dd588 Rename Studio logo 
OPEN-301
 2014-11-06 09:34:17 -05:00