Commit Graph

20210 Commits

Author SHA1 Message Date
Calen Pennington
536d824252 Merge branch 'release' 2014-01-07 15:08:45 -05:00
Mark Hoeber
c303687be0 Merge pull request #2100 from edx/markhoeber/documentation/stud-1034
Updates for 1-7-2014 release changes in Studio -- Outline and Files pages
2014-01-07 12:05:17 -08:00
Greg Price
afaa463f7f Merge pull request #2093 from edx/gprice/forum-vote-button-a11y
Improve accessibility of forum vote buttons
2014-01-07 10:54:17 -08:00
frances botsford
1adc4fe253 Merge pull request #2092 from tusbar/course-bottom-university-span
Use <span> for course preview’s university #os
2014-01-07 08:24:33 -08:00
Andy Armstrong
d0be907893 Merge pull request #2098 from edx/andya/rc-pagination-fix
Fix STUD-1129: handle out-of-range page numbers
2014-01-07 08:03:37 -08:00
Mark Hoeber
15cb79bc40 Merge pull request #2099 from edx/markhoeber/documentation/fix-sylvia-615
Fixing merge for sylvia's branch bld-615
2014-01-07 07:50:53 -08:00
Mark Hoeber
068bdb7e91 Fixing merge for sylvia's branch bpd-615
Fixing merge for sylvia's branch bpd-615
2014-01-07 10:49:32 -05:00
Christina Roberts
c711bb6072 Merge pull request #2055 from edx/christina/amp
Tests for behavior of export with & in HTML and XML-based components
2014-01-07 07:35:58 -08:00
Ned Batchelder
61afc819ec Merge pull request #2081 from edx/ned/i18n-xmodule
Improvements to the i18n workflow tools.
2014-01-07 07:24:14 -08:00
Andy Armstrong
8a0f785cbc Fix STUD-1129: handle out-of-range page numbers 2014-01-07 10:22:14 -05:00
Andy Armstrong
430cfd7563 Merge pull request #2096 from edx/andya/pagination-fix
Fix STUD-1129: handle out-of-range page numbers
2014-01-07 06:55:22 -08:00
Ned Batchelder
af120fdf53 Better handling of plurals during .po validation
Now any of the plurals being missing will count as an Empty translation,
and for looking at tags, the two English strings and all the translated
strings are mooshed together.
2014-01-07 09:43:46 -05:00
Ned Batchelder
c459633534 Say a little about what's happening when pulling from transifex 2014-01-07 09:43:46 -05:00
Ned Batchelder
dd94af4bdb More validation of .po files: check message structure
The tests in test_validate.py now examine the messages to see that they
have the right structure.  The English and the translation should have
the same tags, the translation can't be blank, and it can't have any
Astral plane characters.
2014-01-07 09:43:46 -05:00
Ned Batchelder
9011e6e17f Fix plural handling, put teeth in msgfmt -c test. 2014-01-07 09:43:46 -05:00
Ned Batchelder
d8df97aa50 Use ddt to separate test cases into tests. 2014-01-07 09:43:46 -05:00
Ned Batchelder
209f8cc3db Lorem is now fancy, and HTML tags are recognized with single-quote attributes. 2014-01-07 09:43:46 -05:00
Ned Batchelder
6d5e13e245 Use the same marker everywhere for translator comments. 2014-01-07 09:43:46 -05:00
Ned Batchelder
27b8c83b34 Mark XModule strings for i18n 2014-01-07 09:43:46 -05:00
Ned Batchelder
549d9230f8 Merge pull request #2077 from edx/ned/misc-msg-fixes
Miscellaneous fixes to strings found during i18n work.
2014-01-07 06:41:42 -08:00
Calen Pennington
32710d4ceb Merge pull request #2090 from edx/sarina/duplicate-task-logging
Logging to catch duplicate instructor tasks
2014-01-07 05:53:57 -08:00
Bertrand Marron
ac1eed4102 Remove hover state on university name in course preview 2014-01-07 11:25:14 +01:00
zubair-arbi
f71688ce42 Merge pull request #2075 from zubair-arbi/zub/bugfix/std878-wrongcontenttype
Assign valid content_type to static resource (import_static_content)
2014-01-06 23:35:44 -08:00
Sarina Canelake
fa856d3338 Logging to catch duplicate instructor tasks 2014-01-06 18:20:41 -05:00
Andy Armstrong
089c2a0302 Fix STUD-1129: handle out-of-range page numbers 2014-01-06 18:00:32 -05:00
Greg Price
b7d7751dc2 Improve accessibility of forum vote buttons
This change involves substantial refactoring of the relevant code to
reduce duplication. It also makes the templates for the vote buttons
more consistent and cleaner.

JIRA: FOR-64
2014-01-06 17:08:53 -05:00
Greg Price
d4f7cd68d8 Remove redundant URI.min.js fron lms/
A newer version was added to common/, so that is used instead. It is
also added to the set of JS files used in unit tests to allow forums
code in common/ to be tested.
2014-01-06 17:02:31 -05:00
Greg Price
c44e527615 Remove unused forums-related cruft 2014-01-06 16:59:30 -05:00
Mark Hoeber
249a61820f Merge pull request #2023 from edx/sylvia/documentation/BLD-619
Add info about template for Checkbox problem type
2014-01-06 12:25:54 -08:00
Bertrand Marron
9372ba6ef7 Use <span> for course preview’s university
The course’s university was displayed using a <a> tag that points to
nothing ('#'). There was some stanford specific behavior to replace that
<a> tag with a <span>. This commit removes that.
2014-01-06 21:09:15 +01:00
spearce
e60524912f Update index
Remove javascript_input and create_lti; add tools
2014-01-06 14:12:25 -05:00
Andy Armstrong
024c3f6511 Merge pull request #2085 from edx/andya/asset-pagination-fix
Fix URI vendor module to be referenced via a relative URL.
2014-01-06 09:08:23 -08:00
cahrens
a80101dda2 Don't add every helper method to world. 2014-01-06 11:48:40 -05:00
spearce
bdd6b73957 Update JSInput info with feedback from Jean-Michel
Add more specific info about HTML+CSS+JS files, SOP
2014-01-06 11:37:54 -05:00
Andy Armstrong
fa55ac1315 Fix URI vendor module to be referenced via a relative URL. 2014-01-06 11:31:58 -05:00
Usman Khalid
6108529ce1 Merge pull request #2001 from edx/waheed/openended-problems-commands-2
Django command to post submissions to ora
2014-01-06 08:04:33 -08:00
Ned Batchelder
7d98231eb8 Merge pull request #2082 from edx/ned/dont-catch-all-exceptions
Don't catch all exceptions.
2014-01-06 07:28:28 -08:00
Ned Batchelder
93682af4eb Don't catch all exceptions. 2014-01-06 10:24:00 -05:00
brianhw
9c81a07012 Merge pull request #2076 from edx/brian/server-track-null-request
Modify server_track to handle being called without a request.
2014-01-06 07:15:14 -08:00
Usman Khalid
57710d7226 Added django commands to get statistics and repost submissions to grader for open ended problems.
ORA-286
2014-01-06 19:13:28 +05:00
Andy Armstrong
4ddc36dccc Merge pull request #1912 from edx/andy/asset-pagination
Add pagination to Studio's Files and Uploads page.

These changes are for STUD-813.
2014-01-06 06:12:25 -08:00
zubiar-arbi
b998a161d2 Assign valid content_type to static resource (import_static_content)
STUD-878
2014-01-06 14:05:09 +05:00
Andy Armstrong
c573db35d0 Add myself to list of authors 2014-01-05 23:37:21 -05:00
Andy Armstrong
f9c45586a4 Add pagination to Studio's Files and Uploads page
These changes implement STUD-813. The commit consists of the
following logical changes:
 - a REST API has been implemented for a course's assets
 - the page itself now fetches the assets client-side
 - the Backbone.Paginator library is used to support pagination
 - the AssetCollection has been refactored to extend
   Backbone.Paginator.requestPager so that it can be paged
 - an abstract PagingView class has been added to generalize
   the communication with a paging REST API
 - the AssetsView has been reimplemented to extend PagingView
 - two new child views have been added:
   - PagingHeader: the paging controls above the list of assets
   - PagingFooter: the paging controls below the assets
2014-01-05 23:35:12 -05:00
Brian Wilson
7e31c95c45 Modify server_track to handle being called without a request. 2014-01-05 22:58:10 -05:00
Ned Batchelder
be6c57f53a Mark XModule strings for i18n 2014-01-03 17:50:16 -05:00
Ned Batchelder
c7cf0c6d3e Fixes to Translator comments found while debugging the i18n pipeline. 2014-01-03 17:50:16 -05:00
Ned Batchelder
2157b4d8b7 Miscellaneous fixes to strings found during i18n work. 2014-01-03 17:50:16 -05:00
brianhw
5dccff518c Merge pull request #2008 from edx/brian/dump-inherited-metadata
Add options to dump_course_structure to output inherited metadata.
2014-01-03 12:53:57 -08:00
Brian Talbot
dd591a4caf Merge pull request #2046 from edx/talbs/lms-devscss
LMS: Developer-centric Sass Area
2014-01-03 11:57:57 -08:00