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

20243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
ef6c8a95e0 Update XBlock to version with Runtime.service 2014-01-09 13:56:20 -05:00
Sarina Canelake
c285bd11d5 Merge pull request #2108 from edx/jtauber/neuter-static-files 
remove edx.org-specific content no longer used
 2014-01-09 10:06:44 -08:00
Sarina Canelake
56a917cfb7 Fix 'JOBS' and 'PRESS' links at bottom of old site 2014-01-09 12:30:15 -05:00
Sarina Canelake
674670b687 Remove unused image files from old website 2014-01-09 12:04:35 -05:00
Sarina Canelake
2f8088eaaf Merge pull request #2057 from edx/ormsbee/js_gettext 
Remove JS gettext() in templates
 2014-01-09 07:54:37 -08:00
David Ormsbee
ff192935d8 Removing JS gettext() in favor of server-side substitution. 
[LMS-1680]
 2014-01-09 10:24:09 -05:00
Don Mitchell
bccae306db Merge pull request #2111 from edx/dhm/drop_contentstore 
During testing: drop contentstore when cleaning up modulestore
 2014-01-08 11:37:42 -08:00
Andy Armstrong
eeb5f81272 Merge pull request #2086 from edx/andya/asset-sorting 
Add sorting to Studio's Files & Uploads page
 2014-01-08 09:09:54 -08:00
Don Mitchell
81a5b36363 During testing: drop contentstore when cleaning up modulestore 2014-01-08 12:05:32 -05:00
Mark Hoeber
82ef40d8b9 Merge pull request #2110 from edx/markhoeber/documentation/stud1012 
Removed old unused images for Building a Course doc
 2014-01-08 08:05:51 -08:00
Mark Hoeber
7b3819adc7 Removed old unused images for Building a Course doc 
STUD-1012
 2014-01-08 11:03:41 -05:00
Andy Armstrong
93675304da Add sorting to Studio's Files & Uploads page 
Added sorting to the new pagination logic for STUD-995.
 2014-01-08 10:35:40 -05:00
Julia Hansbrough
e783d42cdb Merge pull request #2083 from edx/flowerhack/updated-codejail-reqs 
Updated codejail version
 2014-01-08 07:22:32 -08:00
James Tauber
5ef94f1496 removed edx.org-specific content no longer used 2014-01-08 17:51:28 +08:00
Will Daly
75ce79fb5a Merge pull request #1957 from edx/will/devstack-rake 
Added rake commands for devstack
 2014-01-07 14:43:17 -08:00
Don Mitchell
19eaaaed6f Merge pull request #2051 from edx/dhm/arch-docs 
architectural documents
 2014-01-07 14:30:47 -08:00
David Baumgold
5d63cd0eb0 Merge pull request #2094 from edx/db/change-section-start-date 
Set default section start date to Jan 1, 2030
 2014-01-07 13:10:29 -08:00
David Baumgold
ce4b130113 Set default section start date to Jan 1, 2030 
STUD-1072
 2014-01-07 15:46:15 -05:00
Mark Hoeber
5e174e223a Merge pull request #2102 from edx/markhoeber/documentation/release-notes-1-7-14 
Markhoeber/documentation/release notes 1 7 14
 2014-01-07 12:24:55 -08:00
Calen Pennington
db10dc38cb Merge pull request #2088 from cpennington/fix-release-script-unicode 
Make the release script not fall over when piping data to a file
 2014-01-07 12:23:23 -08:00
spearce
a853c7de14 Make changes based on feedback from Lyla and Adam. 2014-01-07 15:22:51 -05:00
Andy Armstrong
f306c4d73a Merge pull request #2101 from edx/andya/pagination-test-fix 
Fix pagination test failures
 2014-01-07 12:10:29 -08:00
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
Mark Hoeber
d79dd728bb Updated 1-7-14 release notes 
integrated Sylvia's edits
 2014-01-07 13:27:24 -05:00
Andy Armstrong
100ace64db Fix pagination test failures 
Updated the pagination tests to no longer use the toy course, but to instead explicitly upload the assets it needs.

 Added a new AssetsTestCase base class to own shared helper methods.
 2014-01-07 13:12:39 -05: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
Mark Hoeber
b92eecac45 Added BLD items 
Added BLD items to 1-7-2014 release notes
 2014-01-06 18:06:30 -05:00
Andy Armstrong
089c2a0302 Fix STUD-1129: handle out-of-range page numbers 2014-01-06 18:00:32 -05:00