Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

1401 Commits

Author SHA1 Message Date
Bridger Maxwell
0ac5ded095 Moved the course template pages to be templates/courseware/ 2012-08-20 14:54:23 -04:00
Bridger Maxwell
70c7ee42ed Fixed tests from profile->progress rename. 2012-08-20 14:08:42 -04:00
Bridger Maxwell
92a293f07e Removed profile info from Profile page and renamed it to Progress. 2012-08-20 13:50:28 -04:00
Victor Shnayder
f2197227c1 add out-of-date message to check_course 2012-08-20 09:26:16 -04:00
Victor Shnayder
c6c95c63ac Keep each course's descriptors separate 
* apply policy per-course, even if multiple courses share course and org fields
* keep descriptors separate in xml store, so that if two such courses
  change the same module in different ways, it works.  Such edits will need to
  merged on CMS import...
* add get_instance(course_id, location) method to replace get_item(location).
  Update all the call sites
* tests, including a 2nd toy course with same course and org.
 2012-08-20 09:26:16 -04:00
kimth
2f63a9b403 Limit number of files that can be uploaded at once 2012-08-19 20:12:01 -04:00
Rocky Duan
6164c87074 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-19 10:08:00 -07:00
kimth
d2cb645834 Multiple file submissions 2012-08-19 09:26:03 -04:00
Rocky Duan
028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-18 16:57:00 -07:00
Calen Pennington
b0627efc74 Fix the tests of the book url 2012-08-17 09:23:37 -04:00
ichuang
6e3eff304e {} -> {0} etc in .format statements 2012-08-16 16:22:26 -04:00
kimth
9acb1ddaca Hide chapters in addition to sections 2012-08-16 15:06:49 -04:00
Calen Pennington
3b36fbf914 Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore 2012-08-16 12:49:42 -04:00
kimth
909a368f4a Merge branch 'master' into kimth/xqueue_callback_blocking 2012-08-16 11:27:56 -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
kimth
da9a4710ce Merge branch 'master' into kimth/xqueue_callback_blocking 2012-08-16 09:38:25 -04:00
kimth
58932bb2f7 Drop import of re 2012-08-15 15:23:14 -04:00
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
David Ormsbee
1c2b6e8088 Remove stuff that I should have deleted during the rebase 2012-08-15 14:39:56 -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
kimth
f1f80cb1f4 Drop HttpResponseRedirect import 2012-08-15 14:26:41 -04:00
kimth
0b4b8ecfdc courseware.get_module passes down course_id triplet (org, course, run) 2012-08-15 14:20:35 -04:00
Calen Pennington
573c58d02b Fix broken docstring 2012-08-15 13:59:25 -04:00
Calen Pennington
4463542159 Merge pull request #415 from MITx/feature/victor/start-dates 
Feature/victor/start dates
 2012-08-15 10:00:58 -07:00
Bridger Maxwell
099f499efa Fixed access methods for wiki nav. Added tests. 2012-08-15 13:00:17 -04:00
Victor Shnayder
7c6b9eba1c Note that 'load' access does not check for enrollment 2012-08-15 12:55:13 -04:00
David Ormsbee
7d90617c5e Merge with master 2012-08-15 12:21:59 -04:00
David Ormsbee
7f8f702971 Fix silly error that was pulling the wrong info from COURSE_LISTINGS 2012-08-15 11:53:21 -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
kimth
9805b41655 row --> rows 2012-08-15 10:46:33 -04:00
Calen Pennington
4b2c4e71d2 Merge pull request #414 from MITx/kimth/xqueue_callback_blocking 
Rename acquire_lock to select_for_update, add docstring
 2012-08-15 07:44:50 -07:00
Victor Shnayder
9425bbba60 Address other comment on #413 
- don't call has_access directly from template, pass a staff_access variable instead
 2012-08-15 10:28:08 -04:00
kimth
1b84e6e43c Merge branch 'master' into kimth/sjsu 2012-08-15 10:15:57 -04:00
kimth
42ea4f3271 Rename acquire_lock to select_for_update, add docstring 2012-08-15 10:13:35 -04:00
kimth
808c70caf5 Quick workaround courses hierarchy 2012-08-15 09:39:13 -04:00
Calen Pennington
b2df6d9456 Merge pull request #412 from MITx/feature/victor/start-dates 
LMS internal auth refactor and start dates
 2012-08-15 05:24:34 -07:00
Victor Shnayder
5d9fad5a52 Minor cleanups before pull request 2012-08-14 23:30:38 -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
Rocky Duan
449d665b00 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-14 17:48:08 -07:00
kimth
75eee443ff Xqueue callback acquires lock on StudentModule to avoid race condition 2012-08-14 18:13:53 -04:00
Rocky Duan
04387289fa fixed bugs caused by merging 2012-08-14 13:43:04 -07:00
Rocky Duan
eb47093b1c Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-14 12:54:43 -07:00
Calen Pennington
814f55aad0 Fix the name of HTTPBasicAuth 2012-08-14 12:45:34 -04:00
Calen Pennington
6e88777126 Import HttpBasicAuth from the right place 2012-08-14 12:34:25 -04:00