Commit Graph

8582 Commits

Author SHA1 Message Date
Stephen Sanchez
0a73d403d7 Merge pull request #4238 from edx/sanchez/TIM-645-File-Upload-Service
Updating settings and requirements for platform to support file upload
2014-07-14 09:22:40 -04:00
Sarina Canelake
5edcd969c8 Add new Transifex languages
Filipino, Marathi, Serbian, Telugu, Uzbek
2014-07-14 09:19:24 -04:00
clytwynec
1807948f2e Merge pull request #4391 from edx/clytwynec/clean_up_lettuce_output
Clytwynec/clean up lettuce output
2014-07-14 09:09:25 -04:00
Mathew Peterson
cec09be006 Merge pull request #4225 from edx/mathewpeterson/lms-opaque-keys-bugs
Testing for bugs off master for opaque-keys deprecation
LMS-2753
2014-07-11 16:53:23 -04:00
Sarina Canelake
cfb7f99c8e Add filter to ignore deprecation warnings by default
Add filter to only show first occurance of DepWarning
2014-07-11 15:40:09 -04:00
Mat Peterson
638a1aaec4 Fixed test that hardcoded url to deprecated format 2014-07-11 15:40:08 -04:00
Mat Peterson
4f6088cbd1 Fixed some isinstance errors with opaque-keys 2014-07-11 15:40:08 -04:00
Kevin Luo
3a2276b537 Pull out edX into variables in password reset email 2014-07-11 12:25:54 -07:00
Christine Lytwynec
0581d0c5a1 disabling zendesk in lettuce tests and removing help/feedback lettuce tests in favor of the existing JS ones 2014-07-11 12:01:03 -04:00
Christine Lytwynec
cd580ac247 overriding a few more log levels for acceptance tests 2014-07-11 12:01:03 -04:00
Sarina Canelake
b0170a5c30 Merge pull request #4379 from Stanford-Online/kluo/exclude-browser-translation
Subsume browser links to variables, to exclude from translation
2014-07-11 08:44:02 -04:00
Waqas Khalid
81dfcb04aa Show thread user to staff when only anonymous_to_peers is true
FOR-122
2014-07-11 13:09:13 +05:00
Kevin Luo
92381f0f84 Subsume browser links to variables, to exclude from translation 2014-07-10 15:40:51 -07:00
Abdallah
cf16975bd2 unicode fixes 2014-07-10 17:06:16 -04:00
chrisndodge
665ccdb730 Merge pull request #4172 from edx/cdodge/ecommerce-improvements
eCommerce enhancements
2014-07-10 15:23:58 -04:00
James Tauber
256c6bb4a5 Merge pull request #4095 from edx/jtauber/open-edx-footer
Separate edX / Open edX footer
2014-07-10 15:02:11 -04:00
Sarina Canelake
50709c163f Merge pull request #4367 from edx/sarina/i18n-course-handouts
i18n LMS and Studio components of course handouts
2014-07-10 14:47:23 -04:00
James Tauber
3cb8780284 Separate edX / Open edX footer.
We need to use an Open edX footer by default (and that's what all non-edx.org
instances should base their footer off) and only use the edX footer on
edx.org.

This commit uses `SITE_NAME` to determine which footer to use.

Sites using theming or micro-sites with a `SITE_NAME` not ending in `edx.org`
should not be affected.
2014-07-10 14:15:37 -04:00
Julia Hansbrough
177e8a241d Merge pull request #3858 from aboudreault/xblock-resource-missing-mimetypes
Add missing mimetypes for xblock resources
2014-07-10 13:51:16 -04:00
James Tauber
d7e6f94a09 Merge pull request #3191 from eduNEXT/feature/fmo/microsite-wiki
Feature/fmo/microsite wiki
2014-07-10 13:18:53 -04:00
Sarina Canelake
a5dc426cc8 i18n LMS and Studio components of course handouts 2014-07-10 11:28:00 -04:00
Dave St.Germain
671772256a Make wiki links not look inactive 2014-07-10 10:10:11 -04:00
asadiqbal08
5734d2a883 asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS
Added username into Authors file

[Ex-12] Add user to input coupon code in the Shopping Cart

[Ex-13] Discount should be reflected in the Payment confirmation page and email

added E-commerce Tab in Instructor Dashboard

added name/email in authors file

removed the is_active column, change the colors scheme, fixed bugs

wip

wip

test github account

STORE_BILLING_INFO set to True

cybersource api update, reference number updated, merchant_data removed from params

View Course buttons on receipt

link for course added to receipt

receipt.html view course button - func update

receipt.html course link update

move new CyberSource implementation to a separate file so that we can keep the original

remove config changes

remove config changes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

remove array paid_course_ids init in views.py

removed the is_active filter=false, added styling to the inactive coupon codes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

Add column to the list of coupons in the E-Commerce tab

Add ability for microsites to specify custom CyberSource secret configuration, i.e. run under different accounts

make the new CyberSource2 also microsite aware

updating migration for student and shopping cart apps

added user signup functionality that orignated from the Microsites

added non-microsite user signup tests

fix the hard coded callback URL to localhost

add comment

Modify e-commerce instructor tab to show a total amount above the coupon listings for admin finance user

made changes as suggested by diana khuang

add the CourseAccessRoles table to the Django Admin website

shopping cart coupon checkout changes as suggested by Jason Bau

changes are made according to the suggesstions on PR#4172

changes made in the coupons file

changes in the coupons get_coupon_info view

fix merge conflict resolution error

changes in the remove_coupon view json response

changes as suggested by David Baumgold

pep8/pylint fixes

Changes as suggested by jasonBau

don't assume item in shopping cart is a PaidCourseRegistration

fix up some logging

changed the urls of the coupon views and use the post to get the values from the request
2014-07-10 09:35:32 -04:00
Nimisha Asthagiri
8855b12b76 Update tests to allow LMS tests to use published branch setting.
Conflicts:
	cms/djangoapps/contentstore/views/tests/test_container_page.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/tests/test_login.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/branding/tests.py
	lms/djangoapps/courseware/tests/test_submitting_problems.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/instructor_task/tests/test_base.py
	lms/djangoapps/instructor_task/tests/test_integration.py
2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
ea32529866 Fix all modulestore calls to pass in user ids. 2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
f5abef88c2 LMS-2947 remove get_error_courses in Split.
LMS-2950 move delete_course to Mongo.
2014-07-09 21:10:12 -04:00
Julia Hansbrough
545cfd8406 Merge pull request #4353 from edx/flowerhack/lms-deprecated-urls
Enables LMS to handle deprecated URLs
2014-07-09 18:23:00 -04:00
jhelbert
451953752e Merge pull request #4285 from edx/jhelbert/enrollment-mode-change-events
Jhelbert/enrollment mode change events
2014-07-09 17:57:39 -04:00
Julia Hansbrough
d9dd45662e Enables LMS to handle deprecated URLs
LMS-2651
2014-07-09 21:51:37 +00:00
Justin Helbert
e78a398f45 This emits enrollment mode changes events 2014-07-09 20:27:00 +00:00
Jay Zoldak
557a252314 Merge pull request #4317 from edx/zoldak/increase-sqlite-timeout
Increase the test SQLite DB timeout. TE-397
2014-07-09 14:40:58 -04:00
Don Mitchell
211f0797fb Merge pull request #4294 from edx/split_mongo_assets_cherry
Split mongo assets cherry
2014-07-09 14:22:04 -04:00
Greg Price
98d7b28c6b Merge pull request #4318 from edx/gprice/forum-sidebar-debt
Reduce tech debt in forum sidebar
2014-07-09 12:13:54 -04:00
Stephen Sanchez
f23492e14e Updating AWS settings 2014-07-08 16:38:12 -04:00
Stephen Sanchez
573d3c89fc Updating settings and requirements for lms and cms to support file upload 2014-07-08 13:15:37 -04:00
Don Mitchell
cc6dfbbc75 Asset support in split
LMS-2876
2014-07-07 17:11:43 -04:00
Greg Price
3f6287a267 Clean up forum nav Sass
Now that the sidebar class is no longer used, many rules no longer need
!important and can move out of _shame.scss.
2014-07-07 14:21:53 -04:00
Greg Price
a4de82e1c3 Remove sidebar class from forum nav
This will enable much cleanup of the relevant SASS rules.
2014-07-07 14:21:53 -04:00
Adam Palay
d63a5abfbc Merge branch 'rc/2014-07-02' into testmergemaster
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
2014-07-07 13:54:03 -04:00
Jay Zoldak
c216699953 Increase the test SQLite DB timeout. TE-397 2014-07-07 12:32:43 -04:00
Greg Price
f3a8436e68 Tweak forum topic browse menu
The filter box will now remain fixed while the rest of the menu scrolls.
This also fixes a minor cosmetic bug in which the thread list would
overflow its container if the user opened the browse menu, scrolled the
page, and then closed the browse menu.
2014-07-03 14:14:55 -04:00
Carlos Andrés Rocha
1939678958 Use deprecated course_key when calling the analytics API.
Previously it was serializing the course_key directly, which is not
interpreted correctly by the API.
2014-07-03 12:25:16 -04:00
Carlos Andrés Rocha
5be08cc231 Don't show 500 errors if connection to data API fails
Some of the metrics on the instructor dashboard are computed by the new
analytics data pipeline. Don't show 500 errors if the connection to the
pipeline API fails. Instead display that the data is not available and
log an error.

AN-1476
2014-07-03 11:42:39 -04:00
Greg Price
6d87443a39 Update discussion tab sidebar header
The home button is removed, the search box is always displayed, and many
visual adjustments are made, along with a large amount of refactoring.

Originally reviewed in #4211
2014-07-02 16:58:34 -04:00
Greg Price
05d8eeecd7 Improve forum sorting and cohort filtering UX
Thread entries now show an activity count that includes the original
post, and only one of the vote count and activity count is displayed
based on the user's selected sort. The sorting and filtering options now
both use a select and are somewhat more verbose, and the visual styling
of the sort/filter bar is updated.

Originally reviewed in #4165 with a bugfix in #4211
2014-07-02 16:58:34 -04:00
Greg Price
551cea9379 Add labels to forum thread list
A thread will be labeled if it is pinned, if the user is following it,
or if it was authored by a staff member or community TA. This also
slightly changes the color used for community TA labels.

Originally reviewed in #4072
2014-07-02 16:58:33 -04:00
Greg Price
89ba90a695 Re-design forum thread list
Use larger and lighter title font, decrease padding, and use lighter
solid backgrounds instead of gradients. Also, refactor SASS code to
conform better to our new style, including using more specific class
names.

Originally reviewed in #4072
2014-07-02 15:31:55 -04:00
Giulio Gratta
1935187cf5 stupid simple css typo fix 2014-07-02 09:50:03 -07:00
clytwynec
c4a5299e55 Merge pull request #4283 from edx/clytwynec/lms_cms_joint_bokchoy_test
add lms_base and cms_base urls to bokchoy envs
2014-07-02 12:42:49 -04:00
Usman Khalid
c201d78c43 Fixed urlpatterns regex for support views in dashboard app.
LMS-6634
2014-07-02 16:01:25 +05:00