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

22364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Zoldak
d45cd90df1 Merge pull request #3218 from edx/zoldak/bok-choy-contentstore 
Fix the pointer to the contentstore in the bok-choy settings
 2014-04-05 20:21:58 -04:00
srpearce
2f16bbe184 Merge pull request #3226 from edx/sylvia/documentation/DOC-269 
Updates to ORA2 documentation
 2014-04-04 17:04:35 -04:00
Alison Hodges
f75561ab00 Merge pull request #3221 from edx/ahodges/documentation/excel 
AN-836: draft info about spreadsheets and UTF8, illustrations
 2014-04-04 16:53:03 -04:00
Alison Hodges
1580ee6e8b AN-836: draft info about spreadsheets and UTF8, illustrations 2014-04-04 16:52:11 -04:00
Sylvia Pearce
b02d609eeb Updates to ORA2 documentation 2014-04-04 16:49:18 -04:00
Alison Hodges
e1887d81ce Merge pull request #3223 from edx/ahodges/documentation/spacing 
Stray space made html file formatting incorrect
 2014-04-04 16:18:52 -04:00
chrisndodge
c407e89889 Merge pull request #2781 from edx/cdodge/password-history-enforcements 
Add some optional policies around password resets, such as password reus...
 2014-04-04 16:14:43 -04:00
Alison Hodges
5f95d2a2de Stray space made html file formatting incorrect 2014-04-04 15:44:04 -04:00
Giulio Gratta
d2bac9bf8d Merge pull request #2552 from edx/giulio/edit-in-cms-links 
Add "View in Studio" links throughout LMS
 2014-04-04 11:25:28 -07:00
frances botsford
562875e635 Merge pull request #3184 from edx/frances/fix/lms-wiki-icons 
Remove double icons on LMS wiki page
 2014-04-04 13:32:37 -04:00
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
Jay Zoldak
72259b2fe1 Fix the pointer to the contentstore in the bok-choy settings 2014-04-04 12:30:09 -04:00
David Baumgold
6292e55997 Merge pull request #3204 from edx/db/upgrade-django-nose 
Upgrade django_nose to 1.2
 2014-04-04 10:43:37 -04:00
Anton Stupak
40d5f1e564 Merge pull request #3195 from edx/anton/force-flash 
Force video player in flash mode.
 2014-04-04 15:29:48 +03:00
polesye
d55554705f BLD-958: Force video player in flash mode. 2014-04-04 14:53:14 +03:00
Usman Khalid
da470afc4f Merge pull request #3187 from edx/adam/fix-alter-xblock-student-state 
Adam/fix alter xblock student state
 2014-04-04 15:29:34 +05:00
Usman Khalid
b3075e286b Merge pull request #3205 from edx/usman/lms2498-mako-template-tests 
Test that TemplateLookup dirs are not cleared during lms startup
 2014-04-04 15:22:12 +05:00
Anton Stupak
ec6388b87d Merge pull request #3153 from edx/anton/caption_refactor 
Refactor video caption module.
 2014-04-04 13:03:02 +03:00
Julia Hansbrough
dd7bae432d Merge pull request #3164 from edx/flowerhack/better-xmodule-metrics 
XModule datadog metrics
 2014-04-03 16:04:06 -04:00
Christina Roberts
dfed60fa8c Merge pull request #3163 from edx/christina/advanced-settings-font 
Use monospaced font for CodeMirror editor.
 2014-04-03 14:58:56 -04:00
Julia Hansbrough
aa41635f79 XModule datadog metrics 2014-04-03 18:31:44 +00:00
cahrens
3d7915fa56 Use monospaced font for CodeMirror editor. 
Cursor position gets off with non-monospaced font.
STUD-1456.

Vertical alignment of monospace font in advanced settings via position css adjustment
 2014-04-03 13:11:08 -04:00
David Baumgold
63c58bb26d Merge pull request #3189 from edx/db/upgrade-pyparsing 
Upgrade pyparsing to 2.0.1
 2014-04-03 13:02:54 -04:00
Adam Palay
394e9efbac make sure new lms/tests.py file is run 2014-04-03 20:23:44 +05:00
Usman Khalid
12c2e1bfee Test TemplateLookup dirs are not cleared during lms startup. 
LMS-2498
 2014-04-03 20:23:44 +05:00
Stephen Sanchez
751bd71a7b Merge remote-tracking branch 'origin/release' 2014-04-03 11:06:09 -04:00
Mark Hoeber
9e00d6f0c4 Merge pull request #3172 from edx/markhoeber/documentation/doc-248 
Release notes for 4/2/14
 2014-04-03 10:54:05 -04:00
David Baumgold
176392225f Upgrade django_nose to 1.2 2014-04-03 10:48:52 -04:00
Christina Roberts
d6a0d6f06c Merge pull request #3180 from edx/christina/iframe_binding_bug 
Check iframe src for the specific value TinyMCE uses.
 2014-04-03 10:11:43 -04:00
Dave St.Germain
c202e2aa6f Merge pull request #3177 from edx/dcs/paver-one-watcher 
Fixes potential 'too many open files error' when running all servers.
 2014-04-03 10:02:58 -04:00
Mark Hoeber
6dc4640f92 Release notes for 4/2/14 
DOC-248
 2014-04-03 09:57:28 -04:00
zubair-arbi
048962874e Merge pull request #3150 from edx/waheed/stud1483-cannot-handle-more-than-9-lines-advanced-settings 
Fixed studio can't handle more than 9 lines in advanced settings.
 2014-04-03 18:42:39 +05:00
Mark Hoeber
4be9c06d1b Merge pull request #3078 from edx/markhoeber/documentation/stud-1443 
Documentation for Pages and Wiki changes
 2014-04-03 09:29:09 -04:00
Mark Hoeber
0a8d07c0c3 Documentation for Pages and Wiki changes 
STUD-1443
 2014-04-03 09:27:49 -04:00
Jay Zoldak
b0859941e6 Merge pull request #3181 from edx/zoldak/fix-acid 
Add synchronization for rendering to studio xblock tests
 2014-04-03 09:24:09 -04:00
Alexander Kryklia
70db47a73d Merge pull request #3201 from edx/alex/fix_971 
Fix flaky video test #21: increase timeout.
 2014-04-03 16:13:09 +03:00
polesye
2f572a86ea Refactor video caption module. 2014-04-03 15:40:59 +03:00
Alexander Kryklia
668134de4a Merge pull request #3169 from edx/alex/fix_more_flaky_tests 
Alex/fix more flaky tests
 2014-04-03 15:34:18 +03:00
Alexander Kryklia
41695def9e Merge pull request #3136 from edx/alex/display_native_language_2 
Alex/display native language 2
 2014-04-03 15:06:04 +03:00
Alexander Kryklia
cf3e2c860b Fix flaky video tests: speed up youtube api loading and wait for controls. 2014-04-03 14:37:17 +03:00
Alexander Kryklia
221f4e2363 Fix flaky video test #21: increase timeout. 2014-04-03 14:34:12 +03:00
Alexander Kryklia
fab43e1a68 Merge pull request #3199 from edx/alex/fix_flaky_video_test_20 
Alex/fix flaky video test 20
 2014-04-03 14:32:06 +03:00
Alexander Kryklia
e3902cbebc Merge pull request #3198 from edx/alex/fix_flaky_video_test_12 
Fix flaky test #12
 2014-04-03 14:31:06 +03:00
Alexander Kryklia
c3f9943802 Fix lms video #20: scroll view to be clickable. 2014-04-03 13:17:32 +03:00
Alexander Kryklia
2a39d28348 Fix flaky test #12 
"CC button works correctly w/o english transcript in HTML5 mode of Video component"
 2014-04-03 12:45:38 +03:00
Alexander Kryklia
80635a9995 Merge pull request #3149 from edx/alex/fix_flaky_test 
Fix flaky acceptance test.
 2014-04-03 12:20:42 +03:00
Ned Batchelder
11d078a9cc Merge pull request #3192 from edx/ned/fix-encode-error-when-hashing-resources 
Fix hash_resource to avoid encode errors.
 2014-04-02 22:03:00 -04:00
Ned Batchelder
732bf3f307 Fix hash_resource to avoid encode errors. 2014-04-02 20:13:50 -04:00
Mark Hoeber
f275f5424b Merge pull request #3165 from edx/markhoeber/documentation/doc-188 
Initial Reorg of Setting up Course
 2014-04-02 16:26:49 -04:00
Mark Hoeber
69ed998474 Reorganizatio of Setting up Course 
DOC-188
 2014-04-02 16:26:20 -04:00