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

440 Commits

Author SHA1 Message Date
Calen Pennington
919b3e2137 Merge pull request #429 from MITx/feature/victor/strip-metadata 
Feature/victor/strip metadata
 2012-08-16 08:52:23 -07:00
Victor Shnayder
61478f4ba0 fix string format bug 2012-08-16 11:46:56 -04:00
Victor Shnayder
00d9ecd600 New policy organization: 
* course roots live in roots/{url_name}.xml
   - one is linked from course.xml

* policies live in policies/url_name.json
  - loaded based on course url_name

* Updated to pass policy through into xml parsing, so it takes effect
  before descriptor constructors are called.

* Update toy test course to new structure, fix up tests
 2012-08-16 11:41:19 -04:00
Victor Shnayder
691744e359 Use .display_name instead of metadata['display_name'] 
* the former does a fallback if metadata['display_name'] isn't set.
 2012-08-16 11:37:54 -04:00
Victor Shnayder
5e2f676153 backcompat warnings 2012-08-16 11:36:05 -04:00
Kyle Fiedler
ad7061e41f Added styles to grade out the top and bottom of the sidebar border and fixed spacing with the video and the sequence nav 2012-08-16 11:33:05 -04:00
Calen Pennington
3efea9cbb0 Merge pull request #425 from MITx/feature/bridger/new_wiki 
Feature/bridger/new wiki
 2012-08-16 07:31:56 -07:00
ichuang
f39e589625 do replace_urls within capa_module get_answer (eg for img in <solution>s) 2012-08-15 21:57:33 -04:00
Victor Shnayder
f717b0421f fix bug in backcompat section replacement 
(s/sequence/sequential/)
 2012-08-15 21:39:10 -04:00
Victor Shnayder
ce29b5aec2 Special case handling of course url_names in policy.json 2012-08-15 16:06:42 -04: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
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
Victor Shnayder
a2057f9ea4 fix docstring 2012-08-15 11:47:01 -04:00
Bridger Maxwell
4bc4e87a4e Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-15 11:15:21 -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
Bridger Maxwell
1f43ae6d3e Renamed namespace to wiki_slug in course_module.py. 2012-08-14 13:49:53 -04:00
kimth
895cf2c2ed Front end file size limit matches server-end limit 2012-08-13 21:18:49 -04: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
kimth
666c0bd56c Merge branch 'master' into kimth/generic-coderesponse 2012-08-13 16:26:27 -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
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
706fd99cab Address comments on #394 2012-08-13 14:21:19 -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
Calen Pennington
a984fbb65f Merge pull request #394 from MITx/feature/victor/hide-error-modules 
Hide errors from non-staff users
 2012-08-13 06:17:13 -07:00
David Ormsbee
c6ed6fc066 Merge branch 'master' into feature/server_split 2012-08-13 00:36:31 -04:00
Victor Shnayder
3455f8f64d Hide errors from non-staff users 2012-08-12 18:03:12 -04:00
Victor Shnayder
af7e70a979 Log content problems as warnings, not errors 
* will avoid newrelic complaining
* NOTE: Is this what we want post-ship?
  - need some way of notifying instructors of problems
 2012-08-12 17:21:40 -04:00
ichuang
da64c8f0a1 add xqa interface to staff_problem_info, make staff_debug a modal 
window, add xqa modal window, add xqa_key to course metadata
 2012-08-11 20:12:37 -04:00
ichuang
241d445f30 changes to xml_module to allow problem metadata to be added via <meta> 2012-08-10 19:00:50 -04:00
Calen Pennington
c867560662 Merge pull request #385 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-08-10 12:19:36 -07:00
Tom Giannattasio
f2012e1d2a additional processing class 2012-08-10 15:07:08 -04:00
Tom Giannattasio
185ab1f615 added spinner class and image 2012-08-10 14:22:34 -04:00
Victor Shnayder
feba37cf78 respond to comments on merge 2012-08-10 13:39:58 -04:00