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

953 Commits

Author SHA1 Message Date
Ned Batchelder
9a106a32d5 Merged master to rc/2013-11-21 2013-11-25 14:56:09 -05:00
David Ormsbee
901ad22652 Make ENABLE_S3_GRADE_DOWNLOADS disabled by default, enabled in dev. 
Having ENABLE_S3_GRADE_DOWNLOADS enabled by default in common.py
could lead to surprising behavior for folks downstream. They'd
suddenly see a grade download screen on their new instructor
dashboard, but the links by default would be local files and
couldn't be used in an actual production environment. So we disable
by default and let people explicitly enable it and set it up for
S3 if they wish.

LMS-58
 2013-11-22 10:06:34 -05:00
David Ormsbee
a99fd08004 Fix error case where we have items in our grading csv output 
that are not present in a given student's gradeset.

General code cleanup and addition of comments.

Instructor dashboard API unit tests.

LMS-58
 2013-11-22 10:06:28 -05:00
Sarina Canelake
e2423386cb UX for Data Download tab on instructor dash 
Restrict grade report generation to 'is_superuser' users (can be overridden with
feature flag ALLOW_COURSE_STAFF_GRADE_DOWNLOADS); all staff users can download
generated files.

LMS-58
 2013-11-22 10:06:22 -05:00
David Ormsbee
e0aa8cf78a Grade report celery task and direct file push to S3 from the new instructor dashboard. 
Hook up display of grade files ready for download to new instructor dashboard.

LMS-58
 2013-11-22 10:06:10 -05:00
Feanil Patel
729f2e3bfa Merge pull request #1637 from edx/feanil/aws_creds 
Set empty aws credentials to None.
 2013-11-20 07:57:16 -08:00
John Jarvis
693cfdea50 'ignore' shouldn't be use for ascii conversion 
The input string is not expected to contain any unicode characters
 2013-11-19 14:34:06 -05:00
John Jarvis
4067a084ee STATIC_URL_BASE for lms config 2013-11-19 13:23:54 -05:00
Sarina Canelake
bd8fce5a8a Change dummy locale to Esperanto 2013-11-19 10:28:02 -05:00
Sarina Canelake
878097d06e Provide language codes for i18n testing 2013-11-19 09:15:53 -05:00
John Jarvis
5ec77010e3 allow override for STATIC_URL 2013-11-18 10:54:12 -05:00
Will Daly
e6f0203aab Silence noisy loggers in the devstack 2013-11-13 10:52:03 -05:00
Usman Khalid
e370fb9585 Merge pull request #1502 from edx/usman/lms1355-wiki-permissions 
Stricter permissions for the wiki
 2013-11-13 02:44:14 -08:00
Usman Khalid
9542230afd Added granular permissions for managing wiki articles 
LMS-1355
 2013-11-13 01:40:23 +05:00
Will Daly
b7dab70628 Added devstack settings 
Fixed pep8/pylint violations

Added email feature flags; use full names for pylint disables
 2013-11-12 13:48:29 -05:00
Adam Palay
4d1eebc557 fixes Edit Course In Studio link on instr dash (LMS-1455) 
add DOC_STORE_CONFIG to test settings
 2013-11-08 15:42:51 -05:00
Will Daly
4e9de855d1 Merge pull request #1567 from edx/will/acceptance-test-asset-pipeline 
Acceptance tests use asset pipeline
 2013-11-08 09:39:19 -08:00
Feanil Patel
9dd182800b Set empty aws credentials to None. 2013-11-08 12:22:09 -05:00
Calen Pennington
864d831ce3 Use XBlock handlers for handle_ajax in XModules 
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
 2013-11-08 11:08:48 -05:00
Calen Pennington
da26ae2529 Remove lms/lib from sys.path in favore of using it as the module lms.lib 2013-11-08 11:08:48 -05:00
David Baumgold
3895a3fa52 Merge pull request #1581 from antoviaque/registration-optional 
registration-optional: Allow to hide some optional registration fields #os
 2013-11-05 10:25:31 -08:00
John Jarvis
f78508116f setting THEME_NAME to None when it's set to an empty string 2013-11-05 11:14:56 -05:00
Xavier Antoviaque
08dffa12cc registration-optional: Allow to hide some optional registration fields 
Allow to control which of the optional fields from the registration page
are being displayed to the user. Added the configuration variable
`REGISTRATION_OPTIONAL_FIELDS` to control which ones. The default value
shows all the fields as currently; to not display some of the fields,
set the configuration variable with only the fields you want to display:

```
REGISTRATION_OPTIONAL_FIELDS = [
    'level_of_education',
    'gender',
    'year_of_birth',
    'mailing_address',
    'goals'
]
```
 2013-11-05 11:50:29 +01:00
Will Daly
7830bb203f Acceptance tests use asset pipeline 2013-11-04 14:04:04 -05:00
Diana Huang
0018568799 Merge pull request #1555 from edx/diana/certs-reverification-path 
Verified Certificate Reverification Path
 2013-11-04 08:31:56 -08:00
Adam
98b3d18edc Merge pull request #1492 from edx/adam/remove-@edx 
remove instances of @edx.org email addresses in our default settings (Bug: LMS-1363)
 2013-11-04 08:02:08 -08:00
Sarina Canelake
fff36275db Implement background email tasks on student dash 
LMS-1244
 2013-11-01 09:20:34 -04:00
Sarina Canelake
51ab852c69 Package the instructor dash javascript separately 
LMS-1418
 2013-10-30 20:41:38 -04:00
Sarina Canelake
9330ef65a8 Enable Pending Tasks section on new dash 
Add Pending Tasks section to the following tabs:
* Course Info
* Student Email
* Data Download
* Email

LMS-1242
 2013-10-30 13:43:39 -04:00
Diana Huang
a25e413fdb Fix settings for verification statuses on the student dashboard 2013-10-29 15:13:45 -04:00
Diana Huang
d3a4747b06 Add new user_status functionality to PhotoVerification. 2013-10-29 15:13:45 -04:00
Diana Huang
f314965113 Add tests for some of the new views. 2013-10-29 14:57:23 -04:00
Adam Palay
6b6e568063 remove instances of @edx.org email addresses in our default settings 
Bug: LMS-1363
 2013-10-24 17:02:15 -04:00
Szczork
b3844af28d Translation overrides 
Usefull variables for translation
 2013-10-23 12:39:31 -04:00
John Jarvis
68d31b9808 adding STATIC_ROOT_BASE to lms/envs/aws.py 2013-10-23 10:30:05 -04:00
Adam Palay
83b11a881c optimize keyboard focus management on dashboard's modals 
add license to a11y_tools.js

add tests, some reorganization of js tests

skip "toBeFocused" tests for now
 2013-10-22 13:26:18 -04:00
John Jarvis
42e1991953 adding STATIC_ROOT 2013-10-21 14:39:34 -04:00
Carlos Andrés Rocha
0be9daf9d5 Merge pull request #1419 from rocha/fix-config-root-env 
Fix error when reading tokens on aws configuration
 2013-10-21 08:24:15 -07:00
Calen Pennington
405d42cde3 Merge pull request #1423 from cpennington/fix-lms-cms-dev 
Fix `rake lms[cms.dev]`
 2013-10-21 07:58:09 -07:00
Calen Pennington
3e59f3af40 Fix rake lms[cms.dev] 2013-10-21 09:26:57 -04:00
Carlos Andrés Rocha
b764b9b4cf Fix error when reading tokens on aws configuration 
The error was caused by the CONFIG_ROOT environmental variable,
which was incorrectly assumed to be a path.py valid path.
 2013-10-21 03:19:22 -04:00
e0d
5995a76254 sanity restored. 2013-10-18 16:26:23 -04:00
e0d
a008cc6b74 path fix. 2013-10-18 16:12:51 -04:00
e0d
6700a3ec14 Fixes for the AWS environment config. 2013-10-18 15:56:15 -04:00
brianhw
f831a0adcb Merge pull request #1406 from edx/post-release-2013-10-17-master 
Post release 2013 10 17 master
 2013-10-18 11:16:24 -07:00
Brian Wilson
aa172272f3 Update master with hotfixes from release-2013-10-17. 2013-10-18 11:50:42 -04:00
Don Mitchell
8fe99a6be2 Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"" 
This reverts commit a517dc2085.
 2013-10-18 09:22:30 -04:00
Will Daly
7aff8a7791 Merge pull request #1362 from edx/will/acceptance-test-logs 
Write Django logs to file during acceptance tests
 2013-10-18 05:07:53 -07:00
Gabe Mulley
c1450c8375 Merge pull request #1349 from mulby/gabe/course-id-context 
add course_id to all emitted events
 2013-10-17 15:45:37 -07:00
Jason Bau
e5cda013a2 Merge pull request #1357 from edx/jbau/shoppingcart-user-middleware 
Jbau/shoppingcart user middleware
 2013-10-17 15:41:11 -07:00