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

4231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Victor Shnayder
c4afddfd38 Fix staff access check in simplewiki 2012-08-15 12:56:01 -04:00
Victor Shnayder
7c6b9eba1c Note that 'load' access does not check for enrollment 2012-08-15 12:55:13 -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
Victor Shnayder
9a14af4ba1 address comment on #412 2012-08-15 10:27:07 -04:00
kimth
42ea4f3271 Rename acquire_lock to select_for_update, add docstring 2012-08-15 10:13:35 -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
Calen Pennington
12682827d2 Merge pull request #411 from MITx/kimth/xqueue_callback_blocking 
Xqueue callback acquires lock on StudentModule to avoid race condition
 2012-08-15 05:03:36 -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
kimth
75eee443ff Xqueue callback acquires lock on StudentModule to avoid race condition 2012-08-14 18:13:53 -04:00
Calen Pennington
49d3674601 Merge pull request #409 from MITx/feature/tomg/fall-design 
started gradebook design; moved a few nav classes
 2012-08-14 13:15:14 -07:00
Tom Giannattasio
a58a047582 moved global nav class 2012-08-14 16:12:36 -04:00
Tom Giannattasio
5aefda8d51 modified zebra stripes 2012-08-14 16:09:32 -04:00
Tom Giannattasio
dd92f51f02 added fluid widths 2012-08-14 16:09:32 -04:00
Tom Giannattasio
d673895eaa added drag functionality 2012-08-14 16:09:32 -04:00
Tom Giannattasio
defa5b3159 basic gradebook template built; basic scroll functionality built 2012-08-14 16:09:32 -04:00
Tom Giannattasio
9871050f94 started gradebook 2012-08-14 16:09:32 -04:00
Calen Pennington
3ec0876618 Merge pull request #410 from MITx/feature/cale/queue_config 
Feature/cale/queue config
 2012-08-14 12:57:18 -07:00
Calen Pennington
9c0e41691c Make XQueueInterface a new-style class 2012-08-14 15:57:07 -04:00
Calen Pennington
d7fc2d6654 Merge pull request #408 from MITx/feature/fix_askbot_urls 
Fix askbot URLs in the theme
 2012-08-14 12:54:17 -07:00
David Ormsbee
3c9f099026 Modify server group dev config to enable separate concurrent Askbot instances. 2012-08-14 14:31:39 -04: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
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
David Ormsbee
e85db61407 Fix simple navigation and JS includes on askbot 2012-08-14 12:21:20 -04:00
David Ormsbee
9687dc8397 Add social images to Askbot theme 2012-08-14 12:20:58 -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
43745dacca Add queue interface for test purposes 2012-08-14 11:59:46 -04:00
Calen Pennington
f09aca917f Fix name of XQueueInterface 2012-08-14 11:59:46 -04:00
Calen Pennington
09fc932a20 Add default XQUEUE_INTERFACE to the dev environment 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
David Ormsbee
137d4856cc We're loading static assets from the askbot theme directory in the lms proj now. 2012-08-14 11:54:02 -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
kimth
1c2d034283 LMS-side MAX_FILESIZE set in settings.py 2012-08-13 21:17:47 -04:00
Calen Pennington
d0e51a2df2 Merge pull request #406 from MITx/feature/ichuang/fix-signup-modal-for-ssl 
when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately ...
 2012-08-13 18:01:21 -07:00
kimth
936f2c49f5 Server-side (LMS) checking of uploaded filesize 2012-08-13 21:00:29 -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
ichuang
ae80ae0f62 Merge pull request #402 from MITx/kimth/generic-coderesponse 
Kimth/generic coderesponse
 2012-08-13 16:08:52 -07:00
kimth
afd78febfb Frontend queue polling doesn't render HTML until content changes 2012-08-13 19:07:44 -04:00
ichuang
a111a44da0 when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately should still work 2012-08-13 18:09:14 -04:00
kimth
9324ae3485 Merge branch 'master' into kimth/generic-coderesponse 2012-08-13 17:56:06 -04:00