Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
ce71a940d9 Test for get_parent across branches 2015-01-15 10:33:45 -05:00
Brian Talbot
6fb45ef95c Studio: resolving scroll/overflow UI in component visibility settings 2015-01-15 10:33:45 -05:00
Brian Talbot
95ee72607d Studio: resolving visual spacing of hide from students checkboxes 2015-01-15 10:33:45 -05:00
Andy Armstrong
4fa33e25ed Studio support for cohorted courseware 
TNL-652
 2015-01-15 10:33:45 -05:00
Brian Talbot
206ea8caeb Studio: adding UI and styling for component-level access modal 2015-01-15 10:33:45 -05:00
Andy Armstrong
561c57dbe9 Extend preview to support cohorted courseware 
TNL-651
 2015-01-15 10:33:44 -05:00
Marco Morales
c4e8673db0 creation of a courseware preview menu to contain staff view toggle. 2015-01-15 10:33:44 -05:00
jsa
55d2f1d547 test that students are auto-assigned to cohorts in partition scheme 2015-01-15 10:33:44 -05:00
jsa
6fb3daa772 support group_access. JIRA: TNL-649 2015-01-15 10:33:44 -05:00
jsa
17d892c521 make block.get_parent() work. 
Co-Authored-By: Christina Roberts <christina@edx.org>
Co-Authored-By: Daniel Friedman <dfriedman@edx.org>
Co-Authored-By: Don Mitchell <dmitchell@edx.org>
 2015-01-15 10:33:44 -05:00
Mark Hoeber
36c445ba17 Notice on Developer's Guide move 2015-01-15 10:25:28 -05:00
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
John Eskew
df5ba26ac6 Handle the correct exception to cause a 404 error upon asset not found 
instead of a 500 error. Add 404 test.
 2015-01-15 09:44:05 -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
chrisndodge
a6fc9ab641 Merge pull request #6429 from edx/afzaledx/WL-173 
Generate/attach PDF receipts and invoices to shopping cart transactions
 2015-01-15 09:14:43 -05:00
Bertrand Marron
c4a7d770cc Remove all ellipses 
It's a problem for accessibility
 2015-01-15 09:03:12 -05:00
David Baumgold
ab87cd746d Merge pull request #6630 from edx/no-i18n-mock 
Don't internationalize mock templates
 2015-01-15 09:01:07 -05:00
Shrhawk
f85207d8c6 Merge pull request #6387 from Shrhawk/shr/bug/TNL-1026-Advanced-Blank-Problem-text-box-hiding-text 
Fix codemirror css for long text
 2015-01-15 16:06:33 +05:00
Awais
5b175cc0ca ECOM-887 Removed the "We have successfully verified your identity" line. 2015-01-15 14:52:14 +05:00
Syed Hassan Raza
5bcd506e4a Fix codemirror css for long text 2015-01-15 14:50:55 +05:00
Matjaz Gregoric
d8e076566d Improve JS course key validation to not allow special chars. 
Course and Library keys cannot contiain !'()* special characters,
but the JS validation on the new course/library failed to detect
these characters.

`encodeURIComponent` is used to check the string for special characters,
but `encodeURIComponent` does not encode these characters: -_!~*'().
(see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent)

The -_~ characters are allowed in course keys, but !'()* are not,
so add an explicit check for these characters to make sure a field
containing these characters does not pass the validation.
 2015-01-15 08:32:19 +01: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
Anton Stupak
477031e171 Merge pull request #6356 from edx/anton/logger 
Logger: Add possibility to send sync requests.
 2015-01-15 07:16:23 +02:00
Mark Hoeber
9d9c2af858 Merge pull request #6633 from edx/carol/docs/helptokens 
Add help tokens: cohort courses & content libraries
 2015-01-14 21:00:54 -05:00
Carol Tong
9ee2d05888 Add help tokens: cohort courses & content libraries 2015-01-14 20:02:28 -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
polesye
fc0f6e9878 Logger: Add possibility to send sync requests. 2015-01-15 02:16:11 +02: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
Tim Babych
660f6cf6a5 Merge pull request #6577 from edx/tim/django-1.4.17 
update django to release 1.4.18
 2015-01-15 00:55:12 +02:00
Jason Bau
0ba1828f93 Fix shib code to handle course.enrollment_domain=None 2015-01-14 14:36:33 -08:00
David Baumgold
6453d03b80 Don't internationalize mock templates 2015-01-14 17:35:20 -05:00
Tim Babych
a96ca40239 update django to release 1.4.18 2015-01-14 23:47:01 +02: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
chrisndodge
32bc4ff058 Merge pull request #6620 from open-craft/kelketek/library-content-plurality 
Fixed pluralization of matching problems in Library Content Module.
 2015-01-14 14:16:49 -05:00
Brandon DeRosier
fcab47b1e8 Add link to sysadmin dashboard on core theme 2015-01-14 13:33:56 -05:00
Jesse Zoldak
f9115b6316 Merge pull request #6621 from edx/zoldak/fix-pep8 
Fix pep8 violations in common.py
 2015-01-14 12:30:20 -05:00
Nimisha Asthagiri
920dfb5270 MA-216 Mobile API: display unreleased courses in enrollment list. 2015-01-14 12:30:11 -05:00
Brian Talbot
8316fe8560 Merge pull request #6607 from edx/talbs/fix-studio-xblockwarnings-fontawesome 
FIX - Studio: resolving xblock warning messages icons
 2015-01-14 12:13:35 -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
David Baumgold
df5dd1a4db Merge pull request #6385 from ataki/ataki/gridfs-hotfix 
Fix visual bug with large file error msg in cms.
 2015-01-14 10:42:56 -05:00