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

26516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia Pearce
dfd00a0276 Migrate exercises and tools to shared folder 2014-10-27 15:36:45 -04:00
Will Daly
0735141afc Merge pull request #5730 from edx/will/update-donation-tests 
Add a test for donations with a white-label course mode
 2014-10-27 14:13:44 -04:00
John Eskew
ed9e059b5c Merge pull request #5557 from edx/jeskew/minor_xblock_doc_edit 
Fix XBlock doc formatting. No content change! Only formatting...
 2014-10-27 13:34:19 -04:00
Will Daly
5a1df635d0 Merge pull request #5735 from edx/will/update-release-10-27 
Merge release into master (with changes from Friday 10/24/14)
 2014-10-27 12:01:09 -04:00
Sarina Canelake
25a745526c Merge pull request #5737 from edx/sarina/102714-translations-update 
Update translations (autogenerated message)
 2014-10-27 11:44:15 -04:00
Sarina Canelake
e4bfa0f9ff Update translations (autogenerated message) 2014-10-27 11:43:16 -04:00
Don Mitchell
22cbe0c410 Merge pull request #5723 from edx/dhm/split_assetstore 
Implement asset metadata storage in Split - per-asset functionality
 2014-10-27 11:36:29 -04:00
Ben Patterson
ed2ca50804 Merge pull request #5732 from edx/benp/optimize-run-quality 
Optimize run_quality calls
 2014-10-27 11:08:59 -04:00
Will Daly
0cac6ea21b Fix pylint violations 2014-10-27 11:04:22 -04:00
Will Daly
7f54af3be0 Merge remote-tracking branch 'origin/release' 2014-10-27 10:59:31 -04:00
Will Daly
cafea30769 Merge pull request #5722 from edx/renzo/third-party-auth-no-prof-ed-autoenroll 
Prohibit automatic enrollment in prof ed courses when user authenticates via third-party auth
 2014-10-27 10:58:50 -04:00
Don Mitchell
f48289cc4f Moved assetstore tests to own file and ddt'd across stores 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
 2014-10-27 10:04:10 -04:00
Don Mitchell
b6fac23960 Implement asset metadata storage in Split - per-asset functionality 
PLAT-40

Conflicts:
	common/lib/xmodule/xmodule/assetstore/__init__.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-10-27 10:04:09 -04:00
Mark Hoeber
0064d29dc4 Merge pull request #5684 from edx/markhoeber-documentation-doc3 
Fixed Text Input Template
 2014-10-27 09:21:53 -04:00
Mark Hoeber
7ad5561abd Fixed Text Input Template 2014-10-27 09:21:26 -04:00
Mark Hoeber
fa93a69283 Merge pull request #5692 from edx/markhoeber-doc935 
Fixed code sample for python grader
 2014-10-27 09:07:05 -04:00
Mark Hoeber
c2428c7276 Fixed code sample for python grader 
Just a missing “
 2014-10-27 09:06:38 -04:00
Ben Patterson
9642468c98 Optimize run_quality calls 
Leverages recent changes in diff-cover to reduce number of diff-quality runs
 2014-10-27 07:06:58 -04:00
Will Daly
2c062ca08b Add a test for donations with a white-label course mode 2014-10-26 15:58:26 -04:00
Ben Patterson
ff4a1755d0 Merge pull request #5650 from edx/benp/TE-555 
run_quality should run both quality reports in the case of a threshold breach
 2014-10-24 19:20:26 -04:00
srpearce
686ca3d779 Merge pull request #5583 from edx/sylvia/docs/SFD_Discussions 
Sylvia/docs/sfd discussions
 2014-10-24 17:12:44 -04:00
Sylvia Pearce
850c3a901a Add discussion info to SFD 2014-10-24 17:12:14 -04:00
Jesse Zoldak
26c01dffe3 Merge pull request #5721 from edx/zoldak/fix-easy-access-test 
Fix test page definition for course group configurations page
 2014-10-24 16:16:43 -04:00
Renzo Lucioni
05cb2a071b Prohibit automatic enrollment in prof ed courses when user authenticates via third-party auth 2014-10-24 15:59:42 -04:00
frances botsford
93425a7c47 Merge pull request #5719 from edx/frances/fix/rtl-dashboard-fixes 
small UI fixes on dashboard for RTL
 2014-10-24 15:26:42 -04:00
Jesse Zoldak
af3d911a7f Fix test page definition for course group configurations page 
TNL-685
 2014-10-24 14:30:31 -04:00
frances botsford
60bb6a1021 Merge pull request #5696 from Stanford-Online/giulio/course-about-font-awesomize 
Convert icons on course_about to font awesome
 2014-10-24 14:05:23 -04:00
Frances Botsford
13b97e3606 small UI fixes on dashboard for RTL 2014-10-24 14:01:39 -04:00
John Eskew
5ffc6ac256 Merge pull request #4854 from edx/jeskew/assetstore_modulestore_work 
Phase 1 of adding asset metadata saving to old Mongo
 2014-10-24 12:47:53 -04:00
Sarina Canelake
3d1c54fefa Merge pull request #5595 from Stanford-Online/caijim/resetbutton 
Support and tests for adding a reset button to units
 2014-10-24 11:49:24 -04:00
John Eskew
b857a0ed7b Phase 1 of adding asset metadata saving to old Mongo 2014-10-24 11:07:32 -04:00
Ben Patterson
a8c0c2b71c paver run_quality should run both pep8 and pylint diffs with -p flag 
TE-555
 2014-10-24 08:46:00 -04:00
zubair-arbi
98c9880d3c Merge pull request #5596 from edx/zub/bugfix/tnl-537-persistvideospeed 
reload video on change speed only if value is '1.0'
 2014-10-24 14:31:09 +05:00
zubair-arbi
4ea6323d96 reload video in setPlaybackRate only if speed of video is '1.0' 
TNL-537
 2014-10-24 12:29:06 +05:00
Ben Patterson
3185dc4823 Merge pull request #5689 from edx/zoldak/solano-gitignore 
Add Solano Labs tddium artifacts to gitignore
 2014-10-23 18:54:07 -04:00
Giulio Gratta
5b647a3a12 remove unused icon images 2014-10-23 14:04:15 -07:00
Alison Hodges
a3ab2ed7fa Merge pull request #5633 from edx/ahodges/doc/DOC1001 
Course keys use key introspection
 2014-10-23 16:38:18 -04:00
Alison Hodges
01cd160e74 Course keys use key introspection 
@brianhw, @watsonemily, @srpearce, and @stroilova, please review.
Question: is there an impact on CommentThread.commentable_id for
discussion threads?
 2014-10-23 16:15:39 -04:00
stephensanchez
61436ea195 Merge branch 'release' 2014-10-23 19:41:31 +00:00
Alison Hodges
bfcffd2def Merge pull request #5660 from edx/ahodges/doc/relnotes20141021 
Ahodges/doc/relnotes20141021
 2014-10-23 15:40:16 -04:00
Alison Hodges
7026aa4045 Release notes for 23 Oct 2014 
initial draft
 2014-10-23 15:39:40 -04:00
Jim
6d19a0c87c Support and tests for adding a reset button to units 
Users may want to start anew when answering a question. This commit decouples reset from randomization while still preserving backward compatibility. Users can clear their input.
Instructors can set course-wide and problem-specific settings for reset button display.
 2014-10-23 12:14:27 -07:00
Giulio Gratta
07263de841 Convert icons on course_about to font awesome 2014-10-23 10:54:18 -07:00
David Baumgold
14209c672a Merge pull request #5667 from lduarte1991/lduarte-harvardx-pr33 
Annotation Tools: Upgrading Share plugin from v1.0 to v1.1
 2014-10-23 11:22:22 -04:00
srpearce
46b2f0d7a0 Merge pull request #5694 from edx/sylvia/docs/DOC-842 
Add note about provisional status to annotation problem type
 2014-10-23 11:16:03 -04:00
Sylvia Pearce
c922910817 Add note about provisional status to annotation problem type 2014-10-23 11:15:40 -04:00
Tim Babych
8fbdf712fa Merge pull request #5698 from edx/tim/django-1.4.16 
Update django version to 1.4.16
 2014-10-23 16:46:41 +03:00
Anton Stupak
b12aa0b1b6 Merge pull request #5518 from edx/anton/requirejs-optimizer 
Add RequireJS Optimizer.
 2014-10-23 15:29:42 +03:00
Oleg Marshev
f550359d67 Merge pull request #5545 from edx/oleg/lms-dashboard-course-start-time 
Add course start/end time to student dashboard.
 2014-10-23 11:56:37 +03:00
Tim Babych
693089e4a1 Update django version to 1.4.16 2014-10-23 11:54:18 +03:00