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

27969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Carlos Andrés Rocha
36813c0261 Merge pull request #6351 from rocha/fix-email-opt-in-list-export-command 
Fix email_opt_in_list export command to parse options correctly.
 2015-01-14 10:36:01 -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
Stephen Sanchez
da9c30b207 Merge pull request #6596 from edx/sanchez/course_role_admin_form 
Improve Django Admin Panel for Admin Roles.
 2015-01-14 08:56:15 -05: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
Carlos Andrés Rocha
327cc04f40 Fix email_opt_in_list export command to parse options correctly. 2015-01-13 18:57:30 -05:00
Brian Talbot
8fc89ca04f Studio: resolving icon class styling issue with xblock warning messages 2015-01-13 18:36:58 -05:00
Jonathan Piacenti
f7fd2aa56f Fixed pluralization of matching problems in Library Content Module. 2015-01-13 22:34:01 +00:00
stephensanchez
aed89e422a Improve Django Admin Panel for Course Access Roles. Related to ECOM-857. Allows internal staff to easily use the Django Admin view to create new finance and sales admins. 2015-01-13 21:57:28 +00:00
John Eskew
c11a9f056e Merge pull request #6590 from edx/jeskew/optimize_split_asset_search 
Optimize large amounts of asset metadata in the Split modulestore.

Other thumb from @dmitchell  in PR: https://github.com/edx/edx-platform/pull/6456
 2015-01-13 16:28:49 -05:00
Sarina Canelake
e88c298a94 Fix i18n from Destination team pages 2015-01-13 16:14:53 -05:00
John Eskew
6de1137f67 Optimize large amounts of asset metadata in the Split modulestore. 
Use binary search instead of linear search.
Add tests for saving asset metadata lists.
Refactor to use common code across modulestores.
 2015-01-13 15:20:42 -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
Adam
2b9b531c16 Merge pull request #6597 from edx/release 
Release
 2015-01-13 13:46:34 -05: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
Adam
f699177900 Merge pull request #6565 from edx/hotfix/2014-01-12 
Change split to handle dags and fix
 2015-01-13 12:51:14 -05:00
Piotr Mitros
6d184f7b20 Merge pull request #6570 from edx/pmitros/eia-test-cases 
Adds testability to the EIA file
 2015-01-13 11:52:49 -05:00
AlasdairSwan
6dc4bf9ac9 Merge pull request #6588 from edx/alasdair/footer-mobile-app-links 
ECOM-880 added mobile app links to footer enabled by feature flag ENABLE...
 2015-01-13 11:04:07 -05:00
Piotr Mitros
b7484ea7ac Adds testability to the EIA file 2015-01-13 11:01:41 -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
Waqas Khalid
70b38fc3a3 Merge pull request #6034 from mlkwaqas/waqas/tnl776-multiple-inline-discussion-problem 
In inline discussion two discussion module override actions
 2015-01-13 19:59:23 +05:00
John Eskew
be4c016083 Merge pull request #6312 from edx/jeskew/import_export_perf_testing 
Performance testing of asset metadata in course import/export
 2015-01-13 09:29:54 -05:00
John Eskew
6873c04599 First iteration of code which tests performance of asset metadata 
during course import/export. Uses external code_block_timer module.
   Also, add script which validates XML file against an XSD file.
   Uses the unittest framework - but is currently skipped.
 2015-01-13 08:47:24 -05:00
Shrhawk
c3f789021a Merge pull request #6285 from Shrhawk/shr/bug/TNL-904-tolerance-is-broken 
Fix tolerance broken
 2015-01-13 17:08:52 +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
Jesse Zoldak
eaa4f7c05b Merge pull request #6578 from edx/zoldak/disable-pylint-R0801 
WIP disable R0801
 2015-01-13 06:05:05 -05:00
Syed Hassan Raza
66b949b745 Fix tolerance broken 2015-01-13 16:01:46 +05:00
Waqas Khalid
fd0d475b0f Merge pull request #6361 from mlkwaqas/waqas/tnl720-unable-to-report-mark-answer 
Unable to report/vote/endorse after editing response
 2015-01-13 15:45:44 +05:00
Waqas Khalid
2a67632b7b Unable to report/vote/endorse after editing response 
When user update the response after editing he would
be unablt to report/vote/endorse the response. This
problem was caused due to double binding of event in
backbone view.

TNL-720
 2015-01-13 13:47:02 +05:00
Waheed Ahmed
47fbda9dd9 Merge pull request #6370 from edx/waheed/tnl920-fix-code-mirror-xml-editor-height 
Fixed CodeMirror editor view height in studio.
 2015-01-13 13:31:55 +05:00
Nimisha Asthagiri
9566a46a4d Fix Mobile API decorators. 2015-01-13 02:29:53 -05:00