Commit Graph

6959 Commits

Author SHA1 Message Date
Usman Khalid
e459e4d099 a11y imporvements to wiki/history.html
LMS-1309
2013-11-07 21:06:40 +05:00
Gabe Mulley
5aa19c08b5 Revert "emit enrollment event"
This reverts commit 5734cae1c3.
2013-11-06 14:35:28 -05:00
Gabe Mulley
f17ab1ec73 Merge pull request #1533 from mulby/gabe/enrollment-event
emit enrollment events
2013-11-06 10:29:44 -08:00
Gabe Mulley
5734cae1c3 emit enrollment event 2013-11-06 08:46:40 -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
2e05c0da13 Merge pull request #1591 from edx/jarv/theme-name
setting THEME_NAME to None when it's set to an empty string
2013-11-05 09:38:22 -08:00
brianhw
93dddf8dc3 Merge pull request #1585 from edx/brian/retry-email-after-dbtimeout
Add retries when encountering DatabaseError when updating InstructorTask.
2013-11-05 08:18:58 -08:00
Brian Wilson
7bef11a7f1 Add retries when encountering DatabaseError when updating InstructorTask. 2013-11-05 11:18:08 -05: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
Sarina Canelake
939dbb6c9d Merge pull request #1579 from edx/sarina/enhance-user-factories
Sarina/enhance user factories
2013-11-05 07:31:00 -08:00
Sarina Canelake
ea529b8841 Fix instructor api tests 2013-11-05 09:26:32 -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
Julia Hansbrough
1e2c0f50f7 Merge pull request #1529 from edx/flowerhack/feature/refunds-for-certificates
Flowerhack/feature/refunds for certificates
2013-11-04 13:33:10 -08:00
Greg Price
3256ec2df8 Merge pull request #1559 from edx/gprice/cs-commentable-ids-param
Avoid CS search endpoint for non-search queries
2013-11-04 13:26:11 -08:00
John Jarvis
471e439fc3 Merge pull request #1565 from edx/jarv/ungencertificates-http-optione
adds a new option to ungenerated_certs to use http in the callback url
2013-11-04 13:16:36 -08:00
Julia Hansbrough
448f5cc41f Response to CR 2013-11-04 20:32:47 +00:00
Julia Hansbrough
1a3f4cb8f8 Moved can_refund logic to CourseEnrollment 2013-11-04 18:48:43 +00:00
Julia Hansbrough
e66f9a243b Clarified wording in a docstring 2013-11-04 18:38:49 +00:00
Julia Hansbrough
b0fcadad31 Moved #unenroll-modal to different template 2013-11-04 18:38:49 +00:00
Julia Hansbrough
c375666d88 Added new copy, small CR fixes
* Changed text for "Are you sure you want to refund"...
* Addressed a CR comment adding clarity to student view code
* Converted UTC to pytz.utc
2013-11-04 18:38:46 +00:00
Julia Hansbrough
81661385fb More response to Dave's PR 2013-11-04 18:38:45 +00:00
Julia Hansbrough
7ab8142e82 Response to Dave & Diana's CR 2013-11-04 18:38:44 +00:00
Julia Hansbrough
bf916b6624 Fixes from Daian's CR 2013-11-04 18:38:43 +00:00
Julia Hansbrough
fcab46b138 Refactored to use signals; full test coverage 2013-11-04 18:38:42 +00:00
Julia Hansbrough
63940141c8 End-to-end refunding with tests 2013-11-04 18:37:55 +00:00
Julia Hansbrough
045e69f3c5 Can check verified-ness and expiration date 2013-11-04 18:37:54 +00:00
Adam
4b473b9b8e Merge pull request #1578 from edx/adam/fix/registration-page-wording
"Public Display Name" -> "Public Username" on registration page [LMS-139...
2013-11-04 09:57:00 -08:00
Giulio Gratta
5c0c7ba6bb Merge pull request #1560 from edx/giulio/a11y-user-menu
User menu a11y changes to allow use of spacebar, escape key and arrows to navigate
2013-11-04 08:53:46 -08:00
Sarina Canelake
198452cd1c Adds Staff and Instructor factories 2013-11-04 11:38:43 -05:00
Sarina Canelake
eb0e09d63f Clean up some instructor dash code 2013-11-04 11:38:43 -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
Brian Talbot
b5ec2c72f9 LMS: revises instructional copy for reverification flow 2013-11-04 10:59:50 -05:00
Adam Palay
69eebf43f4 "Public Display Name" -> "Public Username" on registration page [LMS-1393] 2013-11-04 10:49:49 -05:00
Giulio Gratta
6e988443f6 User menu a11y changes to allow use of spacebar, escape key and arrow keys or tab and shift+tab to navigate 2013-11-01 14:34:02 -07:00
Brian Talbot
6541b45566 Merge pull request #1572 from edx/talbs/fix-studio-forgotpassword
Studio: Fix - Forgot Password Modal
2013-11-01 13:40:40 -07:00
Brian Talbot
8048a4b25b Studio: changes URL for password reset to direct to LMS login view
STUD-689
2013-11-01 16:37:08 -04:00
Greg Price
2123d5e7ae Merge pull request #1570 from edx/gprice/forum-staff-label
Remove label from forum posts by global staff
2013-11-01 13:10:54 -07:00
Greg Price
7013c997f7 Merge pull request #1553 from edx/gprice/forum-follow-a11y
Improve accessibility of forum follow buttons
2013-11-01 13:02:01 -07:00
Diana Huang
002972f24c Remove dates from status messages
* clean up one last typo

LMS-1387
2013-11-01 15:47:04 -04:00
Will Daly
9ab35759be Added wait for problem to re-render when checking or resetting it
Added wait for JS on upload page
Fixed an issue where css_click wasn't waiting for JS to load
2013-11-01 14:31:37 -04:00
Greg Price
c4cdb457de Remove label from forum posts by global staff
The motivation for this change is performance. The forums UI code gets
the list of users for each role and renders the staff label based on
those lists. The list for the staff role is expensive to compute because
there is no index on the is_staff attribute, and we cannot create one
because the User model is built into django.

Users with is_staff=True are still assigned the Moderator role upon
enrolling in a course, so this change will have no practical effect
except that a user who is granted staff privileges after enrolling in a
course will have to be made a Moderator in order for their posts to be
labeled.

Additionally, the UI did not use the list of users with the Student
role, so that list has been removed as well.
2013-11-01 14:16:55 -04:00
John Jarvis
f0b074b880 also adding insecure option to regenerate_user command 2013-11-01 12:05:59 -04:00
John Jarvis
ff8c58f5ee adds a new option to ungenerated_certs to use http in the callback url 2013-11-01 11:49:12 -04:00
Sarina Canelake
9f104eb617 Merge pull request #1558 from edx/sarina/beta_email_background_history
Implement background email tasks on student dash
2013-11-01 08:09:30 -07:00
Sarina Canelake
fff36275db Implement background email tasks on student dash
LMS-1244
2013-11-01 09:20:34 -04:00
Greg Price
6bca7de4b0 Avoid CS search endpoint for non-search queries
This change requires cs_comments_service version 31ef160 or later. Now
that the /threads endpoint can filter by commentable_ids, use that
instead of the /search/threads endpoint, which does not sort and
paginate correctly.

Bug: FOR-224
2013-10-31 16:49:01 -04:00
Sarina Canelake
944c433699 Merge branch 'release' 2013-10-31 15:04:48 -04:00
Diana Huang
17610edf77 Code cleanup due to review comments
* make `user_status` more intelligent
* remove some logic from the templates
* rename `parse_error_msg` to `parsed_error_msg`
* fix up and add more tests

LMS-1387
2013-10-31 15:01:39 -04:00
Diana Huang
5389d6b7cf Remove DAYS_GOOD_FOR from being a class variable.
LMS-1387
2013-10-31 15:01:39 -04:00