Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,143 Commits 1 Branch 0 Tags
08eb8fa7c19eaff4870cd0bea6d06a80915000eb
Commit Graph

23143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
2b99947241 Merge pull request #1309 from edx/dhm/mongo_migrate 
Compute ObjectId locally rather than delegating to Mongo db
 2013-10-17 08:32:55 -07:00
Don Mitchell
fe438bec27 Ensure contentstore has no assets before generating test set 2013-10-17 11:08:25 -04:00
Julia Hansbrough
87d0ab91d5 Removed unused template 2013-10-17 15:02:05 +00:00
Julia Hansbrough
04bc669d09 Fixed bug LMS-1117 
When registering for an verified certificate, if you selected a suggested price option, closed the browser halfway through the steps, and re-opened, the contribution would be written in the text input field instead of preselecting the appropriate radio button.  This commit fixes that behavior
 2013-10-17 14:59:43 +00:00
Don Mitchell
dda08930cd Compute ObjectId locally rather than delegating to Mongo db 
Was following a std sql pattern, but non-sql db's are slow write
and pymongo's ObjectId() is supposed to generate a true GUID
equivalent to waiting for the db to do so.
 2013-10-17 10:49:07 -04:00
frances botsford
9f5bd4e65b Merge pull request #1373 from edx/frances/fix/studio-grading-helptext 
Bug fix STUD-771: updated grading help text...
 2013-10-17 07:42:16 -07:00
Don Mitchell
978c19dd2c Merge pull request #1325 from edx/dhm/paginate_assets 
Add asset pagination
 2013-10-17 07:16:09 -07:00
Don Mitchell
214a3bd251 pylint/pep8 cleanups 2013-10-17 09:52:13 -04:00
Don Mitchell
ee2a3750ac Test leaving /start out of url. 2013-10-17 09:51:56 -04:00
David Baumgold
b0689a4ed5 Merge pull request #1375 from edx/db/requirejs-load-tender 
Fix up Tender load order
 2013-10-17 06:29:15 -07:00
Don Mitchell
a6ad531d50 Merge pull request #1287 from edx/dhm/restful_crud 
Restful api prototype
 2013-10-17 05:50:05 -07:00
Will Daly
17d8bd219a Merge pull request #1319 from edx/will/enable-bulk-email-tests 
Enable and update bulk email acceptance test
 2013-10-17 05:44:48 -07:00
David Ormsbee
fc320ffef0 Merge pull request #1334 from edx/fix/ichuang/instructor-dashboard-grades-for-assignment 
Fix/ichuang/instructor dashboard grades for assignment
 2013-10-17 03:43:17 -07:00
ichuang
757ce61d3e Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path 2013-10-16 22:00:13 -04:00
Giulio Gratta
1fad68b5ca Adding ICE undo feature 2013-10-16 16:01:56 -07:00
brianhw
12d98daecf Merge pull request #1376 from edx/adam/disable-accounts-2 
Adam/disable accounts 2
 2013-10-16 15:01:46 -07:00
Adam Palay
085d679abe add to changelog 2013-10-16 17:48:35 -04:00
Jay Zoldak
dbfc38dfa9 Merge pull request #1370 from edx/zoldak/refactor-cms-acceptance-js 
refactor studio component creation in acceptance tests
 2013-10-16 14:47:29 -07:00
Brian Talbot
a4009d7834 Merge pull request #1372 from edx/talbs/fix-css-vendor 
LMS/Common Vendor CSS Organization
 2013-10-16 14:41:45 -07:00
David Baumgold
76e6f8bc0d Fix up Tender load order 
So that tender_widget.js loads after we've defined window.Tender
 2013-10-16 17:25:58 -04:00
Jay Zoldak
33f6d3b819 Address code review comments 2013-10-16 17:08:32 -04:00
Adam Palay
1fc993ce18 add functionality to disable users 
add middleware to detect students with disabled accounts

add tests
 2013-10-16 16:57:11 -04:00
Adam Palay
421174980a add UserStanding model 
add migration
 2013-10-16 16:57:06 -04:00
Don Mitchell
d45beaebfa Test the new RESTful course index and outline views. 2013-10-16 16:54:32 -04:00
Don Mitchell
095a4e3d93 Remove IDE-specific placeholder from before we had manage.pyUse manage.py instead (with cms --settings dev runserver --noreload --traceback 8001) 2013-10-16 16:54:32 -04:00
Don Mitchell
fbc68df88b Ensure bootstrapping tests start w/ clean slate. 2013-10-16 16:54:31 -04:00
Don Mitchell
95ea4dc9cc Tests for Locator <-> Location help functions 2013-10-16 16:54:31 -04:00
Don Mitchell
010905eb99 RESTful api for getting course listing and opening course in studio. 
Pattern for how to do refactoring from locations to locators and from
old style urls to restful ones.
 2013-10-16 16:54:31 -04:00
Brian Talbot
5de21ae541 adds/relocates shared vendor css (and assets) to static directories 2013-10-16 16:45:32 -04:00
Giulio Gratta
23bd9f5012 added help text to multiple speed video fields 2013-10-16 13:35:59 -07:00
Greg Price
bd477581b6 Log all comments service requests 
Logging the duration of each request will allow us to determine
whether there is a significant difference in the latency reported by
the comments service and that observed by the LMS. Each request will
be assigned a unique identifier to allow correlation of the reported
latency on each end.
 2013-10-16 16:31:59 -04:00
Frances Botsford
ff52afbd79 i18n the tip text on studio grading page, and adding a missing space on the 'New Assignment' button 2013-10-16 16:26:09 -04:00
Brian Talbot
4d7606f024 Merge pull request #1369 from edx/talbs/fix-a11y-modals 
LMS: Close Modal Control Uses HTML <button> Element (resolves LMS-582)
 2013-10-16 13:18:25 -07:00
Brian Talbot
96cd85d824 LMS: converts close modal controls to use HTML <button> element 2013-10-16 16:14:29 -04:00
Frances Botsford
f90e336b18 updated grading help text on weight of total grade to be more clear that it should be an integer without the percent sign 2013-10-16 15:52:05 -04:00
Will Daly
f2c417b638 Write Django logs to file during acceptance tests 2013-10-16 15:44:35 -04:00
ichuang
d0d18f8601 module -> block in common/djangoapps/xmodule_modifiers.py 2013-10-16 15:38:39 -04:00
ichuang
9774348633 lms namespace removed 2013-10-16 15:37:23 -04:00
brianhw
5918ee557f Merge pull request #1351 from edx/brian/fix-dupe-emails 
Check that email subtasks are known to the InstructorTask before executing.
 2013-10-16 12:18:04 -07:00
Jason Bau
ec8871206a use context processor instead of middleware 2013-10-16 12:16:10 -07:00
Greg Price
17e2221604 Merge pull request #1326 from edx/gprice/cs-header-auth 
Use HTTP header for comments service auth
 2013-10-16 12:07:20 -07:00
Jay Zoldak
751994b9aa pep8 and pylint fixes 2013-10-16 15:03:14 -04:00
Jay Zoldak
37933cb5f9 refactor studio component creation in acceptance tests 2013-10-16 15:02:49 -04:00
Diana Huang
02acd570e3 Merge pull request #1367 from edx/diana/modal-role-labelling 
Add roles and labels to the dialogs on the dashboard.
 2013-10-16 11:02:45 -07:00
Joe Blaylock
80cf19390f Merge pull request #833 from edx/jrbl/pass_grades_to_certificates 
Pass student grade label to certification process
 2013-10-16 10:57:47 -07:00
frances botsford
ce83924fc0 Merge pull request #1361 from edx/frances/fix/lms-verification-layout-tweaks 
some layout tweaks to the verification choose your track page
 2013-10-16 10:52:40 -07:00
Frances Botsford
8c224a2aad fixes on review and some corrections to verification sass 2013-10-16 13:51:38 -04:00
David Baumgold
ab5664ab9d Merge pull request #1366 from edx/db/fix-video-test 
Fix video unit test
 2013-10-16 10:42:53 -07:00
Diana Huang
1871bca4ca Add roles and labels to the dialogs on the dashboard. 
LMS-1310
 2013-10-16 13:26:32 -04:00
brianhw
97e01be147 Merge pull request #1359 from edx/brian/bulk-email-rc 
Bulk Email improvements for release
 2013-10-16 10:26:28 -07:00