Commit Graph

2449 Commits

Author SHA1 Message Date
Sarina Canelake
92c1efe85c Last reference removed in 94886643b0 2014-11-07 11:18:49 -05:00
Sarina Canelake
20c13096ed Last references removed in ab2995fc85 2014-11-07 11:18:49 -05:00
Sarina Canelake
d5ba04874e Last references removed in ab2b7f344d 2014-11-07 11:18:49 -05:00
Sarina Canelake
1843dc4dda Last references removed in 854621be60 2014-11-07 11:18:49 -05:00
Sarina Canelake
47e185d12b Last reference removed in 1bc0b323b1 2014-11-07 11:18:48 -05:00
Sarina Canelake
6d415e484c Last reference removed in 2bfe0cb92d 2014-11-07 11:18:48 -05:00
Sarina Canelake
b16d04afec Last reference removed in 300d55cbd5 2014-11-07 11:18:48 -05:00
Sarina Canelake
826251c166 Last reference removed in 81a56a35ab 2014-11-07 11:18:48 -05:00
Sarina Canelake
ae1343ba2c Last references removed in 14345401cc 2014-11-07 11:18:48 -05:00
Sarina Canelake
f15ddb8e8c Last reference removed in e21e5284de 2014-11-07 11:18:48 -05:00
Sarina Canelake
4ebd5c188d Last reference removed in 89ba90a695 2014-11-07 11:18:48 -05:00
Sarina Canelake
6584df39e1 Last reference removed in 58c5066e66 2014-11-07 11:18:48 -05:00
Sarina Canelake
92b86af2c1 Last reference removed in 5ef94f1496 2014-11-07 11:18:47 -05:00
Sarina Canelake
f3aa21f5ba Last reference removed in 988e4e6da5 2014-11-07 11:18:47 -05:00
Sarina Canelake
a0b3ab2a0a References removed in 4dc527d119 2014-11-07 11:18:47 -05:00
Sarina Canelake
759fae2978 Can't find any references (current or historical) to these files 2014-11-07 11:18:47 -05:00
Sarina Canelake
6a5bb4f20d References removed in e1113d9ca9 2014-11-07 11:18:47 -05:00
Sarina Canelake
b69169a690 Remove unused images
Moved images in folders to top level where appropriate, and change references.

OPEN-297
2014-11-07 11:18:47 -05:00
Sarina Canelake
5cedbc7ee6 Rename branded asset; moved to LMS as that's where it is referenced [OPEN-302] 2014-11-07 09:50:45 -05:00
Sarina Canelake
90b40e7d57 Merge pull request #5823 from edx/sarina/delete-unused-lms-assets
Remove unused static assets (LMS)
2014-11-05 15:36:42 -05:00
Sarina Canelake
ad8bc69f93 Move all lms image files into lms/static/images [OPEN-303] 2014-11-05 09:10:15 -05:00
frances botsford
6047664b99 Merge pull request #5835 from OmarIthawi/omarithawi/fixed-rtl-icon-spacing-in-discussion
Fixed spacing of RTL icon in discussion
2014-11-04 16:44:17 -05:00
Omar Al-Ithawi
b79180bb97 Fixed spacing of RTL icon in discussion 2014-11-04 14:30:23 +02:00
Sarina Canelake
aeb3a7f575 fixup! Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4) 2014-11-03 16:49:18 -05:00
Sarina Canelake
15495e6ff3 Remove old 404 page 2014-11-01 00:13:06 -04:00
Sarina Canelake
6a06ff6a75 Remove unused static assets 2014-11-01 00:11:23 -04:00
Sarina Canelake
ed76907c0d Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4)
Delete lms/static/admin resources as they are no longer needed
for the admin page as of Django 1.4

Moved two files that were referenced elsewhere:
lms/static/admin/js/jquery.min.js -> lms/static/js/admin/jquery.min.js
lms/static/admin/js/urlify.js -> lms/static/js/admin/urlify.js
2014-11-01 00:01:17 -04:00
Martyn James
9f3b9c7ba3 Merge pull request #5818 from edx/release
Merging latest updates to release
2014-10-31 14:49:04 -04:00
Chris Dodge
fea9432b50 Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course 2014-10-30 13:11:02 -04:00
Adam Palay
6a40ed1d74 courseware header bar should not overflow shopping cart button TNL-722 2014-10-30 12:16:56 -04:00
Sarina Canelake
f1b95b3484 Merge pull request #5699 from Edraak/staff-debug-info-ltr-code
Make staff debug info code to be always LTR
2014-10-28 09:13:51 -04:00
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
Omar Al-Ithawi
4f4349a63b Make staff debug info code to be always LTR 2014-10-23 14:26:56 +03: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