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

623 Commits

Author SHA1 Message Date
Don Mitchell
de5e88561f Make XmlModuleStore handle asides 
PLAT-221
 2014-12-17 13:51:10 -05:00
Waqas Khalid
c7fde04433 Merge pull request #6067 from mlkwaqas/waqas/tnl107-changing-pages-not-reposition 
In user profile changing page should reposition window to top
 2014-12-17 19:58:28 +05:00
Waqas Khalid
0eab14a334 In user profile changing page should reposition window to top 
When we change the page using pagination in the user
profile page the data gets updated but the position
of the window remains at pagination. It should change
position of window to top.

TNL-107
 2014-12-17 17:22:10 +05:00
John Eskew
94ea35d3be Export modulestore-stored asset metadata as XML to exported course. 
Import asset metadata XML into modulestore.
Optimize importing many items of asset metadata by avoiding multiple
round-trips to MongoDB.
 2014-12-16 15:42:38 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides 
[PLAT-217]
 2014-12-13 08:26:28 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
Andy Armstrong
0836a89636 Merge pull request #6189 from edx/andya/fix-masquerade 
Fix Mako templates to always use updated request context
 2014-12-10 11:39:29 -05:00
Christina Roberts
77f5d90d6a Merge pull request #5961 from edx/dan-f/cohort-csv-upload 
Upload CSV file for cohorting students
 2014-12-10 11:04:14 -05:00
Daniel Friedman
3d91f43030 Support cohorting students via a CSV File. 
TNL-735
 2014-12-10 09:23:04 -05:00
Andy Armstrong
4d75c18098 Fix Mako templates to use latest request context 
Fixed the edX middleware to lazily create request
context for Mako templates, so that it is based on
any changes made to the request object.

Verified that with this fix the "Instructor" tab is
correctly hidden when a staff member is viewing
the course as a student.
 2014-12-09 23:38:31 -05:00
Sarina Canelake
7779f742c9 Rename pl-faculty.png to placeholder-faculty.png 
OPEN-328
 2014-12-09 22:28:09 -05:00
Andy Armstrong
2b0f959bd7 Merge pull request #5942 from edx/cohorted-courseware 
Cohorted courseware
 2014-12-08 14:38:30 -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
chrisndodge
f7f9bec6ea Merge pull request #5774 from edx/cdodge/shopping-cart-touchups 
Cdodge/shopping cart touchups
 2014-12-04 14:02:19 -05:00
Will Daly
988753395f Add support for external auth on the combined login/registration page 
Add support for redirect URLs in third party auth for combined login/registration page

Remove old login/registration acceptance tests

Add deprecation warnings to old login and register views

Move third party auth util to student_account

Add exception for microsites
 2014-12-04 09:34:51 -05:00
Muhammad Shoaib
cd30164b5f Improvements and bug fixes for shopping cart: WL-117, WL-114, WL-116, WL-115, WK-122 2014-12-04 01:11:49 -05:00
Sarina Canelake
7aab4151bb s/pylint: disable=W0201/pylint: disable=attribute-defined-outside-init/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
c54a71feb5 s/pylint:disable/pylint: disable/ (formatting fix) 2014-12-01 11:22:11 -05:00
Sarina Canelake
c0556a7ef8 s/pylint: disable=W0613/pylint: disable=unused-argument/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
b8c16d5ed7 s/pylint: disable=E1120/pylint: disable=no-value-for-parameter/ 2014-12-01 11:22:09 -05:00
stv
f1cd35ac0b Fix PEP8: E301 expected 1 blank line, found 0 2014-11-26 12:47:16 -05:00
Sarina Canelake
a883a9cdda Merge pull request #5925 from stvstnfrd/pep8/continuation 
Fix continuation-related PEP8 issues
 2014-11-25 09:03:40 -05:00
stv
b215d771b7 Fix PEP8: E128 continuation line under-indented 
for visual indent
 2014-11-24 20:46:50 -05:00
stv
5a69feadeb Fix PEP8: E123 closing bracket does not match 
indentation of opening bracket's line
 2014-11-24 20:46:44 -05:00
stv
dff5772cda Fix PEP8: E121 continuation line indentation 
is not a multiple of four
 2014-11-24 20:44:43 -05:00
chrisndodge
4a3700c151 Merge pull request #5969 from edx/muhhshoaib/WL-124-front-end-tests-for-auto-enrollment 
muhhshoaib/wl 124 add front end tests for autoenrollment
 2014-11-19 10:14:22 -05:00
Muhammad Shoaib
97b45cc2a7 WL-124 added the jasmine tests for the autoenrollment csv 
Added bokchoy tests and assets (csv files) for CSV auto reg and enrollment.
Set the env flag "ALLOW_AUTOMATED_SIGNUPS": true in bok_choy.env.json

Resolved quality issues.

resolved cherry pick conflicts

Improved bokchoy tests as per code review suggestions.

added the BDD in the docstrings for all the test scenarios

changed the bok choy test string

Improved bokchoy tests as per further code review suggestions.

Made a MembershipPageAutoEnrollSection a separate PageObject.
 2014-11-18 18:35:31 +05:00
Renzo Lucioni
96dcdb436d Selenium tests of logistration password reset 2014-11-14 22:39:50 -05:00
Will Daly
ffee7517f0 Add Selenium tests for the combined login/registration form. 2014-11-14 13:57:26 -05:00
stv
b388ab9db0 Fix PEP8: E226 missing whitespace around arithmetic operator 2014-11-10 19:30:18 -08:00
stv
fb9f324f2f Fix PEP8: E303 too many blank lines 2014-11-10 11:00:14 -08:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
cahrens
08ce09bde7 Display validation messages for any xblock on the container page. 
TNL-683
 2014-11-06 15:48:55 -05:00
Muhammad Ammar
e8e7e78e09 Merge pull request #5655 from edx/ammar/unit-improvements 
Unit Test Improvements
 2014-11-05 19:55:39 +05:00
Sarina Canelake
bc20ccb332 Merge pull request #5828 from edx/sarina/moar-pep8 
Remove more pep8 violations
 2014-11-04 08:58:17 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
zubair-arbi
dd71ca0f8a fix click event for actual target 
TNL-138
 2014-11-03 09:37:02 -05:00
muhammad-ammar
fcaa783e43 Unit Test Improvements 
TE-489
 2014-10-31 11:55:13 +00:00
Jesse Zoldak
7ca78d6e43 Merge pull request #5724 from edx/zoldak/improve-rerun-test 
Improve rerun test
 2014-10-30 16:27:29 -04:00
Jesse Zoldak
74b65ddb1e Improve rerun test 
for troubleshooting TNL-692
 2014-10-24 16:12:11 -04:00
Jesse Zoldak
af3d911a7f Fix test page definition for course group configurations page 
TNL-685
 2014-10-24 14:30:31 -04:00
polesye
83fbdc2ac4 TNL-481: Add RequireJS Optimizer. 2014-10-20 17:33:21 +03:00
cahrens
d3012af733 Do not save an xblock after rendering the Studio view. 
TNL-399

Content and settings are no longer saved when Studio view is rendered.
 2014-10-17 09:29:32 -04:00
Calen Pennington
e00b666db9 Merge pull request #5590 from cpennington/xblocks-with-children 
Enable pure XBlocks to use children in edx-platform
 2014-10-16 10:23:35 -04:00
Calen Pennington
47a3172bf1 Enable parent/child tests using the acid XBlock. 
Also fix those tests to correctly wait until the ajax portions have
finished before evaluating the page contents.
 2014-10-16 09:08:54 -04:00
Daniel Friedman
e9292fb5a5 Add coverage for cohort view's showSection link 
TNL-550
 2014-10-14 14:31:43 -04:00
Andy Armstrong
03b41032ae Merge pull request #5501 from edx/andya/disable-cohorts-ui-bug 
Don't show cohort information when disabled
 2014-10-09 12:55:07 -04:00