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

14221 Commits

Author SHA1 Message Date
attiyaishaque
48e7fc8125 Bokchoy Test Deleted. 2016-05-18 11:40:59 +05:00
attiyaishaque
275a31ec42 Change in Bokchoy test according to new design. 2016-05-18 11:40:58 +05:00
attiyaishaque
19ea9ae9a0 Unit tests added and changes in enroll_staff view. 2016-05-18 11:40:58 +05:00
attiyaishaque
b19264974b Adding unit test 2016-05-18 11:40:58 +05:00
attiyaishaque
94b58c2df6 Adding bokchoy test and change in html file. 2016-05-18 11:40:57 +05:00
Awais Jibran
3fb6592443 SUST-24 Initial commit 
Add bokchoy test and changes in html
 2016-05-18 11:40:57 +05:00
clrux
7b34f4317d Merge pull request #12502 from edx/clrux/ac-474 
Corrects duplicate main element wrapper on Wiki article template
 2016-05-17 17:36:43 -04:00
John Eskew
e5a5704b38 Merge pull request #12495 from edx/jeskew/release_to_master_merge 
Merge release to master for 2016-05-17 release
 2016-05-17 17:16:16 -04:00
clrux
5db315bebf Merge pull request #12371 from edx/clrux/ac-405 
AC-405 calculator image to icon
 2016-05-17 17:11:56 -04:00
clrux
f7eba02808 Merge pull request #12411 from edx/clrux/ac-396 
AC-396 updating courseware nav to display correctly on high contrast displays
 2016-05-17 17:11:09 -04:00
Clinton Blackburn
c67ef7a8fa Merge pull request #12457 from edx/clintonb/user-update 
User administration updates
 2016-05-17 16:35:09 -04:00
Matt Drayer
f2ffbab0ec mattdrayer: Add receipt page + JS test fixes 2016-05-17 15:41:29 -04:00
AlasdairSwan
7a0d7818bc Offscreen a11y test fix 2016-05-17 15:41:28 -04:00
Matt Drayer
c6249f4227 mattdrayer/WL-466: Use LMS Courses API 2016-05-17 15:41:28 -04:00
AlasdairSwan
646d0b9b68 ECOM-4450 Added help tab and model styling to Pattern Library pages 2016-05-17 15:41:28 -04:00
cahrens
cafc15cf7d Move city and country fields to the very end. 
OSPR-1155
 2016-05-17 15:41:28 -04:00
Douglas Hall
4bdeaf7696 Always include the course price in the course_about template context 2016-05-17 15:41:27 -04:00
Douglas Hall
defb08e845 Include course price in course_about template context if either the ecommerce service is enabled or shoppingcart is enabled 2016-05-17 15:41:27 -04:00
Matt Drayer
fe1e659fb7 mattdrayer/rc/2016-05-17: Check for "code" on receipt line item attribute. 2016-05-17 15:41:27 -04:00
Chris Rodriguez
36cbdf576b Corrects duplicate main element wrapper on Wiki article template 2016-05-17 15:15:58 -04:00
Waheed Ahmed
ee65c8783d Use CourseOverview instead of modulestore. 2016-05-17 21:00:53 +05:00
Christina Roberts
8c418c62fe Merge pull request #12033 from sigberto/submission-history-tz 
Display correct timezone on timestamp for question submission
 2016-05-17 10:52:30 -04:00
Ahsan Ulhaq
7a43b57037 Merge pull request #12401 from edx/ahsan/removal-underscore-string-from-commerce-js 
Ahsan/removal underscore string from commerce js
 2016-05-17 19:49:17 +05:00
Peter Fogg
1bd2ec2535 Merge pull request #12474 from edx/peter-fogg/date-summary-fixes 
Fixes for courseware date formatting/translation.
 2016-05-17 10:13:15 -04:00
Ahsan Ulhaq
300002b54d Add js test for analytics event on LMS receipt page 
ECOM-4281
 2016-05-17 18:56:05 +05:00
Peter Fogg
80bfa36d09 Fixes for courseware date formatting/translation. 2016-05-17 09:20:07 -04:00
Adam
cf8e37b381 Merge pull request #12455 from edx/adam/fix-email-from-addr-length 
refine from_addr length limits (TNL-4264)
 2016-05-17 08:30:15 -04:00
sigberto
6e0fb24dab Display correct timezone on timestamp for question submission 
The view for submission history used to grab the timezone from the database (UTC) and
appeded the TIME_ZONE variable after (could be any time zone). Adjusted displayed
timedate to the TIME_ZONE variable. Added unittest checks the localized datetime
object used by submission history for the expected hour difference.
 2016-05-16 12:26:37 -07:00
Peter Desjardins
879fa212c7 Updated URLs for help topic links that had become stale. Per DOC-2568. 2016-05-16 14:30:17 -04:00
Peter Fogg
d5cae7b58a Merge pull request #12450 from edx/peter-fogg/referral-tracking 
Add referral tracking for new registrations.
 2016-05-16 12:08:56 -04:00
Peter Fogg
0e66baf41f Add referral tracking for new registrations. 
ECOM-4325
 2016-05-16 11:17:23 -04:00
Eric Fischer
0cf3e39c31 Replace bulk email settings with admin config models 
Moves ENABLE_INSTRUCTOR_EMAIL and REQUIRE_COURSE_EMAIL_AUTH from settings files
to admin-accessible configuration models. This allows for the bulk email settings
to be modified without a new AMI deploy. See TNL-4504.

Also updates tests:
    -python tests mock out the new configurations in place of the old settings
    -lettuce test has been moved to bokchoy
        (note that there was some loss of coverage here - the lettuce tests had
        been doing some voodoo to allow for cross-process inspection of emails
        messages being "sent" by the server, from the client! In discussion with
        testeng, this seems outside the realm of a visual acceptance test. So,
        the bokchoy test simply confirm the successful queueing of the message,
        and leaves the validation of sending messages to the relevant unit tests.)
    -bok choy fixture has been added, to replace the settings in acceptance.py
    -lettuce and bok choy databases have been updated to reflect the backend changes

The new default is to have bulk_email disabled, we'll need to call this out in the
next OpenEdx release to ensure administrators enable this feature if needed.
 2016-05-16 11:09:39 -04:00
Douglas Hall
140fd85eb7 Merge pull request #12472 from edx/hasnain-naveed/WL-446 
ML-446 / Aligned the labels in login and registration pages
 2016-05-16 09:41:29 -04:00
Peter Fogg
89838d40ed Merge pull request #12373 from edx/peter-fogg/password-change-session-invalidation 
Expire sessions after a password change.
 2016-05-16 09:17:45 -04:00
Hasnain
c5f0fb87c8 ML-446 / Aligned the labels in login and registration pages 2016-05-16 12:35:08 +00:00
Adam Palay
c9b0e12d39 use markupspace for escaping 2016-05-13 11:15:00 -04:00
Renzo Lucioni
6975b66c08 Remove tab characters 2016-05-13 10:12:34 -04:00
Robert Raposa
1720645302 Merge pull request #12180 from edx/robrap/safe-template-marathon 
TNL-4290: Safe template marathon work
 2016-05-13 09:42:46 -04:00
Christina Roberts
c3dbcd08dd Merge pull request #12415 from edx/christina/delete-unused-files 
These old discussion templates are not referenced in the codebase.
 2016-05-13 09:21:43 -04:00
Clinton Blackburn
ebf32dc208 Moved manage_user and manage_group from edx-management-commands 
We need to create a user profile in order for users to be usable. This, coupled with the fact, that edx-platform is the owner of auth information, means these commands belong here.

ECOM-4310
 2016-05-13 09:16:04 -04:00
AlasdairSwan
7bca66c23e Merge pull request #12408 from edx/alasdair/ECOM-4215-program-details-page-setup 
ECOM-4215 adding setup for new program details page
 2016-05-12 18:25:13 -04:00
Peter Fogg
524e229245 Expire sessions after a password change. 
This is slightly more complicated than it should be since we're using
custom authentication middleware (i.e., not Django's standard
middleware class). We have to check that the session auth hash we have
stored is equal to the request's session auth hash (since the stored
hash is a function of the password). Normally this gets handled in
`django.contrib.auth.get_user`, but due to our caching we don't go
through that function, even in the cache miss case.

ECOM-4288
 2016-05-12 16:44:56 -04:00
AlasdairSwan
bc5daffc96 ECOM-4215 adding setup for new program details page 2016-05-12 16:39:23 -04:00
Matt Drayer
4d08379bfc Merge pull request #12451 from edx/mattdrayer/microste-jwt-auth 
mattdrayer/microsite-jwt-auth: Access setting through theming/microsites
 2016-05-12 15:59:40 -04:00
Chris Rodriguez
0dcd3d2da2 Simplifying styles 2016-05-12 15:45:07 -04:00
Adam Palay
91ae60f5e9 refine from_addr length limits (TNL-4264) 2016-05-12 15:12:41 -04:00
Matt Drayer
55cf0fb2c4 mattdrayer/microsite-jwt-auth: Access setting through microsites/theming framework 
* mattdrayer: Remove individual JWT settings
* mattdrayer: Add settings defaults to JWT_AUTH calls
 2016-05-12 15:04:26 -04:00
Ned Batchelder
adb9200e0a Merge pull request #12447 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-05-12 14:35:51 -04:00
Robert Raposa
2089728703 Safe template marathon work 2016-05-12 14:23:35 -04:00
Bill DeRusha
25a7d60aed Merge pull request #12448 from edx/bderusha/st-wiki-2 
Safe Templatize: wiki templates
 2016-05-12 14:19:02 -04:00