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

810 Commits

Author SHA1 Message Date
kimth
3c1e67e339 Merge master 2012-08-15 15:19:08 -04:00
Calen Pennington
13b9e58f8f Merge pull request #419 from MITx/feature/url_based_course_lists 
URL based course lists
 2012-08-15 12:07:02 -07:00
Calen Pennington
213e3cdc7c Merge pull request #418 from MITx/feature/victor/strip-metadata 
Feature/victor/strip metadata
 2012-08-15 12:01:58 -07:00
kimth
02d970c31e Map '/course/' urls to the course's root in the multicourse hierarchy 2012-08-15 14:45:12 -04:00
Victor Shnayder
a4d67bab33 Add support metadata in policy.json 
* if there is a policy.json in the course dir, read it
* file format is a dict with keys {category}/{url_name}, and values metadata dictionaries
* apply the policy, overwriting keys that are in the xml
* then do metadata inheritance, inheriting any overwritten keys.

* also a management cmd to generate a policy.json from a course dir.
 2012-08-15 14:36:06 -04:00
David Ormsbee
d0f2641890 Account for the fact that sometimes we don't get HTTP_HOST (like for tests) 2012-08-15 11:53:21 -04:00
David Ormsbee
346d5b91a1 implement subdomain-based course displays 2012-08-15 11:53:20 -04:00
Victor Shnayder
a2057f9ea4 fix docstring 2012-08-15 11:47:01 -04:00
Victor Shnayder
9a14af4ba1 address comment on #412 2012-08-15 10:27:07 -04:00
Victor Shnayder
e4fb9ec63a Remove is_staff from ModuleSystem 
- now handling access control via get_module
 2012-08-14 23:30:37 -04:00
Victor Shnayder
b782e2ff5d Make start dates work for all modules 
* error modules now hidden via access control
* get_module() returns None if user doesn't have access
 2012-08-14 23:30:37 -04:00
Victor Shnayder
2df3a6ef11 Big access control refactor 
* All access control logic is now in access.py
* It exports a single method for general use: has_access(user, object, action)
 - possible actions depend on object type (e.g. 'see_exists', 'enroll', 'staff')
* Removed DARK_LAUNCH feature flag--it is now the default behavior
* Replaced check_course with three separate more focused functions that use has_access

Minor things:
* note on using pdb in testing
* moved time parsing helper into timeparse.py
* x_modules now have a .start attribute (None if not in metadata)
 2012-08-14 23:30:37 -04:00
Calen Pennington
9c0e41691c Make XQueueInterface a new-style class 2012-08-14 15:57:07 -04:00
Calen Pennington
8ce12b10b2 Pass HttpBasicAuth object to requests, rather than a list, which it didn't understand 2012-08-14 12:32:52 -04:00
Calen Pennington
c4bed2c128 Add basic authentication support for requests made to the xqueue server 2012-08-14 11:59:47 -04:00
Calen Pennington
f09aca917f Fix name of XQueueInterface 2012-08-14 11:59:46 -04:00
Calen Pennington
91b6bb649c Move queue interface url and auth into configuration, rather than hardcoding it 2012-08-14 11:59:46 -04:00
Calen Pennington
cfe712cb2a Merge pull request #407 from MITx/kimth/generic-coderesponse 
Kimth/generic coderesponse
 2012-08-14 08:48:50 -07:00
kimth
895cf2c2ed Front end file size limit matches server-end limit 2012-08-13 21:18:49 -04:00
Calen Pennington
2504880e57 Merge pull request #404 from MITx/feature/ichuang/consistent-customresponse 
fix customresponse be consistent with "no answer entered" behavior
 2012-08-13 17:55:24 -07:00
kimth
d19244c48b Polling rerenders problem when individual queued items return 2012-08-13 20:41:16 -04:00
kimth
a4e283e975 File submission frontend checks for filesize 2012-08-13 20:20:19 -04:00
kimth
3db07bca5f Frontend polling rate aware of queue length at time of submission 2012-08-13 19:42:08 -04:00
kimth
afd78febfb Frontend queue polling doesn't render HTML until content changes 2012-08-13 19:07:44 -04:00
ichuang
1b06f51fd8 fix customresponse be consistent with "no answer entered" behavior 2012-08-13 17:41:24 -04:00
kimth
666c0bd56c Merge branch 'master' into kimth/generic-coderesponse 2012-08-13 16:26:27 -04:00
kimth
99e7711aca Generic CodeResponse XML (+ support for old ExternalResponse XML) 2012-08-13 15:48:33 -04:00
Victor Shnayder
276f22b965 remove debugging print stmt 2012-08-13 15:32:04 -04:00
Calen Pennington
a7b88550c7 Merge pull request #401 from MITx/feature/kfiedler/courseware-style 
Added tooltip styles, made all buttons the same, and other small changes...
 2012-08-13 12:29:48 -07:00
Calen Pennington
0297aff761 Merge pull request #400 from MITx/feature/victor/enrollment-windows 
add course enrollment windows
 2012-08-13 12:29:14 -07:00
Calen Pennington
76c4259c15 Merge pull request #399 from MITx/feature/fix_replication_side_effects 
Feature/fix replication side effects
 2012-08-13 12:25:42 -07:00
Kyle Fiedler
731f1cd7a8 Added tooltip styles, made all buttons the same, and other small changes throughout the courseware 2012-08-13 15:05:43 -04:00
Victor Shnayder
8716f88155 add course enrollment windows 
* if the course metadata have enrollment_start and/or enrollment_end,
  only allow normal users to enroll post start and pre end.
* If DARK_LAUNCH is on, staff can enroll outside the window
 2012-08-13 15:03:46 -04:00
Victor Shnayder
add050593a address comment on #392 2012-08-13 14:23:41 -04:00
Victor Shnayder
706fd99cab Address comments on #394 2012-08-13 14:21:19 -04:00
David Ormsbee
c4d89cd535 One more test to make sure users are really being copied 2012-08-13 13:34:24 -04:00
David Ormsbee
a25f289ca7 re-enable User save signal handler 2012-08-13 13:16:33 -04:00
David Ormsbee
301695a5c4 Remove outdated comment 2012-08-13 13:11:27 -04:00
David Ormsbee
b5beb13964 Fix side-effect related problems with User replication. 
1. Multiple save()s on the same model are now handled properly. We
   had to unmark model objects after the appropriate signals had
   fired.
2. There was a side-effect where we were saving the portal User
   object to the course_db with the using kw param, but models
   remember where they were last saved to, so a later save on that
   model object would go to the wrong database.
 2012-08-13 13:06:35 -04:00
kimth
fe954ca1c7 Unbreak frontend polling 2012-08-13 10:46:01 -04:00
Tom Giannattasio
6a50da3d16 Merge branch 'master' into feature/tomg/fall-design 2012-08-13 10:26:28 -04:00
Tom Giannattasio
7b4cd3e4b3 added additional processing class 2012-08-13 10:20:54 -04:00
Calen Pennington
32924d8bfe Merge pull request #398 from MITx/kimth/partialgrading 
Partial scoring
 2012-08-13 07:19:50 -07:00
Tom Giannattasio
4eefa73336 changed field border color 2012-08-13 10:19:06 -04:00
Tom Giannattasio
8b79d811d4 added spinner gif 2012-08-13 10:19:06 -04:00
kimth
1ff8e271f5 Partial scoring 2012-08-13 10:14:29 -04:00
Calen Pennington
801df37872 Merge remote-tracking branch 'origin/master' into arjun/javascript_response 
Conflicts:
	common/lib/xmodule/xmodule/js/src/capa/display.coffee
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/module_render.py
 2012-08-13 10:13:21 -04:00
Calen Pennington
bd95c03d9b Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches 
Provide content QA (quality assessment) interface
 2012-08-13 06:55:05 -07:00
Calen Pennington
a3d7c4892d Merge pull request #397 from MITx/feature/server_split 
Model replication to course databases
 2012-08-13 06:39:03 -07:00
David Ormsbee
4ac7862975 Merge branch 'master' into feature/server_split 
Conflicts:
	lms/urls.py
 2012-08-13 09:21:02 -04:00