Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
37,678 Commits 1 Branch 0 Tags
628ec509ccabd98fe0ddea45b495c627bcde8027
Commit Graph

1794 Commits

Author SHA1 Message Date
Jillian Vogel
e19fb06e9d Merge pull request #12582 from open-craft/feature/discussion_xblock 
Convert Discussion Module to XBlock
 2016-06-29 20:49:35 +12:00
E. Kolpakov
33b3dfcc92 Converts Discussion XModule to Discussion XBlock 
* Renames discussion_module to discussion_xblock
* Moves common/lib/xmodule/xmodule_discussion to openedx/core/lib/xblock_builtin/xblock_discussion
 2016-06-29 06:47:04 +12:00
Kevin Kim
d0be769f1d Merge pull request #12667 from edx/kkim/tz_pref_AS 
Time Zone in Account Settings
 2016-06-28 13:10:10 -04:00
Kevin Kim
059985b9ec Added time zone field to user account settings, currently hidden behind a feature flag. 2016-06-28 14:33:56 +00:00
Muddasser
acef4fa29a Merge pull request #12819 from edx/muddasser/acceptance/setup.py 
Changed setup.py to ensure page objects have all the files needed whe…
 2016-06-28 17:39:41 +05:00
Ben Patterson
e7527fcabb Merge pull request #12854 from eduNEXT/jfavellar/TR-1194-fixtures 
Replacing relative imports by absolute imports for all files into com…
 2016-06-27 16:37:11 -04:00
raeeschachar
469dac6f90 Merge pull request #12830 from edx/raees/bokchoy-test-default-sort-preference 
Fixed test default sort preference failing on chrome
 2016-06-24 03:09:05 +05:00
Jhony Avella
7ec552f409 Replacing relative imports by absolute imports for all files into common/test/acceptance/fixtures directory 2016-06-23 16:33:15 -05:00
Eric Fischer
d3128f4d36 Masquerading staff override hidden special exams [TNL-4808] (#12806) 
Allows staff using "view as specific student" mode to bypass edx-proctoring
hiding special exams from students, to allow for more useful debugging.

Includes "shim" pattern library implementation of alerts, and a bokchoy
test for this functionality.
 2016-06-23 16:54:57 -04:00
raeeschachar
c07cb1905c Fixed test default sort preference failing on chrome 2016-06-24 01:46:14 +05:00
Toby Lawrence
bb29ad5f30 Revert "Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths."" 
This reverts commit 9967b6fd58.
 2016-06-23 13:27:15 -04:00
Kevin Falcone
2c41d79c6d Merge pull request #12827 from edx/release 
Release -> Master after revert
 2016-06-22 15:37:27 -04:00
Kevin Falcone
9967b6fd58 Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths." 
We're seeing errors in NR from objects read out of the cache lacking the
'StaticContent' object has no attribute 'content_digest'
File "/edx/app/edxapp/edx-platform/common/djangoapps/contentserver/middleware.py",
    line 70, in process_request

This reverts commit 849ebc5f22.
 2016-06-22 12:11:35 -04:00
Sofiya Semenova
1d09f78742 Merge pull request #12756 from edx/ssemenova/flakeytest 
Fix flakey TextbooksTest
 2016-06-22 11:36:25 -04:00
ssemenova
9545c90a58 fixed flakiness 
TNL-4806
 2016-06-22 10:28:29 -04:00
Muddasser
ce665e3b4c Conversion of cms/component.feature into bokchoy tests 2016-06-22 11:20:48 +00:00
Muddasser
591d86a912 Changed setup.py to ensure page objects have all the files needed when installed 2016-06-22 08:57:11 +00:00
Brian Jacobel
b6cf9d231f Disallow reporting and upvoting of your own posts in discussion forums 2016-06-15 12:01:23 -04:00
Toby Lawrence
9abce102ff Merge pull request #12573 from edx/PERF-325 
[PERF-325] Add versioned course asset URLs when canonicalizing asset paths.
 2016-06-15 09:05:13 -04:00
Toby Lawrence
849ebc5f22 [PERF-325] Add versioned course asset URLs when canonicalizing asset paths. 2016-06-15 08:04:52 -04:00
Awais Jibran
8d40dcd0f4 Fix remove user from cert-exception list 
ECOM-4650
 2016-06-13 18:50:16 +05:00
Sofiya Semenova
0431bacbe1 Merge pull request #12656 from edx/ssemenova/tabindex 
Removing instances of positive integer tab index values
 2016-06-13 09:23:48 -04:00
ssemenova
e7e1f647aa replace positive tab index values in the platform 
TNL-4705
 2016-06-10 15:35:51 -04:00
Chris Rodriguez
257903fe15 AC-414 adding headings as first child to sections 2016-06-10 12:30:03 -04:00
Waheed Ahmed
817a1585ef Merge pull request #12543 from edx/waheed/ecom-2361-complete-order-history-for-students 
Complete Order History tab for students on account settings page
 2016-06-08 22:53:59 +05:00
Eric Fischer
2241ca59b0 remove flaky decorator (#12655) 2016-06-08 13:22:33 -04:00
Waheed Ahmed
b2f21ef4f3 Complete Order History tab for students on account settings page. 
ECOM-2361
 2016-06-08 21:45:07 +05:00
Brian Jacobel
61e64fbfdf Merge pull request #12615 from edx/bjacobel/focus-test-to-bokchoy 
Move the flaky focus unit test removed in #12433 to a bok choy test
 2016-06-07 16:37:33 -04:00
Sofiya Semenova
1cda718f8f Merge pull request #12611 from edx/ssemenova/icon2 
Changing icon tags from i to span 

TNL-4692
 2016-06-07 13:36:57 -04:00
ssemenova
c1f793172f change icon tags from i to span 
TNL-4692
 2016-06-07 10:52:00 -04:00
Brian Jacobel
57b4cb7fb3 Move the flaky focus unit test removed in #12433 to a bok choy test 2016-06-07 10:00:49 -04:00
raeeschachar
5110480dce Fixed test fields on my public profile 2016-06-07 08:52:30 -04:00
Chris Rodriguez
6be4f84aff Using latest version from NPM and ignoring section tests for now 2016-06-06 13:10:51 -04:00
Renzo Lucioni
93ba637e5f Merge pull request #12638 from edx/renzo/fix-failing-a11y 
Fix program details a11y test
 2016-06-03 13:00:13 -04:00
Renzo Lucioni
9c4a3dc9c7 Fix program details a11y test 2016-06-03 11:32:07 -04:00
Calen Pennington
90286cd944 Merge pull request #12581 from edx/zoldak/TNL-4683 
Mark test as flaky  TNL-4683
 2016-06-03 09:16:34 -04:00
Ehtesham Kafeel
fab5ef320b Merge pull request #12584 from edx/ekafeel/topics-pagination-fix 
fixing paging footer in topics tab
 2016-06-03 10:29:20 +05:00
Calen Pennington
80fdc5212c Merge pull request #12580 from edx/zoldak/TNL-4682 
Mark tests as flaky  TNL-4682
 2016-06-02 16:27:08 -04:00
Ehtesham
2d29751d14 fixing paging footer in topics tab 2016-06-03 00:06:57 +05:00
Renzo Lucioni
b16db7e141 Merge pull request #12634 from edx/renzo/skip-failing-a11y 
Disable program details page a11y test
 2016-06-02 14:55:06 -04:00
Renzo Lucioni
87d58e1d3a Disable program details page a11y test 
The tested page is currently disabled. This test will be re-enabled once a11y failures are resolved.
 2016-06-02 13:53:39 -04:00
Andy Armstrong
7e2a174eec Move discussion board to the Pattern Library 
TNL-4622
 2016-06-02 12:48:12 -04:00
Renzo Lucioni
ed798bb945 Merge pull request #12599 from edx/renzo/supplement-program-data 
Supplement program data with course and enrollment data
 2016-06-02 12:04:51 -04:00
Renzo Lucioni
a8150a51d2 Supplement program data with course and enrollment data 
The supplemented data is passed through to the program details page. Part of ECOM-4415.
 2016-06-02 10:57:46 -04:00
AlasdairSwan
a7d036f912 Merge pull request #12613 from edx/release 
Release 1st June 2016
 2016-06-01 15:22:19 -04:00
ssemenova
36c867c42a changed icon html from <i> to <span> 
TNL-4651
 2016-05-31 15:46:23 -04:00
tasawernawaz
feb8ca4467 Revert "ECOM-4334 Update learner dashboard" 
This reverts commit caa5a0ac02.
 2016-05-31 14:36:19 +00:00
cahrens
292cd93131 Focus seems to be flaky when running tests. 
TNL-4561
 2016-05-28 22:03:35 -04:00
Jesse Zoldak
06351ebd14 Mark test as flaky TNL-4683 2016-05-27 15:44:01 -04:00
Jesse Zoldak
86408e795c Mark tests as flaky TNL-4682 2016-05-27 15:33:51 -04:00