Commit Graph

2417 Commits

Author SHA1 Message Date
frances botsford
93425a7c47 Merge pull request #5719 from edx/frances/fix/rtl-dashboard-fixes
small UI fixes on dashboard for RTL
2014-10-24 15:26:42 -04:00
frances botsford
60bb6a1021 Merge pull request #5696 from Stanford-Online/giulio/course-about-font-awesomize
Convert icons on course_about to font awesome
2014-10-24 14:05:23 -04:00
Frances Botsford
13b97e3606 small UI fixes on dashboard for RTL 2014-10-24 14:01:39 -04:00
Giulio Gratta
5b647a3a12 remove unused icon images 2014-10-23 14:04:15 -07:00
stephensanchez
61436ea195 Merge branch 'release' 2014-10-23 19:41:31 +00:00
Giulio Gratta
07263de841 Convert icons on course_about to font awesome 2014-10-23 10:54:18 -07:00
Muhammad Shoaib
b0802aafc8 css fix of remove icon and Fixed a bug where the discount coupon applied ‘disappeared’
when changing the quantity between enrollment vs reg code cart types.
2014-10-22 09:12:32 -04:00
polesye
7e6483f7b5 TNL-633: Remove leftover Google Font reference. 2014-10-22 16:11:49 +03:00
asadiqbal08
1035d67a25 WL-98
fix typo and add more security on API

fix some bugs and typos

address PR feedback

be sure to send emails when accounts already exist

PR feedback

fix multiple uploads

pep8 fixes

pep8 fix

pylint fixes

fix url mapping

WL-98
- Complete code coverage
- Update code for error and warning messages.
- improve code as per some suggestions

updated the UI of the auto_enroll feature

fixed the errors

PR feedback

add test

add back file filtering

add some more error handling of input

remove unneeded coffeescript code

pylint fixes

add pep8 space

WL-98
- Updated and added test cases.
- Updated membership coffee file for errors display handling.
- fixed minor text issues.

allow for blank lines and add a test

add blank line (pep8)
2014-10-21 14:23:46 -04:00
Brian Talbot
c62bb614f3 LMS: resolving display issue with edx-footer's width 2014-10-20 16:57:01 -04:00
chrisndodge
1abf064dfd Merge pull request #5235 from edx/cdodge/shopping-cart-rewrite
Cdodge/shopping cart rewrite
2014-10-20 11:13:51 -04:00
Renzo Lucioni
6013c529f4 Merge pull request #5615 from edx/renzo/account-password-reset
Add password reset request handling to the account page
2014-10-20 10:21:18 -04:00
asadiqbal08
4f7c494922 EX-71 New shopping Cart UI Single person purchase
Ex-74 Registration Code redemption

fix the translation issues

added a check if a user is already registered in a course. Changed the messages

added course depth=0 and removed pep8 violations

Ex-72-added additional billing information

Added a new CSV file in the instructor dashboard sales tab to download all the order sales separated from the invoice sales

fix path to image

updated the failed unit tests and add some minor tweaks in the Shoppingcart.scss

Ex-78 New UI In receipt page

EX-73 Purchasers can buy a course on behalf of a different student

WL-78 updated the receipt page UI.

Wl-72 updated Billing Information UI and removed the Order Address fields

WL-71 Remove Purchase Type Buttons from UI

WL-71 Updated minor UI issues and updated test cases

WL-78 updated the enrollment links in the receipt page

made changes in Order generated sales csv in Instructor Dashboard.
 The total_registration_codes and total_used_codes
  were not correctly stored in the csv file.

1) The total_registration_codes were not filtered with
 course_id.
2) The total_used_codes that a user had redeemed
 were not correctly included in the CSV.

added a fix in the courseware view to let the users visit the courseware if they have enrolled in the course by clicking on the enrollment link

rebase and resolved conflicts with master

WL-97 Bulk Registration Email Confirmation
Below is the commit summary.
- Make email text bold as per requirement.
- Improve email template quality and reorder points.
- Add text in billing details page : "if no additional billing details are populated the payment confirmation will be sent to the user making the purchase"
- Update text on receipt page "You have successfully purchase 3 course registration codes"

WL-100 fixed the bug on the edit/add coupon and set course price.
Ajax requests were duplicating in each callback. fixed this issue by creating the manual ajax request rather than the Lean Modal Ajax requests

allow for better White Label branding in shopping cart purchase emails

fix up typos and text

fix goof

fix

fix

incorporated model changes as suggested by Jason.

updated order sales csv

updated test cases for CourseRegCodeItem model and csv for the order generated sales

updated the migrations history

fixed the lms acceptance tests

Be sure to check for multiple types

address PR feedback

PR feedback

PR feedback

pep8 fix
2014-10-19 21:50:29 -04:00
Renzo Lucioni
ff587c5cbb Add password reset request handling to the account page
The next step in the password reset process (confirmation) continues to be handled by student.views.password_reset_confirm_wrapper, a custom wrapper around Django's password reset confirmation view.
2014-10-18 00:54:38 -04:00
Brian Talbot
5a31005e96 Merge pull request #5563 from lpil/master
Stop page extending out of viewport width by 40px
2014-10-17 17:14:01 -04:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Omar Al-Ithawi
d8bf0ef5a5 Elegant rtl/ltr css switch, LMS RTL fixes, language aware @cache_if_anonymous 2014-10-17 13:51:42 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Omar Al-Ithawi
9b287960e7 LMS RTL fixes 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Louis Pilfold
16ed497497 Use box-sizing SCSS mixin rather than property 2014-10-17 09:09:19 +01:00
Ben Patterson
5703adb722 Merge branch 'release'
Includes rc/2014-10-14
2014-10-16 20:11:55 -04:00
Daniel Friedman
64d2514f2c Merge pull request #5528 from edx/dan-f/data-download-tech-debt
Student profile CSV background task tech debt
2014-10-15 16:54:41 -04:00
Daniel Friedman
62c46c80e7 Bump the report downloads poll interval to 20 seconds
TNL-565
2014-10-15 15:58:08 -04:00
jsa
786fc806f5 Add topic selection to inline thread editing, fixing errors
Co-Authored-By: Brian Talbot <btalbot@edx.org>

TNL-549
2014-10-14 15:45:19 -04:00
Renzo Lucioni
257e8cf857 Merge pull request #5551 from edx/renzo/track-selection-test-cleanup
Clean up after track selection experiment
2014-10-14 15:06:19 -04:00
Renzo Lucioni
bd7715a393 Clean up after track selection experiment 2014-10-14 13:56:49 -04:00
Will Daly
5d77fab265 Merge pull request #5541 from edx/will/dashboard-js-shame
Dashboard template cleanup
2014-10-14 11:54:57 -04:00
Louis Pilfold
a501fbfc2d Stop page extending out of viewport width by 40px
Currently the .container and .wrapper-footer elements are set to 100%,
and also have horizontal padding added to them. This results in a total
width of greater than the full width of the viewport; This causing the
browser to scroll horizonally into empty space, regardless of how wide
the viewport is.

I had added the `box-sizing: border-box` to these elements in order to
resolve this.

Cheers,
Louis
2014-10-13 14:43:16 +01:00
Stephen Sanchez
81d4a24b6d Making the header width fixed until we have responsive design. 2014-10-10 12:17:58 -04:00
Will Daly
e0133b12a6 Move JavaScript from dashboard template into its own module
Make HTML comments Mako comments
2014-10-10 08:45:54 -04:00
Renzo Lucioni
37625e8e29 Merge pull request #5515 from edx/renzo/language-backbone
Use Backbone for student account and profile JS.
2014-10-09 09:50:40 -04:00
stephensanchez
12ffe18085 Pull Request comments addressed. Tests fixed. 2014-10-08 21:26:09 +00:00
Renzo Lucioni
00d976b85d Use Backbone for student account and profile JS.
Validate student account and profile form fields. Use RequireJS for Jasmine tests of account and profile JS.
2014-10-08 15:50:13 -04:00
stephensanchez
4d68738c38 Adding new styles to the new donation button. 2014-10-08 19:34:25 +00:00
Will Daly
c4eee8ebc3 Merge pull request #5502 from edx/will/per-course-donation-button
Add donation button to the enrollment success message
2014-10-08 06:05:37 -04:00
Nimisha Asthagiri
d7f850a764 Merge branch 'release'
Conflicts:
	lms/djangoapps/instructor/features/data_download.py
2014-10-07 16:23:28 -04:00
Will Daly
f8365a2d3b Add donation end-point
Make donations configurable

Added donation button to dashboard

Generalize merchant defined data for payment processor
2014-10-07 14:22:55 -04:00
stephensanchez
afaaca969a Adding new styles for dashboard notifications.
Change the reverification failure message styling.

Changing templates so new styles do not appear in courseware.

Removing unused aria tag.

PR comments on cleaning up SASS

Fix signup LMS test.

Copy changes per review on PR

Updating based on PR comments

Style and HTML changes for notifications
2014-10-07 15:44:47 +00:00
Daniel Friedman
ba3f7f9409 Make student profile CSV download a background task, add cohort column 2014-10-02 14:21:13 -04:00
cahrens
e9e37dfaa1 Don't put all of xmodule_js as src (changes coverage metrics). 2014-10-01 15:11:13 -04:00
Christina Roberts
7f4cc1c75c Merge pull request #5407 from edx/cohort-management
Cohorts UI
2014-10-01 11:01:03 -04:00
Andy Armstrong
6219ecacfe Support adding cohorts from the instructor dashboard
TNL-162
2014-10-01 09:22:32 -04:00
Brian Talbot
b58f7ad7b4 resolving display issues by re-implementing discussions-scoped is-hidden classes 2014-10-01 09:22:32 -04:00
Brian Talbot
21aab92183 LMS: revising .is-hidden utility class to be used at a global level 2014-10-01 09:22:31 -04:00
Brian Talbot
62db7a82a1 converting instructor dashboard message UI to use .is-hidden vs.is-shown stateful CSS classes 2014-10-01 09:22:31 -04:00
Andy Armstrong
8627fdef32 Support adding students to a cohort via the instructor dashboard.
TNL-163
2014-10-01 09:22:31 -04:00
Brian Talbot
13882b7544 adding copy revisions and light styling support for cohort management 2014-10-01 09:22:31 -04:00
Brian Talbot
3aa842db52 Adding static rendering for cohort group creation UI
* adding styling/markup for "add new group" controls, messages, and form
* small FED and UI changes to overall cohort management UI
2014-10-01 09:22:31 -04:00
Nimisha Asthagiri
b4c826e747 TNL-329 Client-side work for displaying cohort description. 2014-10-01 09:22:30 -04:00