Commits · 270dc22c1fafbd55089bf120f0e00ecea53be2d7 · edx / edx-platform

06 Nov, 2015 1 commit

Update display of dates on Course Home page. · 270dc22c

Adds UTC time to the "Today's Date" block, and a fuzzy/relative
timestamp to all other displayed dates.

ECOM-2807

committed Nov 06, 2015

270dc22c Browse Files

05 Nov, 2015 14 commits
- Merge pull request #10512 from edx/peter-fogg/date-summary-bugfix · 4c934614
```
Fix date summary blocks for courses without an end date.
```
  Peter Fogg committed Nov 05, 2015
  4c934614 Browse Files
- Merge pull request #10245 from edx/jia/MA-1044 · 7c480f93
```
MA-1044 DiscussionTopic - Added bulk operations
```
  Nimisha Asthagiri committed Nov 05, 2015
  7c480f93 Browse Files
- Merge pull request #10493 from edx/db/kill-mitx-features · 1aac73d6
```
Remove legacy MITX_FEATURES reference
```
  David Baumgold committed Nov 05, 2015
  1aac73d6 Browse Files
- Merge pull request #10522 from edx/ziafazal/SOL-1377 · 7256bd1b
```
SOL-1377: allow certifcate exception to be added for multiple courses
```
  Matt Drayer committed Nov 05, 2015
  7256bd1b Browse Files
- Merge pull request #10502 from edx/tasawer/bugfix/ecom-2516-add-checkout-error-page · e978bcca
```
Added checkout error page.
```
  tasawernawaz committed Nov 05, 2015
  e978bcca Browse Files
- Merge pull request #10426 from edx/andya/update-draggabilly · 0785aeb9
```
Upgrade draggabilly.js to fix Firefox iframe bug
```
  Andy Armstrong committed Nov 05, 2015
  0785aeb9 Browse Files
- allow exception to be added for multiple courses · 94166429
```
added unit test to test certs exception same user different courses scenario
```
  Zia Fazal committed Nov 05, 2015
  94166429 Browse Files
- Merge pull request #10508 from edx/benp/bokchoy_default_store_envvar · 183fce37
```
Allow bok-choy default_store to be controlled by env vars.
```
  Ben Patterson committed Nov 05, 2015
  183fce37 Browse Files
- Upgrade draggabilly.js to fix Firefox iframe bug · 18dabc33
```
TNL-3627
```
  Andy Armstrong committed Nov 05, 2015
  18dabc33 Browse Files
- Merge pull request #10507 from edx/benp/mp-learner-profile-events · 947538bb
```
Refactor for multiprocessing.
```
  Ben Patterson committed Nov 05, 2015
  947538bb Browse Files
- Fix date summary blocks for courses without an end date. · 44538623
```
I also took this opportunity to do some small cleanups of the date
summary code, specifically converting some attributes to properties in
order to remove a Pylint directive disabling warnings about missing
docstrings.
```
  Peter Fogg committed Nov 05, 2015
  44538623 Browse Files
- MA-1044 DiscussionTopic - Added bulk operations · 509b2a44
  wajeeha-khalid committed Nov 05, 2015
  
  509b2a44 Browse Files
- Merge pull request #10489 from edx/cdodge/button-style-fixes · 6daa5a63
```
(WIP) Proctoring: fix sass and use updated edx-proctoring version
```
  chrisndodge committed Nov 05, 2015
  6daa5a63 Browse Files
- Added checkout error page. · 06a91979
```
ECOM-2516
```
  Tasawer committed Nov 05, 2015
  06a91979 Browse Files
04 Nov, 2015 25 commits
- Merge pull request #10459 from edx/ziafazal/SOL-1346 · 7a7cd6e6
```
SOL-1346:convert string to bytestring before passing it to urllib.quote_plus
```
  Matt Drayer committed Nov 04, 2015
  7a7cd6e6 Browse Files
- Merge pull request #10347 from edx/cptvitamin/TNL-3675 · aa128145
```
Fixes invalid/improper microdata and attribute values in the header logo
```
  Mark Sadecki committed Nov 04, 2015
  aa128145 Browse Files
- Merge pull request #10511 from edx/sarina/fix-contributing · ee95695c
```
Fix stale RTD links in CONTRIBUTING.rst OPEN-1047
```
  Sarina Canelake committed Nov 04, 2015
  ee95695c Browse Files
- Merge pull request #10484 from edx/robrap/TNL-2646 · b7698123
```
TNL-2646: Escape json in Studio
```
  Robert Raposa committed Nov 04, 2015
  b7698123 Browse Files
- Merge pull request #10509 from edx/peter-fogg/course-pacing-label-changes · acf5bb57
```
Course pacing template changes.
```
  Peter Fogg committed Nov 04, 2015
  acf5bb57 Browse Files
- Add json escaping to Studio · 3682fac8
```
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
```
  Robert Raposa committed Nov 04, 2015
  3682fac8 Browse Files
- Remove unused method subsection_handler · 0964bf28
```
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
```
  Robert Raposa committed Nov 04, 2015
  0964bf28 Browse Files
- Fix stale RTD links in CONTRIBUTING.rst · 77ab13c9
  Sarina Canelake committed Nov 04, 2015
  
  77ab13c9 Browse Files
- Merge pull request #10490 from edx/release · 24ee5a68
```
Release 4 November 2015 to master
```
  Eric Fischer committed Nov 04, 2015
  24ee5a68 Browse Files
- Merge pull request #10416 from louyihua/underscore_ngettext · e46b4396
```
Fix underscore extraction error
```
  Sarina Canelake committed Nov 04, 2015
  e46b4396 Browse Files
- Merge pull request #10510 from edx/peter-fogg/update-cert-info-docstring · 31e609ff
```
Update `cert_info` docstring with correct return type.
```
  Peter Fogg committed Nov 04, 2015
  31e609ff Browse Files
- Merge pull request #10478 from mitocw/enhancement/aq/disable_auto_enrol_ccx · 01f1c3a1
```
Disabled auto enroll in ccx coach's enrollment tab
```
  Peter Pinch committed Nov 04, 2015
  01f1c3a1 Browse Files
- Merge pull request #10497 from edx/rc/2015-11-03 · ae7b44bb
```
Fixing cert_status None bug
```
  Eric Fischer committed Nov 04, 2015
  ae7b44bb Browse Files
- Refactor for multiprocessing. · 8f05878e
  Ben Patterson committed Nov 04, 2015
  
  8f05878e Browse Files
- Update `cert_info` docstring with correct return type. · 13f20d56
  Peter Fogg committed Nov 04, 2015
  
  13f20d56 Browse Files
- Merge pull request #10465 from edx/peter-fogg/fix-spec-helpers-closure · 5bd6e829
```
Fix `withData` and `withConfiguration` helpers.
```
  Peter Fogg committed Nov 04, 2015
  5bd6e829 Browse Files
- Merge pull request #10487 from edx/renzo/ugettext-noop · b48b2b64
```
Where possible, use ugettext_noop instead of lambdas assigned to the underscore
```
  Sarina Canelake committed Nov 04, 2015
  b48b2b64 Browse Files
- Course pacing template changes. · b98c8911
```
Instructor-led is changed to instructor-paced. Adds a label to the
course outline page to show the course pacing.

ECOM-2794
ECOM-2800
```
  Peter Fogg committed Nov 04, 2015
  b98c8911 Browse Files
- Merge pull request #10500 from edx/ned/explain-why-prereqs-arent-installing · babd422f
```
If NO_PREREQ_INSTALL is set, print a message to explain why
```
  Ned Batchelder committed Nov 04, 2015
  babd422f Browse Files
- Allow bok-choy default_store to be controlled by env vars. · 634d0ffd
  Ben Patterson committed Nov 04, 2015
  
  634d0ffd Browse Files
- Use ugettext_noop instead of lambdas assigned to the underscore · 2f0e6635
```
Replaces instances of an old hack with the more clear ugettext_noop.
```
  Renzo Lucioni committed Nov 04, 2015
  2f0e6635 Browse Files
- Generify message. User will see context in previous console line. · a1bb822c
  Ben Patterson committed Nov 04, 2015
  
  a1bb822c Browse Files
- Merge pull request #10474 from edx/ned/django-pylint · 68182b13
```
Use 0.3.2 of edx-lint, with pylint-django and C extensions read
```
  Ned Batchelder committed Nov 04, 2015
  68182b13 Browse Files
- Fix a underscore extraction error · c78b306a
```
ngettext and its parameters should not be separated into multiple lines.
```
  louyihua committed Nov 04, 2015
  c78b306a Browse Files
- Disabled auto enroll in ccx enrollment tab · 1f60e969
  Amir Qayyum Khan committed Nov 04, 2015
  
  1f60e969 Browse Files