Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,680 Commits 1 Branch 0 Tags
3fdfdbcd2bdc10836838fe603d9cb1b1aa78bed0
Commit Graph

24680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stv
3fdfdbcd2b Translate string iff non-empty 
This resolves an issue where a checklist's long_description being empty
caused gettext to dump PO file headers.

I had originally made this change to the Stanford-Online/edx-platform
repository a few weeks ago [0] to address a failing test on our fork.
I didn't take the time to diagnose the root issue; I just fixed it for
the single case.

After stumbling across the issue elsewhere, @kluo <kevkluo@gmail.com>
followed through and tracked down the cause of the behavior. It turns
out that `gettext`, by default, translates the empty string into PO file
headers; this is apparently a feature, not a bug [1].

This behavior seems counterintuitive; for our use, it seems that
translating an empty string should simply return an empty string. We
already program defensively around this in platform code [2], but it'd be
convenient to resolve this with a centralized solution, instead of a
patchwork of fixes.

[0] 4b88f54aa658db952e899222ff5ede4a1c1beb18
[1] http://stackoverflow.com/questions/18459387/translation-of-empty-string-shows-po-header
[2] https://github.com/edx/edx-platform/blob/master/cms/djangoapps/contentstore/views/checklist.py#L140
 2014-08-01 11:03:47 -07:00
Jason Bau
9c52e5d74d Merge pull request #4585 from edx/jbau/ext-auth-fix-password-complexity 
Allow external_auth registrations to bypass PW complexity check
 2014-08-01 10:43:57 -07:00
Sarina Canelake
ec8dee52c0 Merge pull request #4646 from lduarte1991/lduarte-harvardx-pr16 
Annotator Tools: Fixing annotator code break in login and dashboard
 2014-08-01 12:56:27 -04:00
Sarina Canelake
069e29a2d2 Merge pull request #4295 from mitocw/cg/psycho_require_auth 
Check if user is anonymous before calling PSYCHOMETRICS
 2014-08-01 12:55:06 -04:00
David Baumgold
d6c188f90e Merge pull request #4650 from edx/db/remove-setuptools 
Remove setuptools
 2014-08-01 12:54:26 -04:00
David Baumgold
e3e35ded9a Remove setuptools 
Oops
 2014-08-01 12:51:54 -04:00
David Baumgold
4a098a5c97 Merge pull request #4648 from edx/db/advertise-public-jira 
Advertise JIRA
 2014-08-01 12:47:32 -04:00
Carson Gee
87fa6cc753 Check if user is anonymous before calling PSYCHOMETRICS 
LTI grade callbacks for example, come in with an anonymous user.  This causes a
stack trace in the psychometrics app that leads to the LTI service
getting a 404.  This adds a check before that callback gets registered.
 2014-08-01 12:34:12 -04:00
David Baumgold
6c70c3a586 Reorganize README 2014-08-01 12:21:06 -04:00
Dave St.Germain
a6b7fa216c Merge pull request #4615 from edx/dcs/enrollment_count_dashboard 
Show the enrollment counts for each mode on the instructor dashboard.
 2014-08-01 12:18:49 -04:00
Dave St.Germain
eb1d046352 Show the enrollment counts for each mode on the instructor dashboard. 2014-08-01 12:17:36 -04:00
David Baumgold
c9076b6c48 Advertise JIRA 2014-08-01 12:13:39 -04:00
lduarte1991
e267409e6a Annotator Tools: Fixing annotator break in login and dashboard 2014-08-01 09:24:09 -04:00
Jesse Zoldak
a0b4f8b6c6 Merge pull request #4643 from edx/zoldak/disable-video-handout-tests 
Disable video handout tests
 2014-08-01 07:14:30 -04:00
Anton Stupak
1ebb4c5304 Merge pull request #4629 from edx/anton/disable-css-animations-in-bok-choy 
Disable css3 animations in bok-choy tests.
 2014-08-01 13:23:05 +03:00
Sarina Canelake
0217ef80d7 Merge pull request #4351 from lduarte1991/lduarte-harvardx-pr8 
Annotation Tool: Bug Fix Filtered Personal Annotations on Page Load
 2014-07-31 20:19:23 -04:00
Jesse Zoldak
49e0d6b5f9 Disable video handout tests 2014-07-31 18:44:25 -04:00
srpearce
20d3eaa4f6 Merge pull request #4637 from edx/sylvia/docs/relnotesupdate 
Removed info about ORA-51
 2014-07-31 17:01:59 -04:00
Sylvia Pearce
5002513df0 Removed info about ORA-51 2014-07-31 16:53:10 -04:00
Sarina Canelake
2bb9498844 Merge pull request #4166 from lduarte1991/lduarte-harvardx-pr5 
Annotations Tools: Sharing Plugin Fixed with Proper URI
 2014-07-31 16:47:24 -04:00
lduarte1991
6a281dd80b Annotation Tools: Spacing Issues fixed for catch.js 2014-07-31 15:44:02 -04:00
lduarte1991
df8d51b9b9 Annotation Tool: Bug Fix Filtered Personal Annotations on Page Load 
- Made sure that all highlights were removed.

- Forgot closing parens

- added comments to fix
 2014-07-31 15:44:02 -04:00
polesye
7217dd460d Disable css3 animations in bok-choy tests. 2014-07-31 21:58:07 +03:00
lduarte1991
98446d1c6d Annotation Tools: Code clean-up, formatting, spacing 2014-07-31 14:48:25 -04:00
lduarte1991
9751244e2e Annotation Tools: Fixed Share button to allow selection of text box 2014-07-31 14:48:25 -04:00
lduarte1991
4ce70630b4 Annotation Tools: Fixing Share Indentation, Grep Functions and Equality 2014-07-31 14:48:25 -04:00
lduarte1991
eace1413b7 Image Annotation Tool: Fixed Viewport Timeout Issue 2014-07-31 14:48:25 -04:00
lduarte1991
e80992cc1e Annotation Tool: Fixing Table Share bug (2b) 2014-07-31 14:48:25 -04:00
lduarte1991
28f5ed1cf9 Annotations Tools: Sharing Plugin Fixed with Proper URI 2014-07-31 14:48:25 -04:00
Renzo Lucioni
3c37b9723c Merge pull request #4620 from edx/renzo/fix-instructor-analytics 
Renzo/fix instructor analytics
 2014-07-31 14:12:47 -04:00
Alison Hodges
91db097259 Merge pull request #4483 from edx/ahodges/documentation/FOR662 
Ahodges/documentation/for662
 2014-07-31 13:42:41 -04:00
Alison Hodges
c2d603acfc Add a post/response/comment in preparation for new Question type post 2014-07-31 13:41:39 -04:00
David Baumgold
548e96126c Merge pull request #4626 from edx/db/revert-dep-upgrades 
Downgrade scipy, lxml, boto, edx-ora2
 2014-07-31 13:37:37 -04:00
David Baumgold
c4505e7350 Downgrade scipy, lxml, boto, edx-ora2 2014-07-31 12:06:13 -04:00
Ben McMorran
640ea444f8 Merge pull request #4608 from edx/benmcmorran/fix-blank-xblock-names 
Show category when an xblock does not have a default display name
 2014-07-31 11:49:59 -04:00
David Baumgold
9ba5fb52ae Merge pull request #4624 from edx/db/update-ora2 
new release of edx-ora2
 2014-07-31 11:07:36 -04:00
Greg Price
b10c4b146f Merge pull request #4599 from Stanford-Online/u/forum/upload-file-size 
Fix incorrect max upload file size on forums
 2014-07-31 10:31:16 -04:00
David Baumgold
e3804d8bbf Merge pull request #3665 from edx/db/update-lxml 
Update lxml to 3.3.5
 2014-07-31 10:15:56 -04:00
David Baumgold
44f987138e Update lxml to 3.3.5 2014-07-31 10:13:03 -04:00
David Baumgold
adee992106 new release of edx-ora2 2014-07-31 10:06:43 -04:00
David Baumgold
3040bee3f6 Update boto to 2.30.0 2014-07-31 10:01:04 -04:00
David Baumgold
64eee5012f Merge pull request #4582 from itsbenweeks/itsbenweeks/update_scipy 
Updating SciPy
 2014-07-31 09:57:08 -04:00
Renzo Lucioni
ab067046e3 Fully rename instructor dashboard analytics app 2014-07-31 09:45:44 -04:00
Don Mitchell
437a3bf93e Merge pull request #4542 from edx/split/perf_test 
Split/perf test
 2014-07-31 09:14:15 -04:00
Oleg Marshev
36d47dd05e Merge pull request #4527 from edx/oleg/xml-course-transcripts-fix 
Fix transcripts in XML course when no static_asset_path is set.
 2014-07-31 10:35:44 +03:00
Mark Hoeber
d76c89f8ad Merge pull request #4619 from edx/markhoeber-release-notes-image-fix 
Fixed image paths
 2014-07-30 18:04:25 -04:00
Mark Hoeber
13707714ec Fixed image paths 2014-07-30 18:04:03 -04:00
Mark Hoeber
67c8d88b9f Merge pull request #4618 from edx/markhoeber-release-notes-index 
Fix release notes index
 2014-07-30 17:52:26 -04:00
Mark Hoeber
7ceaad0fb9 Fix release notes index 2014-07-30 17:51:59 -04:00
Don Mitchell
02e21d8ab7 fixup! Count & compare db hits between old and split mongo LMS-11090 2014-07-30 17:44:45 -04:00