Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,219 Commits 1 Branch 0 Tags
2f5193cf186cd4f7a336d2d89decd13b910ca8e0
Commit Graph

11702 Commits

Author SHA1 Message Date
Ahsan Ulhaq
a495847b45 Merge pull request #9373 from edx/ahsan/ECOM-2114-Add-USD-to-prices-on-track-selection-pages 
Add USD labels to prices on track selection pages
 2015-08-20 00:37:27 +05:00
Ned Batchelder
0fed2f5987 Merge pull request #9364 from edx/ned/django-1-4-22 
Upgrade Django to 1.4.22
 2015-08-19 15:06:16 -04:00
Ahsan Ulhaq
3d62580fc2 Add USD labels to prices on track selection pages 
ECOM-2114
 2015-08-19 23:59:15 +05:00
Sarina Canelake
25a117613d Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit" 
This reverts commit cea274dc52, reversing
changes made to 02cf9caca6.
 2015-08-19 11:07:14 -04:00
Ned Batchelder
9f92054ca7 Fix tests to work with Django 1.4.22 
The 1.4.22 security fix makes it so that empty sessions are not written.
To keep the tests working, we now log in the user, so that some data is
saved to the session.
 2015-08-19 11:05:41 -04:00
Brian Beggs
9e31193100 Merge pull request #9295 from edx/bbeggs/ensure-indexes-PLAT-785 
Adding django admin command to create mongodb indexes
 2015-08-19 10:17:42 -04:00
Tasawer
cefe0daa74 Updating validation error message on signup page. 
ECOM-1956
 2015-08-19 12:50:12 +05:00
Clinton Blackburn
8e35fc677e Merge pull request #9328 from edx/clintonb/compressed-text-field-fix 
Resolved decompression errors during tests
 2015-08-18 13:58:07 -04:00
Clinton Blackburn
207ce4eda5 Resolved decompression errors during tests 
Note that this change will require deleting all CourseStructure data. This data should be regenerated using the generate_course_structure management command.

XCOM-513
 2015-08-18 10:25:09 -04:00
Eric Fischer
ab3b2ebd9a Fixing problematic bok_choy test 
By moving the team_page.first_member_username access to occur before
click_first_profile_image() is called, we avoid a potential issue
where the wrapper() method defined in page_object.py, which
decorates the property, calls into _verify_page() and raises a
WrongPageError.
 2015-08-18 09:16:26 -04:00
Brian Beggs
c71d61e533 Adding django command to create mongodb indexes 2015-08-17 17:05:27 -04:00
Renzo Lucioni
8b704cc2ec Merge pull request #9351 from edx/release 
Release
 2015-08-17 13:17:55 -04:00
Peter Fogg
c13f296103 HTML-escape uses of course display name. 2015-08-17 12:22:10 -04:00
Waheed Ahmed
f1af5b5c29 Fixed admin course access role required field value not populating. 
TNL-3049
 2015-08-17 19:22:06 +05:00
Jesse Zoldak
e57bf4a5d4 Merge pull request #9326 from edx/zoldak/TNL-3069 
Mark TeamPageTest class as flaky TNL-3069
 2015-08-17 09:29:03 -04:00
Jesse Zoldak
996ce1d62c Mark TeamPageTest class as flaky TNL-3069 2015-08-14 16:07:54 -04:00
cahrens
c929cdb54d Add an additional test case related to re-fetching data. 2015-08-14 14:48:09 -04:00
Andy Armstrong
1265d540ad Merge pull request #9302 from edx/andya/team-refresh-handling 
Implement model refreshing for Teams tab
 2015-08-14 11:50:54 -04:00
cahrens
c84abfab40 Bok choy tests for dynamic updating after team changes. 2015-08-14 11:12:11 -04:00
Andy Armstrong
a24e3cb0fc Implement model refreshing for Teams tab 
TNL-2976
 2015-08-14 11:12:11 -04:00
Adam
460b3311b2 Merge pull request #9273 from edx/adam/add-lti-logging 
add more lti logging around oauth (TNL-2980)
 2015-08-14 08:53:21 -04:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration 
Integration of Proctoring into the LMS
 2015-08-14 07:18:14 -04:00
frances botsford
8da4fcbbcb Merge pull request #9309 from edx/frances/teams-style-fixes 
Teams cards list spacing
 2015-08-13 23:01:32 -04:00
Christina Roberts
4fc2ae7ca8 Merge pull request #9312 from edx/diana/remove-invite-link 
Remove invite link functionality from teams.
 2015-08-13 20:02:53 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Diana Huang
afa587cc38 Remove invite link functionality from teams. 
TNL-3062
 2015-08-13 17:53:26 -04:00
Andy Armstrong
01065b6ae5 Merge pull request #9217 from edx/andya/land-teams 
Enable teams and deprecate the advanced setting
 2015-08-13 17:47:15 -04:00
Frances Botsford
70a14ffe91 remove list margin and padding on cards lists 2015-08-13 16:44:31 -04:00
Diana Huang
2ac1590df4 Merge pull request #9276 from edx/diana/update-status-message 
Make status use ConfigurationModel instead.
 2015-08-13 16:37:23 -04:00
Usman Khalid
f785ae465f Merge pull request #9228 from edx/muzaffar/tnl1906-team-profile 
Team profile page sidebar.
 2015-08-13 22:07:01 +05:00
muhammad-ammar
5fc612079b Support leaving a team 
TNL-1910
 2015-08-13 20:27:38 +05:00
Matt Drayer
f8f23240da Merge pull request #8996 from edx/ziafazal/SOL-1044 
ziafazal/SOL-1044: Custom Web Certificates
 2015-08-13 10:05:40 -04:00
Zia Fazal
2467d6971f ziafazal/SOL-1044: Database-Driven Certificate Templates 
* added certificate template model
* added certificate template asset model
* added django admin configs and migration
* initial LMS template matching logic
* improved LMS template matching
* improved LMS template matching and rendering logic
* address Django admin form/model load order incongruence
* add missing unique constraint migration.
 2015-08-13 08:01:34 -04:00
muhammad-ammar
853f97afbc support joining a team 
TNL-1909
 2015-08-13 14:41:21 +05:00
muzaffaryousaf
a56e6bf743 Team details page. 
TNL-1906
 2015-08-13 14:20:07 +05:00
Peter Fogg
26bbbb967e Fix various team accessibility issues. 
Authors:
  - Peter Fogg
  - Daniel Friedman

TNL-1953
 2015-08-13 00:34:54 -04:00
Andy Armstrong
8bbf7c57ac Improve Teams tab navigation 2015-08-12 19:20:48 -04:00
Peter Fogg
eafb07552a Merge pull request #9287 from edx/release 
Release
 2015-08-12 13:06:39 -04:00
Diana Huang
66e9819c0f Make status use ConfigurationModel instead. 2015-08-12 11:46:43 -04:00
Adam Palay
c486eadd87 add more lti logging around oauth (TNL-2980) 2015-08-12 10:10:29 -04:00
Will Daly
ad9d9eb04e Support team UI for regenerating certificates 
* Add new role for support staff.
* Move dashboard/support functionality into a new Django app called "support".
* Add support view for searching and regenerating certificates.
* Refactor certificates views into separate files.
 2015-08-12 07:09:46 -07:00
Diana Huang
82eb1f6b74 Make status use ConfigurationModel instead. 2015-08-11 17:51:39 -04:00
Waheed Ahmed
aff849281d Revert "Test library failed to export after import" 
This reverts commit 4c1c4619f0.
 2015-08-12 02:06:09 +05:00
clrux
98bd1d39ef Merge pull request #9152 from edx/clrux/ux-2233-video-bumper 
Updating the video bumper play button
 2015-08-11 13:45:52 -04:00
Brandon DeRosier
34526ddf6a Revert "Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment"" 
This reverts commit 42e78463a7.
 2015-08-11 13:03:58 -04:00
Chris Rodriguez
f958272149 Updating video bumper play button 2015-08-11 12:51:18 -04:00
Peter Fogg
344ff8c1bc Merge pull request #9267 from edx/release 
2015-08-11 release
 2015-08-11 12:07:21 -04:00
Usman Khalid
1de9fc6461 Merge pull request #9200 from edx/usman/tnl1911-my-teams 
My teams tab.
 2015-08-11 19:22:50 +05:00
Usman Khalid
b4ed9a28b0 My Teams tab. 
TNL-1911
 2015-08-11 17:27:53 +05:00
Waheed Ahmed
5e2c2b1e93 Fixed course_id pattern regex. 
PLAT-776
 2015-08-11 13:36:07 +05:00