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

9949 Commits

Author SHA1 Message Date
David Baumgold
dffd8648b3 Missed an ellipsis 2015-01-15 10:19:58 -05:00
David Baumgold
37d965d6a7 Merge pull request #6629 from edx/remove-ellipses 
Remove all ellipses
 2015-01-15 10:05:16 -05:00
Renzo Lucioni
542509358e Merge pull request #6632 from edx/renzo/fix-logistration-icons 
Fix broken Font Awesome icons
 2015-01-15 09:30:29 -05:00
Sarina Canelake
66cdb71a74 Merge pull request #6609 from mitocw/bdero/fix-detailed-gitlogs 
Collapsible import logs in sysadmin dashboard
 2015-01-15 09:20:44 -05:00
Bertrand Marron
c4a7d770cc Remove all ellipses 
It's a problem for accessibility
 2015-01-15 09:03:12 -05:00
Brandon DeRosier
a6dc7061cd Collapsible import logs 
- Increase maximum focused logs to 5
- Import logs render for all entries in the focused gitlog view
- `+`/`-` toggle buttons for collapsible gitlogs
 2015-01-15 02:27:38 -05:00
Afzal Wali
a8ebf6da7f Added the reportlab requirement to base.txt 
Added receipts_pdf.py

Used Paragraph for displaying a large body of text.

added the table

Line breaks in the para text. font size adjusted.

Improved the main table (alignments) and totals (converted to a table as well)

Converted the footer into a table, and allowed for pagination.

Added pagination to item data table.

Handled wrapping of long descriptions into multiple lines.

email attachment for both invoice and receipt

added the currency from the settings

Removed magic numeric literals and added meaningful variables.

Added initial set of substitutions from configuration

add defining logo paths via configuration

Removed font dependencies. Will use the system default fonts which appear good enough to me.

Alignment adjustments as per suggestions.

Fixed the pep8 violations. Added comments to styling

added the decimal points to the price values

Cleanup. Docstrings.

i18n the text in the pdf file

fix pep8/pylint issues

Changed the amounts from string to float.

Overrode the 'pdf_receipt_display_name' property in the OrderItem subclass Donation.

used the PaidCourseRegistration instead of the parent OrderItem to avoid course_id related exceptions.

quality fixes

added  the test cases for the pdf

made the changes in the pdf suggested by griff

updated the pdf tests to assert the pdf content

used the pdfminor library

fix quality issues

made the changes suggested by Will

added the text file that says "pdf file not available. please contact support"
 in case pdf fails to attach in the email
 2015-01-15 12:24:30 +05:00
Brandon DeRosier
84d7650aa1 Fix detailed gitlog 
- Make the correct (latest) gitlog show up instead of the second
- Show gitlogs for each entry when viewing detailed information for
  single course
 2015-01-14 19:23:05 -05:00
Tim Babych
dbfc12ce01 Merge pull request #6321 from edx/feature/edxnotes 
TNL-213: Student Notes
 2015-01-15 02:02:13 +02:00
Renzo Lucioni
83a5a24dce Fix broken Font Awesome icons 2015-01-14 18:42:46 -05:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content. 
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
 2015-01-14 23:34:11 +02:00
Christine Lytwynec
fd0754b4df Merge pull request #6626 from edx/clytwynec/fix-failing-login-tests 
add test security settings to bokchoy envs
 2015-01-14 15:46:20 -05:00
David Baumgold
f9d8198ef3 Merge pull request #6576 from edx/db/configure-tender-domain 
Make Tender optional and configurable
 2015-01-14 15:02:09 -05:00
Christine Lytwynec
abcf2bcad5 add test security settings to bokchoy envs 2015-01-14 14:49:41 -05:00
Jesse Zoldak
8a29280cbe Fix pep8 violations in common.py 2015-01-14 12:12:15 -05:00
David Baumgold
4d323271ee Make Tender optional and configurable 2015-01-14 11:25:55 -05:00
Stephen Sanchez
18e211ff1b Merge pull request #6615 from edx/sanchez/add_enrollment_as_app 
Adding the Enrollment API as a Django App in LMS.
 2015-01-14 11:20:18 -05:00
Martyn James
a4ed13231c Merge pull request #5410 from edx/mjames/MoreSecureByDefault 
edX Solutions Team: Default LMS security settings changes (Matasano)
 2015-01-14 10:58:43 -05:00
Sarina Canelake
9142268614 Merge pull request #6603 from edx/sarina/fix-i18n 
Fix i18n from Destination team pages
 2015-01-14 10:16:29 -05:00
stephensanchez
29d542a511 Adding the Enrollment API as a Django App in LMS. 2015-01-14 14:41:27 +00:00
AlasdairSwan
4052c729be Merge pull request #6600 from edx/alasdair/register-form-submit-fix 
ECOM-412 Set buttons types so enter now triggers register button
 2015-01-14 08:12:26 -05:00
Sarina Canelake
e88c298a94 Fix i18n from Destination team pages 2015-01-13 16:14:53 -05:00
AlasdairSwan
9046001130 ECOM-412 Set buttons types so enter now triggers register button 2015-01-13 14:28:34 -05:00
Braden MacDonald
6be35e0fc1 Merge pull request #6459 from edx/content-libraries 
Content libraries MVP
 2015-01-13 11:20:20 -08:00
Braden MacDonald
bce8ee692f Fix bug when deleting first of two recently added blocks 2015-01-13 10:11:59 -08:00
Stephen Sanchez
158a0a0e2e Merge pull request #6374 from edx/sanchez/enable_redeem_codes 
Enable redeem codes for Verified Cert Courses
 2015-01-13 13:06:55 -05:00
stephensanchez
b188430679 Enable redeem codes. 
Update the redeem code schema

Updating the redeem code schema.

Adding migration file.

Adding course mode support when redeeming a code.

Conflicts:
	lms/djangoapps/shoppingcart/views.py

Add sales admin privileges for redeem code generation.

Making sure redeem code URLs work for verified courses.

pep8 violations

Code Review and Test Cleanup changes

Added tests, fixed tests.

Updating the boolean checks in ecommerce template
 2015-01-13 15:21:24 +00:00
AlasdairSwan
d706f4de32 ECOM-880 added mobile app links to footer enabled by feature flag ENABLE_FOOTER_MOBILE_APP_LINKS 
Allow configuration to override links to mobile app stores
 2015-01-13 10:12:54 -05:00
Nimisha Asthagiri
e57f3e3b03 Merge pull request #6572 from edx/mobile/fix-decorator-api 
Fix Mobile API decorators
 2015-01-13 06:20:10 -05:00
Nimisha Asthagiri
9566a46a4d Fix Mobile API decorators. 2015-01-13 02:29:53 -05:00
AlasdairSwan
1e051e5ef8 Merge pull request #6555 from edx/alasdair/decoupled-verification-a11y 
Alasdair/decoupled verification a11y
 2015-01-12 18:52:28 -05:00
Brian Talbot
10168b6908 ECOM-873 accessability updates for decoupled verification 2015-01-12 16:21:34 -05:00
Christopher Lee
0625b84d12 Merge pull request #6557 from edx/clee-MA-187-value-error 
Clee ma 187 value error
 2015-01-12 16:18:20 -05:00
Brian Talbot
471f9e179e fix: adjusting vertical alignment on shopping cart action icons 2015-01-12 15:54:52 -05:00
christopher lee
3e5f7bacdd MA-187 ValueError fix 
Fix for MA-187 where a value error was thrown when
a course has a video directly under a section. This
PR handles the situations where a chapter or section
can be none, and then returns the appropriate url
if available.
 2015-01-12 14:15:18 -05:00
Braden MacDonald
10fe9c0180 pylint fixes 2015-01-12 11:00:51 -08:00
Braden MacDonald
9a116529ce Add module key and library source info to problem events 2015-01-12 10:39:13 -08:00
Braden MacDonald
3973317aa9 Report the original LibraryUsageLocator in LMS analytics 2015-01-12 10:39:12 -08:00
Adam
8dd7b78065 Merge pull request #6501 from edx/adam/update-copy-date 
update copyright dates
 2015-01-12 10:59:11 -05:00
Braden MacDonald
5f5b41d03f Remove state summary from the unit author page until SOL-192 2015-01-12 13:37:58 +03:00
Braden MacDonald
cdf7c6545a ungettext fix 2015-01-12 13:37:57 +03:00
Braden MacDonald
e498872ab1 Move update link to the validation area 2015-01-12 13:37:57 +03:00
Jonathan Piacenti
80ea764c9d Made errors on Library blocks use validate functionality. 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
9f85c0f0aa Added explanation to container view of Library Block. 2015-01-12 13:37:56 +03:00
Braden MacDonald
eddf44d853 Library Content XModule 2015-01-12 13:37:56 +03:00
E. Kolpakov
ff1a08cbd5 Paging for LibraryView added with JS tests. 2015-01-12 13:37:55 +03:00
Renzo Lucioni
8ef0e77e46 Prevent Jasmine tests from redirecting in dev mode 
Also prevent Jasmine from attempting to load deleted templates
 2015-01-11 16:08:29 -05:00
Renzo Lucioni
cc306843bc Merge pull request #6508 from edx/renzo/split-payment-verification-fixes 
Fix cosmetic issues with the split payment and verification flow
 2015-01-09 17:42:48 -05:00
David Baumgold
a6f3edcad5 Translate link titles 2015-01-09 15:10:44 -05:00
David Baumgold
7fe267b261 Make all the social links show icons 2015-01-09 14:27:59 -05:00