Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,914 Commits 1 Branch 0 Tags
59ca4774fb625aa14ffaa45d2b62efec499db695
Commit Graph

21914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
polesye
59ca4774fb Fix flaky acceptance test. 2014-03-19 11:11:17 +02:00
Jay Zoldak
4fc71c1d64 Merge pull request #2977 from edx/zoldak/kill-perfstats 
Kill the perfstats module, which is unused
 2014-03-18 16:55:48 -04:00
Sarina Canelake
136f4388bf Merge pull request #2941 from edx/sarina/lms-1287 
Sarina/lms 1287
 2014-03-18 16:54:45 -04:00
David Baumgold
ac4caf0b59 Merge pull request #2969 from edx/db/fix-mkdir-error 
Mongo modulestore: create data dir
 2014-03-18 16:52:35 -04:00
David Baumgold
31b64ad54e Merge pull request #2933 from edx/cale/quieter-i18n-tests 
Make i18n tests quieter
 2014-03-18 16:51:42 -04:00
David Baumgold
d93238d8de create_dir_if_necessary() is unnecessary 
We already have makedirs_p()
 2014-03-18 16:10:03 -04:00
David Baumgold
380d2177f5 pep8/pyflakes 2014-03-18 16:09:59 -04:00
Sarina Canelake
8f24a5fd5e Batch add/remove beta testers on beta dash 
LMS-1287
 2014-03-18 16:08:59 -04:00
Adam Palay
d7c9491f23 Bulk beta tester add/remove on instructor dashboard 
LMS-1287
 2014-03-18 16:08:58 -04:00
Jim Abramson
2d6bfbadec Merge pull request #2950 from edx/jsa/create-user-locale 
in create_user mgmt command, use settings.LANGUAGE_CODE instead of en-us
 2014-03-18 16:06:56 -04:00
Jay Zoldak
1de5e565c3 Kill the perfstats module, which is unused 2014-03-18 15:47:36 -04:00
Diana Huang
865496cc2e Merge pull request #2973 from edx/diana/ab-import-export 
Fix split_test import and export.
 2014-03-18 15:41:25 -04:00
jsa
fb57ffb80a in create_user mgmt command, use settings.LANGUAGE_CODE instead of en-us. 
Fixes the create_user admin command, which was creating user accounts
with a potentially invalid language preference.

JIRA: FOR-532
 2014-03-18 15:28:07 -04:00
David Baumgold
a2e910b133 tests only work when generate.main() is called with strict=False 2014-03-18 15:21:08 -04:00
David Baumgold
35f41b7ddd allow stderr if verbosity is off 2014-03-18 15:01:08 -04:00
Calen Pennington
58f05f3687 Merge pull request #2840 from ionis-education-group/double-edxmako-startup 
Add method to clear mako template lookups
 2014-03-18 14:31:13 -04:00
David Baumgold
19b8b1debe reraise exception without changing traceback 2014-03-18 14:18:33 -04:00
Diana Huang
6f7c73cd4f Fix split_test import and export. 
LMS-2405
 2014-03-18 14:15:13 -04:00
Jim Abramson
32fd073760 Merge pull request #2957 from edx/jsa/forum-user-sync 
Ensure account creation succeeds before creating comments service user
 2014-03-18 14:07:44 -04:00
Greg Price
88b0a0a4c1 Merge pull request #2960 from edx/gprice/FOR-499 
Do not allow students to pin/unpin forum threads
 2014-03-18 14:03:56 -04:00
David Baumgold
a6d5b7f2c7 Added message to run during i18n tests to inform people that test_generate takes a long time 2014-03-18 13:39:24 -04:00
David Baumgold
337a012c1c Make all i18n scripts use argparse, handle --verbose flag 2014-03-18 13:33:55 -04:00
jsa
b20c8f9248 Ensure account creation succeeds before creating comments service user 
Also improves handling in cases where account creation did succeed, but
comments service user creation did not.

Depends on commit 88abdd8a0b20bc9816f487b25abdea1953f5661d in https://github.com/edx/cs_comments_service

JIRA: FOR-522
 2014-03-18 13:24:30 -04:00
Adam
0a45f8278a Merge pull request #2704 from edx/adam/refactor-static-tab-tests 
refactor static tab tests
 2014-03-18 11:44:36 -04:00
Adam Palay
d6522cd123 refactor static tab tests 2014-03-18 10:43:57 -04:00
David Baumgold
a564d4d9bf Ensure that mongo modulestore can create its data directory if it does not exist on disk 2014-03-18 09:38:08 -04:00
Valera Rozuvan
0f0b2622eb Merge pull request #2942 from edx/valera/start_introduction_of_jslint 
Start introduction of JSLint for JavaScript
 2014-03-18 08:34:39 +02:00
Mark Hoeber
a795edcf22 Merge pull request #2666 from pdehaye/patch-2 
further explanation on entry_points
 2014-03-17 17:11:02 -04:00
David Baumgold
6e0a455cd7 Merge pull request #2730 from ionis-education-group/fix-static-urls 
Fix URLs for static resources
 2014-03-17 17:00:30 -04:00
Adam
76566be21b Merge pull request #2939 from edx/zub/story/disableunicodecourseids 
Enable/disable unicodes in course id's
 2014-03-17 12:04:51 -04:00
Calen Pennington
c4c998b55a Merge pull request #2954 from cpennington/pure-xblocks-progress-page 
Fix LMS-2349 (Progress page broken for pure xblocks)
 2014-03-17 12:01:30 -04:00
Mark Hoeber
945d8e0528 Merge pull request #2881 from edx/markhoeber/documentation/ca-reorg-real 
Markhoeber/documentation/ca reorg real
 2014-03-17 11:44:15 -04:00
Mark Hoeber
8100e38f3f edX Course Authors Doc Reorganization 2014-03-17 11:43:32 -04:00
Valera Rozuvan
54d1af1679 Update 10_main.js 
Removing JSLint configuration.
 2014-03-17 17:30:31 +02:00
zubiar-arbi
714da6ab23 Enable/disable unicodes in course id's 2014-03-17 20:24:59 +05:00
Dave St.Germain
372d0846fd Merge pull request #2932 from edx/dcs/fix-matlab-input 
This fixes LMS-2387 by removing a resize call that prevented scrolling.
 2014-03-17 11:15:01 -04:00
Calen Pennington
a5498bcbd7 Make progress page work with pure xblocks 
[LMS-2349]
 2014-03-17 10:45:14 -04:00
Calen Pennington
290fd03566 Add tests that verify progress page with pure XBlocks 
This is known to be broken.

[LMS-2349]
 2014-03-17 10:44:37 -04:00
Dave St.Germain
2a20b3f67e This fixes LMS-2387 by removing a resize call that prevented scrolling. 
It also enables syntax highlighting for matlab input fields, which
wasn't previously enabled.
 2014-03-17 10:35:53 -04:00
Don Mitchell
e13d167045 Merge pull request #2918 from edx/dhm/meld_pretty_factory 
Dhm/meld pretty factory
 2014-03-17 09:44:19 -04:00
Alexander Kryklia
13ef23c308 Merge pull request #2786 from edx/alex/fix_download_html5_subs 
Fix donwload subs for non youtube videos and non-en language.
 2014-03-17 12:48:27 +02:00
Waheed Ahmed
70233a96d7 Merge pull request #2926 from edx/waheed/lms2195-localization-fix-on-staff-grading-page 
Internationalization fixed for error msg on staff grading page.
 2014-03-17 13:15:23 +05:00
Waheed Ahmed
741881b360 Internationalization fixed for error msg on staff grading page. 
LMS-2195
 2014-03-17 12:38:20 +05:00
Valera Rozuvan
9d21d75f6e Initial commit. 2014-03-17 08:12:45 +02:00
Sarina Canelake
137faf4407 Merge pull request #2951 from edx/sarina/031514-language-update 
Update translations (autogenerated message)
 2014-03-15 16:21:20 -04:00
Sarina Canelake
da6fdc332b Update translations (autogenerated message) 2014-03-15 15:40:08 -04:00
Mark Hoeber
16523b9912 Merge pull request #2947 from edx/markhoeber/documentation/doc-34 
Edits from Alison's initial review
 2014-03-14 15:52:33 -04:00
Mark Hoeber
bb85698450 Edits from Alison's initial review 
DOC-34
 2014-03-14 15:02:35 -04:00
srpearce
f666b8542c Merge pull request #2943 from edx/sylvia/documentation/BLD-850 
Consolidate information from data.edx.org, Appendix E, and problem types
 2014-03-14 14:37:19 -04:00
Carlos Andrés Rocha
f7892da063 Merge pull request #2944 from rocha/improve-dumps-course-ids-tests 
Improve dump_course_ids test for unicode course_ids
 2014-03-14 13:54:07 -04:00