Commit Graph

1527 Commits

Author SHA1 Message Date
cahrens
9e6249ddd6 Enable split for new courses. 2015-02-09 09:26:04 -05:00
Giulio Gratta
560ce55896 Add cosmetic price field to studio & logic
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
2015-02-03 09:40:00 -08:00
Ben Patterson
b71c20c031 Revert "Add Cosmetic Display Price field to studio & logic to show it" 2015-02-03 09:41:54 -05:00
Sarina Canelake
db3d6fd9ab Merge pull request #6182 from Stanford-Online/giulio/course-price-upstream
Add Cosmetic Display Price field to studio & logic to show it
2015-02-02 20:07:58 -05:00
Will Daly
82d7e25f3e Add views to the embargo app to render messages explaining why students are blocked. 2015-02-02 14:04:29 -05:00
Martyn James
1b769b53cd Default search engine to None, so that all search/indexing operations are disabled until enabled 2015-01-30 16:40:03 -05:00
Renzo Lucioni
80589eab36 Remove old payment and verification flow
Removes old payment and verification endpoints, views, templates, and tests, making the new split flow the default. The SEPARATE_VERIFICATION_FROM_PAYMENT feature flag is also removed.
2015-01-29 10:56:25 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Will Daly
b467ae8cde Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
This reverts commit b8184d188f.
2015-01-28 17:26:46 -05:00
Chris Rodriguez
9e2494b21d Video player branding addition for XuetangX 2015-01-28 06:39:21 -05:00
Giulio Gratta
c18ee8cc09 Add cosmetic price field to studio & logic
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
2015-01-27 15:15:43 -08:00
Andy Armstrong
6201af652b Merge pull request #6765 from edx/andya/requirejs-in-lms
Add RequireJS to the LMS
2015-01-27 17:57:33 -05:00
Will Daly
b8184d188f Add RequireJS and RequireJS Optimizer configuration to the LMS
[second attempt which addresses bug building Studio]
2015-01-27 17:56:29 -05:00
Renzo Lucioni
bcf6461e0b Merge pull request #6769 from edx/renzo/fix-flaky-bok-choy-tests
Fix intermittent failures in bok-choy tests of payment and verification
2015-01-27 13:32:10 -05:00
Renzo Lucioni
4f23c31d8b Fix intermittent failures in bok-choy tests of payment and verification 2015-01-26 17:22:21 -05:00
stephensanchez
896bc1c859 Adding caching to the course details endpoint for the Enrollment API. 2015-01-22 20:58:22 +00:00
Will Daly
1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
This reverts commit 1d6fceda50.
2015-01-21 17:13:27 -05:00
Will Daly
1eaf84a443 Merge pull request #6544 from edx/will/requirejs-optimizer-lms
Add RequireJS and RequireJS Optimizer configuration to the LMS
2015-01-21 15:23:35 -05:00
David Baumgold
e6e443c712 Merge pull request #6674 from edx/disable-pylint-name-errors-on-settings
Ignore invalid-name errors for settings files
2015-01-21 10:40:05 -05:00
Will Daly
1d6fceda50 Add RequireJS and RequireJS Optimizer configuration to the LMS
Respond to review comments:

- Rename build and config files for consistency between lms/studio.
- Fix merge conflicts with lms require config.
- Devstack uses optimized pipeline to skip require JS optimizer step
- Add tests for render_require_js_path_overrides
2015-01-20 14:27:23 -05:00
polesye
1d9b5a9736 TNL-1220: Fix Harvard Text Annotation UI. 2015-01-16 22:45:07 +02:00
David Baumgold
ef43840a79 Ignore invalid-name errors for settings files
path.py objects report themselves as class objects, which confuses the heck out of
pylint. It tries to match variable names using the class-rgx regular expression
instead of the constant-rgx regular expression, and it doesn't match, so it
throws an error. Not sure how to fix pylint, so we'll just ignore these errors.
2015-01-16 11:37:28 -05:00
Renzo Lucioni
2db00c5723 Merge pull request #6647 from edx/renzo/split-payment-verification-acceptance-tests
Bok Choy tests for the split payment and verification flow
2015-01-16 01:47:04 -05:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Renzo Lucioni
c6777a5b25 Bok Choy tests for the split payment and verification flow
Adds mode creation endpoint to course_modes app and ability to bypass media device access prompt when proceeding through verification flow in a testing environment.
2015-01-15 17:25:25 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17: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
Tim Babych
dbfc12ce01 Merge pull request #6321 from edx/feature/edxnotes
TNL-213: Student Notes
2015-01-15 02:02:13 +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
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
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
stephensanchez
29d542a511 Adding the Enrollment API as a Django App in LMS. 2015-01-14 14:41:27 +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
Sarina Canelake
314c935369 Remove edX branding from default Open edX LMS
OPEN-307
2015-01-09 10:48:20 -05:00
David Baumgold
e95f2aeeed Remove LinkedIn integration 2015-01-07 14:38:48 -05:00
stephensanchez
1e7d567b58 Initial framework for the Course About API.
ECOM-248 Course Info API. Basic functionality implemented.

ECOM-248 adding factory for about descriptor and test cases for course info api

ECOM-248 adding test cases for couse info api.

ECOM-248 re-factoring code. updating test cases.

Tests for course_about data module

ECOM-248 Adding test cases for the exceptions.

ECOM-248 re-factoring code. fixing quality issues.

ECOM-248 fixing test cases and moved parse video method into utils.

added github username in authors

ECOM-248 removed merging issue of test_data

ECOM-248 removed unused files
2015-01-07 20:03:54 +05:00
Sarina Canelake
61e02fab87 Hide Honor Code mentions if site does not have an Honor Code 2015-01-06 18:26:19 -05:00
Sarina Canelake
d6741c7700 Clean up default pages for Open edX instances
Remove Jobs, News
Change "Vision" to "About"
2015-01-06 18:26:12 -05:00
Sarina Canelake
0f66b7552f Merge pull request #6458 from edx/sarina/variablize-copyright-date
Variablize copyright year for LMS footer
2015-01-06 17:15:59 -05:00
Carlos Andrés Rocha
66b1778481 Merge pull request #6353 from rocha/set-revision-to-unknown-if-not-on-git-repo
Set EDX_PLATFORM_REVISION to unknown if not in a git repo.
2015-01-06 15:39:40 -05:00
Sarina Canelake
05afa2da17 Variablize copyright year for LMS footer 2015-01-06 15:35:54 -05:00
chrisndodge
77c68b7dbd Merge pull request #6037 from edx/cdodge/microsite-aware-session-middleware
Allow for Microsite middleware to change cookie domains
2014-12-30 23:43:24 -05:00
AlasdairSwan
8eb484c109 ECOM-811 design and layout changes 2014-12-30 06:53:59 -08:00
Chris Dodge
b80b347ed0 Make SessionMiddleware Microsite aware 2014-12-29 12:06:24 -05:00
Carlos Andrés Rocha
75cfcd7292 Set EDX_PLATFORM_REVISION to unknown if not in a git repo.
- Set EDX_PLATFORM_REVISION to unknown if not in a git repo.
- Use the path of the configuration file to determine where the
  repository is.
2014-12-24 14:50:10 -05:00
Jesse Zoldak
55d7125fd4 fix pylint errors in test.py 2014-12-22 13:07:41 -05:00
Jesse Zoldak
16fe8478f2 Silence noisy factory loggers in lms unit tests 2014-12-22 13:07:41 -05:00
Jesse Zoldak
40aaf5de6d for tests change the default xml data dir to a place where it will get cleaned up 2014-12-17 12:24:15 -05:00