Commit Graph

6923 Commits

Author SHA1 Message Date
Ned Batchelder
fec283366f Fix the decoding of ?next= 2014-07-24 16:11:43 -07:00
Anurag Ramdasan
f77c06ff1f check if next is not defined 2014-07-24 16:10:44 -07:00
Anurag Ramdasan
c4fa475c7a add var declaration for next 2014-07-24 16:10:36 -07:00
Anurag Ramdasan
4df0efa250 decode uri component before redirect for safe redirect 2014-07-24 16:10:01 -07:00
chrisndodge
e9f2801cef Merge pull request #4479 from edx/muhhshoaib/Ex-40-Coupon-discount-value-add-validation
Fixed the  discount value bug
2014-07-21 21:48:56 -04:00
Jason Bau
bd03741c79 Merge pull request #4212 from Stanford-Online/ndupoux/fixing-registration-page
Ndupoux/fixing registration page
2014-07-21 18:07:10 -04:00
marcotuts
c7d88deb47 Merge pull request #4453 from edx/marco/dashboard-styling-tweaks
Visual styling adjustments to profile area on Course Dashboard
2014-07-21 17:50:04 -04:00
njdup
770e7aac49 User registration prevents using password as username.
Some users erroneously set their password as their username with the original layout, because the username field directly followed the password field. Users may be accustomed to the common occurrence of a password confirmation field directly following the password field.
To fix the issue, I did the following:
   - Moved the existing username and real name form fields above the password field.
   - Added a validation in the create_account handler in common/djangoapps/student/views.py, which confirms that the password field does not match the username field.

New tests created to check the added functionality.
2014-07-21 14:04:48 -07:00
Ned Batchelder
00377652e4 Merge pull request #4179 from IONISx/tusbar/remove-course-id-from-title
Remove course ID from title in course about page
2014-07-21 13:57:34 -04:00
John Jarvis
7023eb4c19 resolving merge conflicts 2014-07-21 13:42:06 -04:00
Muhammad Shoaib
2d41ebe48f removed the discount value bug
check error handling if the discount value is not an integer
2014-07-21 09:12:57 -04:00
Renzo Lucioni
adae7c6d95 Merge pull request #4437 from Stanford-Online/giulio/theme-segment-io
always include GA file
2014-07-17 14:34:19 -04:00
marco
a129fd4a27 adjusted styling of dashboard profile area to remove heavier gradients and other small cleanups 2014-07-17 14:26:22 -04:00
Giulio Gratta
77c3d15d20 always include GA file 2014-07-17 10:25:06 -07:00
Jason Bau
e1fcac93c5 fix shib reg from course about page 2014-07-17 10:51:32 -04:00
Sarina Canelake
666f563ee6 Merge pull request #4418 from Stanford-Online/dcadams/make_registration_button_conditional
Make text on register button on About page conditional.
2014-07-15 16:37:00 -04:00
David Adams
aa1b623904 Make text on register button on About page conditional.
Added a new advanced setting; invitation_only

 If invitation_only display "Enrollment in this course is by invitation only"
 Otherwise, if outside of enrollment period display "Enrollment is Closed"

 This issue is logged at LMS-2670

 Also fixed in this PR is issue LMS-2717; even though the Register button was greyed out,
 clicking it sent one to the registration page.
2014-07-15 12:51:12 -07:00
Sarina Canelake
df8f3bd39e Revert "Pull out edX into variables in password reset email"
This reverts commit 3a2276b537.
2014-07-15 10:20:09 -04:00
Kevin Luo
adc7c13f45 Fix pending name changes template
- Strings marked for translation need to be wrapped in quotes to be
string type.
- Update old post function call
- Remove extra close brackets in function definitions
- Wrap href attribute in quotes
- Move square bracket outside of translated text
2014-07-14 17:04:42 -07:00
Peter Pinch
2c8f82f03d Fixing calculator hint to display correct definition of the constant T 2014-07-13 17:35:52 -04:00
Kevin Luo
3a2276b537 Pull out edX into variables in password reset email 2014-07-11 12:25:54 -07:00
Kevin Luo
92381f0f84 Subsume browser links to variables, to exclude from translation 2014-07-10 15:40:51 -07:00
chrisndodge
665ccdb730 Merge pull request #4172 from edx/cdodge/ecommerce-improvements
eCommerce enhancements
2014-07-10 15:23:58 -04:00
James Tauber
256c6bb4a5 Merge pull request #4095 from edx/jtauber/open-edx-footer
Separate edX / Open edX footer
2014-07-10 15:02:11 -04:00
Sarina Canelake
50709c163f Merge pull request #4367 from edx/sarina/i18n-course-handouts
i18n LMS and Studio components of course handouts
2014-07-10 14:47:23 -04:00
James Tauber
3cb8780284 Separate edX / Open edX footer.
We need to use an Open edX footer by default (and that's what all non-edx.org
instances should base their footer off) and only use the edX footer on
edx.org.

This commit uses `SITE_NAME` to determine which footer to use.

Sites using theming or micro-sites with a `SITE_NAME` not ending in `edx.org`
should not be affected.
2014-07-10 14:15:37 -04:00
James Tauber
d7e6f94a09 Merge pull request #3191 from eduNEXT/feature/fmo/microsite-wiki
Feature/fmo/microsite wiki
2014-07-10 13:18:53 -04:00
Sarina Canelake
a5dc426cc8 i18n LMS and Studio components of course handouts 2014-07-10 11:28:00 -04:00
asadiqbal08
5734d2a883 asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS
Added username into Authors file

[Ex-12] Add user to input coupon code in the Shopping Cart

[Ex-13] Discount should be reflected in the Payment confirmation page and email

added E-commerce Tab in Instructor Dashboard

added name/email in authors file

removed the is_active column, change the colors scheme, fixed bugs

wip

wip

test github account

STORE_BILLING_INFO set to True

cybersource api update, reference number updated, merchant_data removed from params

View Course buttons on receipt

link for course added to receipt

receipt.html view course button - func update

receipt.html course link update

move new CyberSource implementation to a separate file so that we can keep the original

remove config changes

remove config changes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

remove array paid_course_ids init in views.py

removed the is_active filter=false, added styling to the inactive coupon codes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

Add column to the list of coupons in the E-Commerce tab

Add ability for microsites to specify custom CyberSource secret configuration, i.e. run under different accounts

make the new CyberSource2 also microsite aware

updating migration for student and shopping cart apps

added user signup functionality that orignated from the Microsites

added non-microsite user signup tests

fix the hard coded callback URL to localhost

add comment

Modify e-commerce instructor tab to show a total amount above the coupon listings for admin finance user

made changes as suggested by diana khuang

add the CourseAccessRoles table to the Django Admin website

shopping cart coupon checkout changes as suggested by Jason Bau

changes are made according to the suggesstions on PR#4172

changes made in the coupons file

changes in the coupons get_coupon_info view

fix merge conflict resolution error

changes in the remove_coupon view json response

changes as suggested by David Baumgold

pep8/pylint fixes

Changes as suggested by jasonBau

don't assume item in shopping cart is a PaidCourseRegistration

fix up some logging

changed the urls of the coupon views and use the post to get the values from the request
2014-07-10 09:35:32 -04:00
Greg Price
a4de82e1c3 Remove sidebar class from forum nav
This will enable much cleanup of the relevant SASS rules.
2014-07-07 14:21:53 -04:00
Greg Price
6d87443a39 Update discussion tab sidebar header
The home button is removed, the search box is always displayed, and many
visual adjustments are made, along with a large amount of refactoring.

Originally reviewed in #4211
2014-07-02 16:58:34 -04:00
Greg Price
05d8eeecd7 Improve forum sorting and cohort filtering UX
Thread entries now show an activity count that includes the original
post, and only one of the vote count and activity count is displayed
based on the user's selected sort. The sorting and filtering options now
both use a select and are somewhat more verbose, and the visual styling
of the sort/filter bar is updated.

Originally reviewed in #4165 with a bugfix in #4211
2014-07-02 16:58:34 -04:00
Greg Price
551cea9379 Add labels to forum thread list
A thread will be labeled if it is pinned, if the user is following it,
or if it was authored by a staff member or community TA. This also
slightly changes the color used for community TA labels.

Originally reviewed in #4072
2014-07-02 16:58:33 -04:00
Greg Price
89ba90a695 Re-design forum thread list
Use larger and lighter title font, decrease padding, and use lighter
solid backgrounds instead of gradients. Also, refactor SASS code to
conform better to our new style, including using more specific class
names.

Originally reviewed in #4072
2014-07-02 15:31:55 -04:00
Carlos Andrés Rocha
9261a3e6b9 Merge pull request #4234 from rocha/rocha/analytics-active-count
Get active student count from new analytics data API
2014-06-30 16:53:56 -04:00
Clinton Blackburn
36cfe7ab9e Get active student count from new analytics data API
Disabled by default.
2014-06-30 15:16:30 -04:00
Jim Abramson
5d37ea83f7 Merge pull request #4216 from edx/jsa/new-post-redesign
consolidate new post form variants into single client-side template/view
2014-06-30 14:39:46 -04:00
jsa
994ccd1110 consolidate new post form variants into single client-side template/view 2014-06-29 20:45:22 -04:00
Felipe Montoya
8fd3ab07ba If microsites are enabled and it is a microsite request, then take the microsite path for theming 2014-06-27 23:01:29 -05:00
Brandon DeRosier
36873ffc92 Datetime localized on gitlog page of sysadmin dashboard 2014-06-27 12:27:50 -04:00
Christine Lytwynec
96e5139d66 Merge branch 'release'
Conflicts:
	common/lib/xmodule/xmodule/tests/test_video.py
2014-06-25 13:51:31 -04:00
Ned Batchelder
844eaeffca Merge pull request #4184 from IONISx/tusbar/add-mktg-check-dropdown
Remove FAQ link in header when disabled
2014-06-23 16:43:37 -04:00
Adam
970d8dd2d0 Merge pull request #4190 from edx/usman/lms2848-htmlbooks-fix
Fix for htmlbooks
2014-06-23 16:16:12 -04:00
Piotr Mitros
4eb234e79f Merge pull request #4174 from edx/pmitros/chromeless-xblocks
XBlocks can disable navigation chrome.

This allows for full-screen XBlocks (such as code IDEs), as well as allowing us to somewhat hackishly build top-level XBlocks. This is the first step on the path to non-hackish top-level XBlocks.
2014-06-23 11:56:05 -04:00
Bertrand Marron
ae3d9feb7e Remove FAQ link in header when disabled 2014-06-23 15:24:54 +02:00
Usman Khalid
d36e00d4a5 Pass storage_url and token values as parameters to StudentNotes init.
LMS-2848
2014-06-23 16:38:02 +05:00
Usman Khalid
f253f9a784 Added mising tinymce.js to static_htmlbook.html.
LMS-2848
2014-06-23 16:10:02 +05:00
cahrens
a395c2fa4b Complete Studio support for handling group configuration changes
STUD-1658
2014-06-20 11:41:23 -04:00
Andy Armstrong
11c25e8c1a Add Studio handling for changes to group configurations
STUD-1658
2014-06-20 11:41:22 -04:00
Piotr Mitros
87a462e206 Review from Cale 2014-06-20 11:07:30 -04:00