Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

2257 Commits

Author SHA1 Message Date
Gabe Mulley
411df0ae3a Merge pull request #7802 from edx/gabe/user-track 
Make user_track use eventtracking
 2015-05-07 08:43:21 -04:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
Muzaffar yousaf
0ca9f9667a Merge pull request #7810 from edx/muzaffar/tnl1261-studio-prview 
Enable unit preview by default.
 2015-05-06 21:06:49 +05:00
Ben Patterson
259092696e Merge pull request #7931 from edx/benp/chrome-add-user-to-team 
Bok-choy on chrome: fix sequence for adding user to team.
 2015-05-06 11:58:08 -04:00
Ben Patterson
02800dcd12 Bok-choy on chrome: fix sequence for adding user to team. 
TE-849

This passes fine in firefox; however in chrome, the click is occurring before
the page is ready; and then the click itself is not specific enough. Also
refactored the add button method so it more-clearly returns the expected
end-state.
 2015-05-06 11:56:48 -04:00
Ben Patterson
c049684dfd Merge pull request #7939 from edx/benp/tnl-1619-flaky 
Mark test as flaky. TNL-1619
 2015-05-06 10:27:34 -04:00
Ben Patterson
0a9ef9c422 Merge pull request #7935 from edx/benp/chromefix-csv-upload-wait 
On faster browsers, we need to wait for the toggle option to appear.
 2015-05-06 10:10:18 -04:00
muzaffaryousaf
f5de0bbf43 Enable unit preview by default. 
TNL-1261
 2015-05-06 12:40:44 +05:00
Ben Patterson
eacf25673a Mark test as flaky. TNL-1619 2015-05-05 19:37:55 -04:00
Ben Patterson
314accdf4d On faster browsers, we need to wait for the toggle option to appear. 
TE-849
 2015-05-05 17:25:20 -04:00
Ben Patterson
0cd749f6fc Merge pull request #7920 from edx/benp/fix-cohort-wait-chrome 
Add wait for upload form.
 2015-05-05 15:21:46 -04:00
Christina Roberts
7c7b0dd7c2 Merge pull request #7915 from edx/christina/flaky-search 
Label flaky test test_reindex.
 2015-05-05 12:46:18 -04:00
Ben Patterson
7d9ac7da80 Merge pull request #7917 from edx/benp/pdf-tabs-skip 
Setting this test to skip. TNL-2083.
 2015-05-05 10:53:16 -04:00
Ned Batchelder
4cba033bbc Merge pull request #7854 from edx/ned/te-855 
Run pylint on all our code, and only our code. TE-855
 2015-05-05 10:37:48 -04:00
Ben Patterson
6a0787de61 Add wait for upload form. 
This is necessary for automation using chrome. TE-849
 2015-05-05 09:04:39 -04:00
E. Kolpakov
fab123829d Added flaky decorator to potentally flaky test test_cohort_course_wide_discussion_topic 2015-05-05 12:52:24 +03:00
Christina Roberts
31a19c0f63 Merge pull request #7823 from edx/christina/notes-tagging 
Add tags plugin.
 2015-05-04 20:56:52 -04:00
Ben Patterson
8d81398e92 Setting this test to skip. TNL-2083. 2015-05-04 20:34:59 -04:00
cahrens
353caea766 Label flaky test test_reindex. 
SOL-835
 2015-05-04 17:03:39 -04:00
cahrens
64047478d3 edxnotes is now enabled in bok choy configuration 2015-05-04 16:00:23 -04:00
cahrens
5fe384ca2b Add tags plugin. 
TNL-1924
 2015-05-04 16:00:18 -04:00
Ned Batchelder
24e0c2c80f Run pylint on all our code, and only our code. TE-855 
With the old logic, we weren't running pylint on openedx at all.  We
were also running it on lms/lib/comment_client twice, and on the
installed xblock third-party library.
 2015-05-04 15:23:55 -04:00
Ben Patterson
fad6ad77df Merge pull request #7899 from edx/benp/annotation-flaky 
Flag test as flaky.
 2015-05-04 09:38:09 -04:00
Ben Patterson
0847f8c24e Flag test as flaky. 2015-05-04 07:00:57 -04:00
Awais Jibran
e9f26a99a8 Merge pull request #7829 from edx/aj/tnl1530-discussion-section-jump-to-bottom 
Switching between discussion threads take focus to bottom of the page.
 2015-05-04 12:03:51 +05:00
Ben Patterson
8cd5f42ca9 Merge pull request #7850 from edx/benp/bok-choy-shard-5 
Add bok-choy shards 4 and 5. New default is 'shard 6'
 2015-05-01 09:26:32 -04:00
Ben Patterson
5f0cd587fd Add bok-choy shards 4 and 5. When no shard is specified on a test, it 
will fall in 'shard 6'
 2015-04-30 17:34:24 -04:00
Adam
af3519ce15 Merge pull request #7835 from edx/release 
Release (DO NOT MERGE)
 2015-04-30 16:24:47 -04:00
Awais Jibran
6e6aa036e7 Switching between discussion threads take focus to bottom of the page. 
TNL-1530
 2015-04-29 20:28:52 +05:00
Ben Patterson
1bed97e952 Merge pull request #7821 from edx/benp/flaky-TNL-2083 
Flag test as flaky. TNL-2083.
 2015-04-28 09:34:51 -04:00
Jim Abramson
70d837ab62 Merge pull request #7777 from edx/jsa/baskets 
use commerce api v2.
 2015-04-27 22:30:37 -04:00
jsa
efde11d552 Use ecommerce api v2. 
XCOM-213 XCOM-214
 2015-04-27 16:57:17 -04:00
Ben Patterson
c2fd2739b8 Flag test as flaky. TNL-2083. 2015-04-27 16:55:01 -04:00
Andy Armstrong
001da52af6 Address Sylvia's doc feedback 2015-04-27 16:13:25 -04:00
Ben Patterson
4a4c3c56de Merge pull request #7806 from edx/benp/skip-test-TNL-2035 
Skip unreliable test. TNL-2035
 2015-04-27 11:33:54 -04:00
Martyn James
1eeca4d81f Merge pull request #7522 from edx/feature/dashboard-search 
Feature/dashboard search
 2015-04-27 09:46:35 -04:00
Ben Patterson
9b7972bfbd Skip unreliable test. TNL-2035 2015-04-26 15:55:10 -04:00
Davorin Sego
71feb068e3 Dashboard search feature 2015-04-24 09:45:12 -04:00
Waqas Khalid
97e6091bd7 Tab number in url doesn't take to correct tab 
When there is multiple units in a particular subsection
then there will be tabs in courseware. When url have
tab number at the end of the url the code was not
considering it and showing the wrong tab. I have changed
such that it will always check the value of position.

TNL-1844
 2015-04-24 17:50:32 +05:00
Awais Jibran
0b66dc4b42 Merge pull request #7718 from edx/aj/tnl1921-forgot-password-model-not-showing 
Forgot password model not visible when user clicks 'Forgot Password' link on CMS.
 2015-04-23 16:53:06 +05:00
David Baumgold
60795564c2 Merge pull request #7764 from edx/parse-time-as-standalone-function 
_parse_time_str can be a standalone function
 2015-04-22 10:05:01 -04:00
Awais Jibran
8bd09d4057 Forgot password model not visible when user clicks 'Forgot Password' link on CMS. 
TNL-1921
 2015-04-22 18:06:36 +05:00
David Baumgold
220a86efa9 Merge pull request #7705 from edx/adjust-test_only_expected_fields_are_displayed 
Simplify test_only_expected_fields_are_displayed
 2015-04-22 09:01:55 -04:00
David Baumgold
764d5e6e89 _parse_time_str can be a standalone function 2015-04-21 13:38:37 -04:00
Will Daly
4df2bd3329 Merge pull request #7756 from edx/will/ecom-1408-take-two 
Expose course start/end date in the enrollment API
 2015-04-21 10:50:33 -04:00
Will Daly
e065a9c947 Mark test_split_test_LMS_staff_view as flaky 2015-04-21 09:38:53 -04:00
Muhammad Ammar
7babb3efed Merge pull request #7696 from edx/ammar/tnl1740-add-simplified-and-traditional-chinese-transcript-language-options 
Add Simplified and Traditional Chinese as Transcript language options
 2015-04-21 18:28:17 +05:00
muhammad-ammar
cfcb38c498 Update user message strings 2015-04-17 17:23:19 -04:00
Andy Armstrong
17392ef3bf Code review feedback and test cleanup. 2015-04-17 17:23:19 -04:00
Andy Armstrong
7742735fb0 Event on user preference updates 
TNL-1851
 2015-04-17 17:23:19 -04:00