Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,482 Commits 1 Branch 0 Tags
00377652e46e573bedb0d3cb2b0843a76f53adfe
Commit Graph

24482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
00377652e4 Merge pull request #4179 from IONISx/tusbar/remove-course-id-from-title 
Remove course ID from title in course about page
 2014-07-21 13:57:34 -04:00
John Jarvis
7023eb4c19 resolving merge conflicts 2014-07-21 13:42:06 -04:00
Stephen Sanchez
0d5c6ba3ce Merge pull request #4495 from edx/ora2/release-2014-07-21T12.20 
Updating the ORA2 hash for July 21st, 2014
 2014-07-21 13:30:01 -04:00
srpearce
4dac56e6ce Merge pull request #4433 from edx/sylvia/docs/rel_notes_7_16 
Add course author notes for 7/16 release
 2014-07-21 11:20:03 -04:00
Brian Talbot
70da89900e Merge pull request #4484 from edx/talbs/fix-new-course-copy 
Studio: New Course Field Tip Copy Correction
 2014-07-21 11:08:23 -04:00
Sylvia Pearce
0f3403680d Add course author notes for 7/16 release 2014-07-21 10:55:47 -04:00
Nimisha Asthagiri
a03134b371 Merge remote-tracking branch 'origin/release' into rc/2014-07-16 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-07-21 10:35:55 -04:00
Stephen Sanchez
77d3c3fdb8 Updating the ORA2 hash for July 21st, 2014 2014-07-21 08:24:33 -04:00
Nimisha Asthagiri
c139c2a516 Merge pull request #4493 from edx/studio/bulk-edit-dont-update-ancestors 
Don't update ancestors while bulk editing.
 2014-07-21 08:12:24 -04:00
zubair-arbi
ce3d6f84ee Merge pull request #4025 from edx/zub/bugfix/std1725-duplicatefilesonimport 
ignore MAC meta files on import and also remove any such files from the ...
 2014-07-21 14:22:43 +05:00
zubair-arbi
cfa873cc1d ignore MAC meta files on import and also remove any such files from the course 
STUD-1725
 2014-07-21 13:16:00 +05:00
Nimisha Asthagiri
80f078cf61 Don't update ancestors while bulk editing. 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-07-20 23:38:33 -04:00
Brian Talbot
9c9e4a90b2 Studio: corrects new course field tip copy to reflect what provided course values cannot be changed later 
STUD-2001
 2014-07-20 18:17:49 -04:00
Nimisha Asthagiri
d53a666949 Merge pull request #4381 from edx/nimisha/split-converge-api 
Nimisha/split converge api
 2014-07-19 07:04:23 -04:00
Christina Roberts
40625c45fa Merge pull request #4488 from edx/christina/ispublic 
ispublic is in active use by Stanford.
 2014-07-18 22:28:54 -04:00
Calen Pennington
483e2a6a5d split create_item and create_child out as separate methods 2014-07-18 21:11:37 -04:00
cahrens
77a8660243 ispublic is in active use by Stanford. 2014-07-18 20:28:06 -04:00
Mark Hoeber
19fbabeeaa Merge pull request #4482 from edx/markhoeber/documentation/doc-666 
Corrected diff between 0K and 0 C
 2014-07-18 16:45:55 -04:00
Mark Hoeber
26e303c1b8 Corrected diff between 0K and 0 C 2014-07-18 10:00:22 -04:00
Nimisha Asthagiri
23cb549925 Merge pull request #4477 from edx/studio/minimal-fix-import-performance 
Studio/minimal fix import performance
 2014-07-18 09:51:28 -04:00
Anton Stupak
39f1f00977 Merge pull request #4424 from edx/anton/edit-group-configurations 
Edit group configurations.
 2014-07-18 13:12:18 +03:00
polesye
2a6a874a8f BLD-1099: Edit group configurations. 2014-07-18 10:03:08 +03:00
Mathew Peterson
06ef306f7f more split_draft methods 2014-07-17 22:48:11 -04:00
Nimisha Asthagiri
7efd0cb49e converge Split APIs with Mixed and Draft 2014-07-17 22:48:11 -04:00
Nimisha Asthagiri
a501aa9400 don't update ancestors while bulk editing. 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-07-17 21:58:11 -04:00
Nimisha Asthagiri
682c9fffd1 fix bulk_write context manager. 2014-07-17 21:57:43 -04:00
chrisndodge
1c5959988f Merge pull request #4466 from edx/cdodge/change-course-access-role-admin 
make sure the CourseAccessRole Django ORM Admin page uses a raw_id so th...
 2014-07-17 18:34:09 -04:00
Jason Bau
6e5f9fdb70 Merge pull request #4469 from edx/jbau/dev-environments-disable-ANALYTICS_ACTIVE_COUNT 
Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs
 2014-07-17 17:49:21 -04:00
swdanielli
44e9e6f359 Merge pull request #4467 from edx/swli/rc-hotpatch-recommender 
hotpatch for recommender (learning science)
 2014-07-17 17:01:08 -04:00
Don Mitchell
801dcd07a2 Merge pull request #4462 from edx/bug/delete_draft 
Piecemeal conversion to draft needs to allow
 2014-07-17 15:45:54 -04:00
Jason Bau
aac0fac3d2 Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs 2014-07-17 15:04:22 -04:00
Renzo Lucioni
adae7c6d95 Merge pull request #4437 from Stanford-Online/giulio/theme-segment-io 
always include GA file
 2014-07-17 14:34:19 -04:00
swdanielli
0fdc762452 recommender prototype 2014-07-17 14:31:16 -04:00
Don Mitchell
1103d057d7 Piecemeal conversion to draft needs to allow 
already converted children.
STUD-1965
 2014-07-17 13:54:54 -04:00
Jason Bau
fb927dd790 Merge pull request #4450 from Stanford-Online/jbau/edx/fix-shib-student-register 
fix shib reg from course about page
 2014-07-17 13:53:51 -04:00
Giulio Gratta
77c3d15d20 always include GA file 2014-07-17 10:25:06 -07:00
Jason Bau
be80e0058e Merge pull request #4464 from edx/jbau/remove-branch-setting-cache 
removing thread-local cache for branch_setting
 2014-07-17 13:03:08 -04:00
swdanielli
e81c33cea5 Merge pull request #4303 from edx/danielli/recommender_prototype 
recommender prototype
 2014-07-17 12:54:32 -04:00
Chris Dodge
bde448d950 make sure the CourseAccessRole Django ORM Admin page uses a raw_id so that we don't populate millions of rows from the production database in the drop down list 2014-07-17 12:04:56 -04:00
swdanielli
3f1e9993f5 recommender prototype 2014-07-17 11:21:01 -04:00
Jason Bau
f12fa05ae1 removing thread-local cache for branch_setting 2014-07-17 11:05:47 -04:00
Calen Pennington
1607b7fc0d Merge pull request #4445 from cpennington/cross-store-xml-import-export 
Add tests for xml import/export between different modulestores
 2014-07-17 10:55:55 -04:00
Jason Bau
e1fcac93c5 fix shib reg from course about page 2014-07-17 10:51:32 -04:00
Calen Pennington
d354571e95 Use field scopes to compute which metadata to strip from the definition during XML import of XMLModule subclasses 2014-07-17 10:35:37 -04:00
Calen Pennington
9a4e1f5cd1 Only compute block types with children once 2014-07-17 10:35:37 -04:00
Calen Pennington
3c7aa18d25 Don't use raw asserts in split (to handle different types of UsageKeys sanely) 2014-07-17 10:35:37 -04:00
Calen Pennington
1bc0b323b1 Explicitly create the AssetKey for all assets coming out of a ContentStore 2014-07-17 10:35:36 -04:00
Calen Pennington
4e67c2a9b3 Add the manual testing course for testing xml import/export across modulestores 2014-07-17 10:35:36 -04:00
Calen Pennington
8e0189bcf7 Skip DraftVersioningModuleStore tests 2014-07-17 10:35:35 -04:00
Calen Pennington
7a55f1207d Add tests of cross-modulestore import/export 
[LMS-2945]
 2014-07-17 10:35:04 -04:00