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

27306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
a15110f01c Remove Grade Adjustment code from legacy dash 2014-12-09 13:57:19 -05:00
Sarina Canelake
0a5af2a385 Rename legacy dash template 2014-12-09 13:57:19 -05:00
jmclaus
910466e0d8 Merge pull request #5829 from edx/jmclaus/load_ova_js_from_templates_with_requirejs 
In LMS, load OVA JS only in four OVA templates with requireJS. [TNL-693-outdated]
 2014-12-09 11:03:35 -05:00
jmclaus
082cb3b9ed Load OVA JS with requireJS in LMS. 2014-12-09 09:49:45 -05:00
chrisndodge
099d02d13d Merge pull request #6124 from edx/muhhshoaib/WL-164 
Unpurchased items in the shoppingcart should be removed if the enrollment period has closed
 2014-12-09 09:25:46 -05:00
Waheed Ahmed
b0eba8a62e Merge pull request #6114 from edx/waheed/tnl892-fix-css-background-image-for-important-visual-indicator 
Added IMG tag instead of css background property for important visual indicator.
 2014-12-09 14:11:39 +05:00
Waheed Ahmed
222b05a158 Added IMG tag instead of css background property for important visual indicator. 
TNL-892
 2014-12-09 12:38:54 +05:00
Muhammad Shoaib
829f7dba5f Remove items from the shopping cart if they are for a course whose course enrollment window has closed 
changed the url name to verify_cart and change the color of the message in the shopping cart
 2014-12-09 12:20:37 +05:00
Andy Armstrong
2b0f959bd7 Merge pull request #5942 from edx/cohorted-courseware 
Cohorted courseware
 2014-12-08 14:38:30 -05:00
Ben Patterson
99b55f88d6 Merge pull request #6181 from edx/revert-6096-jarv/config-refactor-wip 
Revert "Jarv/config refactor wip"
 2014-12-08 14:09:07 -05:00
Ben Patterson
89397d00f9 Revert "Jarv/config refactor wip" 2014-12-08 13:40:49 -05:00
David Baumgold
ca42dda7a7 Merge pull request #6127 from mitocw/cg/pin_cas_client 
Pin django-cas to hash
 2014-12-08 13:32:55 -05:00
Andy Armstrong
50e4416d00 Document the Open edX package. 2014-12-08 13:28:47 -05:00
John Jarvis
cc6111181d Merge pull request #6096 from edx/jarv/config-refactor-wip 
Jarv/config refactor wip
 2014-12-08 13:19:29 -05:00
John Eskew
72dbeb7fc3 Merge pull request #6166 from edx/jeskew/modulestore_asset_md_format_changes 
Make changes to the Mongo modulestore format for asset metadata.

https://openedx.atlassian.net/browse/PLAT-301
 2014-12-08 11:34:25 -05:00
Sarina Canelake
43ff734382 Merge pull request #6171 from edx/sarina/20141208-translation-update 
Update translations (autogenerated message)
 2014-12-08 11:23:18 -05:00
Will Daly
1511851abf Merge pull request #6170 from edx/will/old-login-register-email-opt-in 
Add email opt in to old login and register pages
 2014-12-08 11:15:01 -05:00
Sarina Canelake
dca161ccea Merge pull request #6168 from fmyzjs/patch-6 
Support unicode ANALYTICS_DASHBOARD_NAME
 2014-12-08 11:12:04 -05:00
Waqas Khalid
c88a017dea Merge pull request #5244 from mlkwaqas/waqas/tnl152-stop-voting-on-closed-thread 
Don't allow voting while the thread is closed
 2014-12-08 20:15:33 +05:00
Jason Zhu
7391f359dd Support unicode ANALYTICS_DASHBOARD_NAME 
I open this pull to support unicode ANALYTICS_DASHBOARD_NAME
 2014-12-08 23:10:27 +08:00
Christine Lytwynec
6821fd4093 Merge pull request #6122 from edx/clytwynec/dont-fail-diff-quality-for-todo 
Clytwynec/dont fail diff quality for todo
 2014-12-08 10:00:26 -05:00
Will Daly
23a51a6515 Add email opt in to old login and register pages 2014-12-08 09:29:16 -05:00
Adam
896b191503 Merge pull request #6161 from edx/adam/fix-openended-draft-export 
fix export for openassessment drafts (PLAT-249)
 2014-12-08 09:25:09 -05:00
Christine Lytwynec
25d76da4ef add disable fixme to pylintrc 2014-12-08 09:19:19 -05:00
Jim Abramson
8bddb09720 Merge pull request #6160 from edx/jsa/tnl-937 
avoid errors when forward-migrating course_groups after south conversion
 2014-12-08 08:58:43 -05:00
Sarina Canelake
dc6926bb2d Update translations (autogenerated message) 2014-12-08 08:56:07 -05:00
Xavier Antoviaque
f561e79a3e Merge pull request #6033 from edx-solutions/content-libraries 
Modulestore Support for Content libraries (Part of SOL-1, SOL-2, SOL-3)
 2014-12-08 10:31:15 +01:00
John Eskew
05ec8989de Make changes to the Mongo modulestore format for asset metadata. 
Move the asset types under a top-level 'assets' dict to allow for
future arbitrary asset types.
Change 'basename' to 'pathname', since the attr is for storing the path.
 2014-12-07 16:33:05 -05:00
Sarina Canelake
d2b4a6ea5b Merge pull request #5874 from stvstnfrd/up/course/about 
Create helper function to remove duplicate code
 2014-12-05 16:07:18 -05:00
Adam Palay
bd6897894c fix export for openassessment drafts (PLAT-249) 2014-12-05 15:19:51 -05:00
Chris
50152abb09 Merge pull request #5966 from Stanford-Online/kluo/help-modal-id 
Fix help modal css selector
 2014-12-05 14:45:07 -05:00
stv
04b97a3ae1 Create helper function to remove duplicate code 
This repetitive code is especially pronounced in Stanford's fork, where
we have extended the About page to include several additional fields.

This pays down some technical debt by refactoring into a shared helper.
 2014-12-05 11:13:59 -08:00
John Jarvis
c711ed5091 moving the convert_tokens function to a common file 2014-12-05 14:00:25 -05:00
Will Daly
1c6d197bd0 Merge pull request #6156 from edx/will/revert-logistration-enablement 
Revert enable login/registration
 2014-12-05 13:06:44 -05:00
jsa
de6ca4a7a7 avoid errors when forward-migrating course_groups after south conversion 
JIRA: TNL-937
 2014-12-05 12:33:05 -05:00
Don Mitchell
3e1e4a4b25 Merge pull request #6123 from mitocw/bdero/move-course-role-check-to-student 
Moved has_course_access from CMS to student.auth (common)
 2014-12-05 11:35:16 -05:00
Will Daly
8580620b52 Revert "If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page." 
This reverts commit f40447b3c8.

Conflicts:
	lms/urls.py

Revert "Add support for external auth on the combined login/registration page"

This reverts commit 988753395f.

Conflicts:
	lms/templates/courseware/mktg_course_about.html
	lms/urls.py
 2014-12-05 10:41:42 -05:00
Andy Armstrong
eced849db0 Add group_access field to all xblocks 
TNL-670
 2014-12-05 09:55:00 -05:00
jsa
f24f01d217 Add support for user partitioning based on cohort. 
JIRA: TNL-710

IMPORTANT: this commit converts the course_groups
package to using migrations.  When deploying to an
existing openedx instance, migration 0001 may fail
with an error indicating that the CourseUserGroup
table already exists.  If this happens, running
the 0001 migration first, with the --fake option,
is recommended.  After performing this step,
remaining migrations should work as expected.
 2014-12-05 09:53:44 -05:00
Andy Armstrong
356b2335e9 Add base support for cohorted group configurations 
TNL-649
 2014-12-05 09:52:26 -05:00
Carson Gee
189284ace6 Pin django-cas to hash 
Move to github.txt and make editable
 2014-12-05 09:25:12 -05:00
Sarina Canelake
699b3d08f0 Merge pull request #6065 from stvstnfrd/debt/xml-cleanup 
Remove antiquated cleanup script
 2014-12-05 09:24:37 -05:00
Chris
c45e34bf2e Merge pull request #5842 from Stanford-Online/giulio/prerequisites-style-fixes 
Remove extra prerequisites style and class
 2014-12-05 09:03:14 -05:00
Ben Patterson
f73d92bff3 Merge pull request #6064 from Stanford-Online/kluo/quality-compare-branch-option 
Add compare-branch option to paver run_quality
 2014-12-05 07:30:16 -05:00
Waqas Khalid
1efa1b3169 Don't allow voting while the thread is closed 
When someone closes thread there is still option
to add vote which cause error when click on add
vote button. User shouldn't be able to add vote
while the thread is closed.

TNL-152
 2014-12-05 15:59:07 +05:00
Waheed Ahmed
281be28fc3 Merge pull request #6143 from edx/waheed/tnl890-fix-plus-sign-overall-grade-range 
Fixed plus sign icon for overall grade range add button.
 2014-12-05 13:48:14 +05:00
Waheed Ahmed
2bea9b4b65 Fixed plus sign icon for overall grade range add button. 
TNL-890
 2014-12-05 12:16:11 +05:00
Renzo Lucioni
b97400eb07 Merge pull request #6137 from edx/renzo/missing-checkbox-absent-preference 
Refrain from setting email opt-in preference when checkbox is missing
 2014-12-05 01:11:02 -05:00
Brian Talbot
d4154a4bc8 Merge pull request #6149 from edx/talbs/fix-lms-calculator-toggle 
FIX - LMS: Calculator Toggle Label Display
 2014-12-04 19:47:44 -05:00
Kevin Luo
2262906e0b Add compare-branch option to paver run_quality 2014-12-04 15:13:04 -08:00