Commit Graph

20532 Commits

Author SHA1 Message Date
cahrens
3eb0018629 Make ordinal in duplication statement friendlier. 2014-01-22 14:11:23 -05:00
cahrens
a1cb0a128b Define fixtures outside of the beforeEach. 2014-01-22 11:01:19 -05:00
cahrens
b5726a6889 Front-end work for duplicating components on the unit page.
STUD-1186
2014-01-22 10:43:51 -05:00
Diana Huang
58e6f60ebf Merge pull request #2256 from edx/diana/linkedin-parameter
Remove authority name from url.
2014-01-22 07:34:10 -08:00
Greg Price
eefa6b811d Merge pull request #2252 from edx/gprice/upgrade-mako
Upgrade mako
2014-01-22 07:29:10 -08:00
Diana Huang
5a16817e3c Remove authority name from url. 2014-01-22 10:05:17 -05:00
Valera Rozuvan
2536224b9d Merge pull request #2176 from edx/valera/fix_start-time-end-time_2
Valera/fix start time end time 2
2014-01-22 06:46:43 -08:00
Valera Rozuvan
b6e5db02ee Addressing comments for PR 2176.
BLD-529.
2014-01-22 16:39:00 +02:00
Valera Rozuvan
b3f0d1b2f0 Updated Changelog.rst file.
BLD-529.
2014-01-22 16:38:54 +02:00
Valera Rozuvan
d778ab7118 Added Jasmine test for initial retrieval of duration.
BLD-529.
2014-01-22 16:38:45 +02:00
Valera Rozuvan
215816b59c Start-end time range always shown, even before video plays.
BLD-529.
2014-01-22 16:38:38 +02:00
Valera Rozuvan
33031b76f4 Enable correct total time display in VCR for YouTube videos.
Before this, the VCR showed total time as 00:00:00 for YouTube
videos just after page loaded. The correct total time is shown only
after the user clicks Play button.

BLD-529.
2014-01-22 16:38:24 +02:00
Anton Stupak
591470df3a Merge pull request #2229 from edx/anton/cookie-storage
Video: Add utility to work with cookies.
2014-01-22 01:51:15 -08:00
Greg Price
f5bdec8ae9 Merge pull request #2204 from edx/gprice/mustache-i18n
Internationalize forums mustache templates
2014-01-21 13:49:41 -08:00
Jason Bau
4e413e4ecb Merge pull request #2190 from edx/jbau/fix-preview-config
move HOSTNAME_MODULESTORE_DEFAULT_MAPPING to lms.envs.aws (not lms.envs....
2014-01-21 13:26:10 -08:00
Greg Price
f75a7e08cd Internationalize forums mustache templates 2014-01-21 15:57:57 -05:00
David Ormsbee
42e0ec403e Merge pull request #2251 from edx/release
Merging Release 2014-01-21
2014-01-21 12:41:05 -08:00
Greg Price
7515decebd Upgrade mako
This is necessary to pick up a bug fix for extraction of translator
comments.
2014-01-21 15:28:39 -05:00
Will Daly
8aa208e80d Disabled latex acceptance test 2014-01-21 15:01:36 -05:00
Ned Batchelder
9c9de01603 Merge pull request #2248 from edx/ned/fix-readthedocs-dev-doc
Really fix readthedocs.
2014-01-21 11:04:13 -08:00
Ned Batchelder
c48ac5922d Really fix readthedocs. 2014-01-21 14:03:18 -05:00
Ned Batchelder
55a6cbb960 Merge pull request #2246 from edx/ned/fix-readthedocs-dev-doc
Make the dev docs work on readthedocs.org
2014-01-21 10:57:22 -08:00
Ned Batchelder
62ff82c5eb Make the dev docs work on readthedocs.org 2014-01-21 13:56:53 -05:00
Mark Hoeber
2071f0e7ea Merge pull request #2242 from edx/sylvia/documentation/BLD-630
Sylvia/documentation/bld 630
2014-01-21 09:09:57 -08:00
Sylvia Pearce
f73f02e8f5 Update zooming image tool info and add image 2014-01-21 11:10:01 -05:00
zubair-arbi
7bdcc84857 Merge pull request #2214 from zubair-arbi/zub/story/std1183-staticpagestest
enable tests depending on assert is_css_present(css_selector)
2014-01-21 06:50:27 -08:00
Diana Huang
d220aaca66 Minor copy change requested by linkedin. 2014-01-21 09:14:00 -05:00
Sarina Canelake
911351dfad Merge pull request #2240 from edx/sarina/fix-bug
Change i18n contact address
2014-01-21 05:39:29 -08:00
Sarina Canelake
2b45ebc82f Change i18n contact address 2014-01-21 08:38:41 -05:00
polesye
a41df03c64 Move README to docs. 2014-01-21 13:56:32 +02:00
polesye
ee4178e7f5 Add CookieStorage. 2014-01-21 11:51:41 +02:00
Sarina Canelake
7fa5ae9c64 Merge pull request #2233 from edx/sarina/change-contact-email
Change i18n contact address
2014-01-20 14:01:46 -08:00
Sarina Canelake
fffa4f36da Change i18n contact address 2014-01-20 16:01:45 -05:00
Ned Batchelder
8594faf43f Merge pull request #2232 from edx/ned/i18n-tool-improvements
Make i18n a real package.
2014-01-20 10:06:16 -08:00
Ned Batchelder
cab1c04e5e Make i18n a real package. 2014-01-20 11:34:54 -05:00
Don Mitchell
003ad76c64 Merge pull request #2209 from edx/db/lms_date_agnostic
Detached categories don't access control on date
2014-01-19 08:46:28 -08:00
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00
Sarina Canelake
7f74297810 Merge pull request #2219 from edx/sarina/i19-capa-new
i19 base capa strings
2014-01-17 14:41:05 -08:00
Sylvia Pearce
5f07fc9df9 Update Zooming Image tool documentation 2014-01-17 17:18:34 -05:00
Sarina Canelake
0efa75d6f5 i18n of common/lib/capa/capa files
Also pep8, pylint, and style fixes
Covers:
{capa_problem, correctmap, customerender,
inputtypes, responsetypes, util, xqueue_interface}.py
LMS-1744
2014-01-17 16:39:50 -05:00
Carson Gee
207f3c585c Merge pull request #2196 from carsongee/cg/forum_roles_on_import_command
Adding missing forum permissions seeding routine to xml_import
2014-01-17 13:27:19 -08:00
Diana Huang
f051e33064 New copy and styling. 2014-01-17 16:23:13 -05:00
Ned Batchelder
9620e341a2 Merge pull request #2210 from edx/ned/i18n-docs-in-repo
Ned/i18n docs in repo
2014-01-17 12:27:40 -08:00
Ned Batchelder
b8a8575d17 Further edits 2014-01-17 15:27:22 -05:00
Ned Batchelder
8c79f13d17 Added more coding details to i18n doc. 2014-01-17 15:27:22 -05:00
Ned Batchelder
53de11d4b5 Conversion of page from wiki to .rst 2014-01-17 15:27:22 -05:00
Ned Batchelder
66794749fb Minor tweaks to home page. 2014-01-17 15:27:22 -05:00
Adam
439037d827 Merge pull request #2084 from edx/adam/remove_unsure_button
removes unsure button (ORA-254)
2014-01-17 12:24:43 -08:00
Carson Gee
1e809a4210 Adding missing forum permissions seeding routine to xml_import
Currently if a course is only imported from the command line the
forum permissions are not seeded, this adds that functionality
Switched to doing seeding outside of xmodule library
Switched to using course_items
Switching to simpler test class
2014-01-17 15:17:48 -05:00
Sarina Canelake
3584b246dd Translate strings in xmodule/capa_*.py
LMS-1744
2014-01-17 15:01:59 -05:00