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

33706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nimisha Asthagiri
7c480f93c6 Merge pull request #10245 from edx/jia/MA-1044 
MA-1044 DiscussionTopic - Added bulk operations
 2015-11-05 12:08:09 -05:00
David Baumgold
1aac73d614 Merge pull request #10493 from edx/db/kill-mitx-features 
Remove legacy MITX_FEATURES reference
 2015-11-05 11:56:35 -05:00
Matt Drayer
7256bd1b02 Merge pull request #10522 from edx/ziafazal/SOL-1377 
SOL-1377: allow certifcate exception to be added for multiple courses
 2015-11-05 11:35:17 -05:00
tasawernawaz
e978bcca96 Merge pull request #10502 from edx/tasawer/bugfix/ecom-2516-add-checkout-error-page 
Added checkout error page.
 2015-11-05 21:22:52 +05:00
Andy Armstrong
0785aeb959 Merge pull request #10426 from edx/andya/update-draggabilly 
Upgrade draggabilly.js to fix Firefox iframe bug
 2015-11-05 11:01:35 -05:00
Zia Fazal
941664294e allow exception to be added for multiple courses 
added unit test to test certs exception same user different courses scenario
 2015-11-05 20:53:18 +05:00
Ben Patterson
183fce375e Merge pull request #10508 from edx/benp/bokchoy_default_store_envvar 
Allow bok-choy default_store to be controlled by env vars.
 2015-11-05 10:21:42 -05:00
Andy Armstrong
18dabc3312 Upgrade draggabilly.js to fix Firefox iframe bug 
TNL-3627
 2015-11-05 10:10:39 -05:00
Ben Patterson
947538bb1f Merge pull request #10507 from edx/benp/mp-learner-profile-events 
Refactor for multiprocessing.
 2015-11-05 09:18:48 -05:00
wajeeha-khalid
509b2a4453 MA-1044 DiscussionTopic - Added bulk operations 2015-11-05 18:24:20 +05:00
chrisndodge
6daa5a631f Merge pull request #10489 from edx/cdodge/button-style-fixes 
(WIP) Proctoring: fix sass and use updated edx-proctoring version
 2015-11-05 07:19:40 -05:00
Tasawer
06a91979e1 Added checkout error page. 
ECOM-2516
 2015-11-05 07:26:13 +00:00
Matt Drayer
7a7cd6e660 Merge pull request #10459 from edx/ziafazal/SOL-1346 
SOL-1346:convert string to bytestring before passing it to urllib.quote_plus
 2015-11-04 17:07:46 -05:00
Mark Sadecki
aa1281456f Merge pull request #10347 from edx/cptvitamin/TNL-3675 
Fixes invalid/improper microdata and attribute values in the header logo
 2015-11-04 16:18:19 -05:00
Sarina Canelake
ee95695c6c Merge pull request #10511 from edx/sarina/fix-contributing 
Fix stale RTD links in CONTRIBUTING.rst OPEN-1047
 2015-11-04 15:21:41 -05:00
Robert Raposa
b76981234d Merge pull request #10484 from edx/robrap/TNL-2646 
TNL-2646: Escape json in Studio
 2015-11-04 14:28:25 -05:00
Peter Fogg
acf5bb57cb Merge pull request #10509 from edx/peter-fogg/course-pacing-label-changes 
Course pacing template changes.
 2015-11-04 14:11:49 -05:00
Robert Raposa
3682fac832 Add json escaping to Studio 
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates

TNL-2646: Escape json.dumps
 2015-11-04 13:34:42 -05:00
Robert Raposa
0964bf280f Remove unused method subsection_handler 
Removing this particular call to json.dumps was done by removing
the complete method subsection_handler which is no longer
used.  The template edit_subsection.html had already been removed.

TNL-2646 Escape json
 2015-11-04 13:34:42 -05:00
Sarina Canelake
77ab13c994 Fix stale RTD links in CONTRIBUTING.rst 2015-11-04 13:28:30 -05:00
Eric Fischer
24ee5a68f5 Merge pull request #10490 from edx/release 
Release 4 November 2015 to master
 2015-11-04 13:19:09 -05:00
Sarina Canelake
e46b43963c Merge pull request #10416 from louyihua/underscore_ngettext 
Fix underscore extraction error
 2015-11-04 12:17:01 -05:00
Peter Fogg
31e609ff8f Merge pull request #10510 from edx/peter-fogg/update-cert-info-docstring 
Update `cert_info` docstring with correct return type.
 2015-11-04 12:07:49 -05:00
Peter Pinch
01f1c3a160 Merge pull request #10478 from mitocw/enhancement/aq/disable_auto_enrol_ccx 
Disabled auto enroll in ccx coach's enrollment tab
 2015-11-04 11:28:01 -05:00
Eric Fischer
ae7b44bb4d Merge pull request #10497 from edx/rc/2015-11-03 
Fixing cert_status None bug
 2015-11-04 11:07:20 -05:00
Ben Patterson
8f05878e2e Refactor for multiprocessing. 2015-11-04 10:34:36 -05:00
Peter Fogg
13f20d5649 Update cert_info docstring with correct return type. 2015-11-04 10:29:27 -05:00
Peter Fogg
5bd6e829e7 Merge pull request #10465 from edx/peter-fogg/fix-spec-helpers-closure 
Fix `withData` and `withConfiguration` helpers.
 2015-11-04 10:21:30 -05:00
Sarina Canelake
b48b2b645f Merge pull request #10487 from edx/renzo/ugettext-noop 
Where possible, use ugettext_noop instead of lambdas assigned to the underscore
 2015-11-04 10:18:12 -05:00
Peter Fogg
b98c89117c Course pacing template changes. 
Instructor-led is changed to instructor-paced. Adds a label to the
course outline page to show the course pacing.

ECOM-2794
ECOM-2800
 2015-11-04 09:59:58 -05:00
Ned Batchelder
babd422f76 Merge pull request #10500 from edx/ned/explain-why-prereqs-arent-installing 
If NO_PREREQ_INSTALL is set, print a message to explain why
 2015-11-04 09:56:32 -05:00
Ben Patterson
634d0ffd9e Allow bok-choy default_store to be controlled by env vars. 2015-11-04 09:28:28 -05:00
Renzo Lucioni
2f0e663581 Use ugettext_noop instead of lambdas assigned to the underscore 
Replaces instances of an old hack with the more clear ugettext_noop.
 2015-11-04 09:17:18 -05:00
Ben Patterson
a1bb822c8e Generify message. User will see context in previous console line. 2015-11-04 08:40:56 -05:00
Ned Batchelder
68182b13d2 Merge pull request #10474 from edx/ned/django-pylint 
Use 0.3.2 of edx-lint, with pylint-django and C extensions read
 2015-11-04 06:16:01 -05:00
louyihua
c78b306a30 Fix a underscore extraction error 
ngettext and its parameters should not be separated into multiple lines.
 2015-11-04 15:03:29 +08:00
Amir Qayyum Khan
1f60e9696f Disabled auto enroll in ccx enrollment tab 2015-11-04 11:56:01 +05:00
Zia Fazal
fbc8a13410 convert string to bytestring before passing it to urllib.quote_plus 
further improvement in handling of unicode data
 2015-11-04 11:22:36 +05:00
Eric Fischer
dc469ea5ec Fix cert_status None. Add GeneratedCertificate to admin 2015-11-03 21:54:48 -05:00
Andy Armstrong
cd3f8ded2b Fix typo 2015-11-03 18:46:42 -05:00
Ned Batchelder
3f79dd0b75 If NO_PREREQ_INSTALL is set, print a message to explain why 2015-11-03 17:34:22 -05:00
Ned Batchelder
1f093eccfb Use 0.3.2 of edx-lint, with pylint-django and C extensions read 2015-11-03 16:22:40 -05:00
David Baumgold
792c3d93c1 Remove legacy MITX_FEATURES reference 2015-11-03 15:37:41 -05:00
Adam
59af66c6a5 Merge pull request #10488 from edx/adam/disable-check-button-on-save-click 
Adam/disable check button on save click
 2015-11-03 15:31:52 -05:00
Mark Sadecki
3be86ca891 Fixes invalid/improper microdata and attribute values in the header logo 2015-11-03 15:20:48 -05:00
Eric Fischer
0951dc3967 Merge pull request #10442 from edx/rc/2015-11-03 
Release 3 November 2015
 2015-11-03 14:43:19 -05:00
Adam Palay
bc6caea6a6 add test for disabling check button while clicking save 2015-11-03 14:02:37 -05:00
Giulio Gratta
99cca05730 Disable submit button on save click 2015-11-03 14:01:21 -05:00
Chris Dodge
cfbb24837e fix sass and use updated edx-proctoring version 2015-11-03 13:21:37 -05:00
Ben Patterson
79c2501c8d Merge pull request #10486 from edx/benp/more-better-doc 
Fix formatting.
 2015-11-03 13:10:10 -05:00