Commit Graph

19654 Commits

Author SHA1 Message Date
Neurolit
731ac40b9f LMS: add CSRF token to register form 2013-11-06 01:38:44 +01:00
jmclaus
a6c02ccc5b Merge pull request #1574 from edx/jmclaus/feature_tests_video_player_controls_a11y
a11y tests for video player controls [BLD-386]
2013-11-05 14:11:41 -08:00
jmclaus
e892c979b0 Added tests to video player controls to check new WAI-ARIA functionality. Added global custom Jasmine matcher to helper.coffee
[BLD-386]
2013-11-05 16:38:33 -05:00
David Baumgold
f02df33a54 Merge pull request #1571 from edx/db/js-main-setup
Do JS setup immediately when possible
2013-11-05 12:07:09 -08: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
David Baumgold
9e781e0b6d Merge pull request #1590 from edx/db/youtube-fallback
If the YouTube API JS fails to load, the rest of the JS should still run
2013-11-05 07:46:34 -08: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
David Baumgold
e1c94888e4 If the YouTube API JS fails to load, the rest of the JS should still run
Fixes BLD-472
2013-11-05 10:22:01 -05:00
Julia Hansbrough
68a429022d Merge pull request #1589 from edx/flowerhack/fix/remove-duplicate-course-helper-code
Removed duplicate code
2013-11-05 07:04:05 -08:00
Sarina Canelake
ea529b8841 Fix instructor api tests 2013-11-05 09:26:32 -05:00
Julia Hansbrough
8b6568f448 Removed duplicate code 2013-11-05 14:17:34 +00:00
Will Daly
0d1dc8e2d4 Merge pull request #1584 from edx/will/enable-course-id-tests
Enabled course id clash command tests
2013-11-05 04:50:23 -08: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
Will Daly
85203e8134 Enabled course id clash command tests 2013-11-04 16:15:20 -05:00
Julia Hansbrough
448f5cc41f Response to CR 2013-11-04 20:32:47 +00:00
John Jarvis
83f876eff8 Merge pull request #1582 from edx/jarv/create-user-admin-command
adding create_user script
2013-11-04 12:19:49 -08:00
John Jarvis
24524ef305 addressing comments 2013-11-04 15:14:20 -05:00
John Jarvis
4a910f8724 adding create_user script 2013-11-04 14:58:34 -05:00
Will Daly
7830bb203f Acceptance tests use asset pipeline 2013-11-04 14:04:04 -05: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
Diana Huang
b489514096 Merge pull request #1577 from edx/diana/clean-up-choose
Determine which mode was selected more intelligently.
2013-11-04 10:14:59 -08: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
David Baumgold
b119a90996 Do JS setup immediately when possible 2013-11-04 12:40:14 -05: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
Will Daly
97d32acd87 Merge pull request #1576 from edx/will/dateutil-version
Pin dateutil version to 2.1
2013-11-04 08:26:15 -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
Diana Huang
dc0e3d04ab Determine which mode was selected more intelligently.
LMS-1384
2013-11-04 10:25:28 -05:00
Will Daly
57556c2473 Pin dateutil version to 2.1 2013-11-04 10:18:54 -05:00
Alexander Kryklia
df5b1e97d8 Merge pull request #1514 from edx/alex/add_latex_compiler_key
Alex/add latex compiler key
2013-11-04 02:14:53 -08:00