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

644 Commits

Author SHA1 Message Date
Braden MacDonald
5f5b41d03f Remove state summary from the unit author page until SOL-192 2015-01-12 13:37:58 +03:00
Braden MacDonald
76b6d33b80 Refresh children automatically when library setting is changed 2015-01-12 13:37:57 +03:00
Braden MacDonald
e498872ab1 Move update link to the validation area 2015-01-12 13:37:57 +03:00
E. Kolpakov
d25673ec72 LibraryContent bok choy acceptance tests 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
074e4cfa22 Addressed further review notes for Library Pagination 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
ed3b972078 Added tests for Library pagination. 2015-01-12 13:37:55 +03:00
Jonathan Piacenti
058176144e Removed the ability to add Discussion and advanced components to Content Libraries. 2015-01-12 13:37:55 +03:00
Braden MacDonald
3e0f08ebc2 Studio support for creating and editing libraries (PR 6046) 
SOL-1, SOL-2, SOL-3
 2015-01-12 13:37:50 +03:00
Jesse Zoldak
ff4f0787ec Merge pull request #6522 from edx/zoldak/video-troubleshooting 
Add debug logging to video tests
 2015-01-09 16:21:07 -05:00
Sarina Canelake
76660e3ace Merge pull request #6484 from edx/sarina/move-branded-lms-assets 
Remove edX branding from default Open edX LMS [OPEN-307]
 2015-01-09 11:59:39 -05:00
David Baumgold
d25a28375e Remove i18n 
Since this is a test file
 2015-01-09 11:04:08 -05:00
Sarina Canelake
6f5134f711 Move edx branding into edx-theme directory 
OPEN-307
 2015-01-09 10:48:20 -05:00
David Baumgold
b297b839da Improve i18n for static_templates 2015-01-09 09:42:34 -05:00
Jesse Zoldak
e77acdf401 Add debug logging to video tests 2015-01-09 09:39:02 -05:00
Waqas Khalid
ed812f1ca8 Merge pull request #6476 from mlkwaqas/waqas/fix-discussion-flaky-test 
Test pagination reposition test is failing
 2015-01-07 19:53:42 +05:00
Waqas Khalid
e39be585ab Test pagination reposition test is failing 
Test pagination reposition test is failing on release
and master. It was flaky test and this problem was
caused by the javascript animation. Issue was fixed by
adding the promise that we check the value of window
top after the animation is completed.
 2015-01-07 19:02:53 +05:00
Chris
c5d2dd7536 Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0 
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
 2015-01-06 15:24:12 -05:00
AlasdairSwan
0be8ab3aab Merge pull request #6406 from edx/alasdair/logistration-2.0 
ECOM-783 updated logistration in light of redesign
 2015-01-05 12:48:32 -05:00
AlasdairSwan
a434207076 ECOM-783 updated logistration in light of redesign 2015-01-05 11:09:37 -05:00
Waqas Khalid
e7be2f7311 Discussion thread response show dual vote count 
When the responses of the thread is loaded it shows
dual vote count one with simple text and one with
button whereas only text should be shown when thread
is closed and only button when thread is open.

TNL-1016
 2015-01-05 20:55:32 +05:00
Braden MacDonald
877e231c7a Fix two tests failing on January 1, 2015 2015-01-02 12:25:26 -08:00
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