Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,247 Commits 1 Branch 0 Tags
7a3975fe3fc82bfc9fad0e391a077e930eacb6fa
Commit Graph

12040 Commits

Author SHA1 Message Date
cahrens
7a3975fe3f Remove skip-- test passed 60 times in Jenkins. 
TNL-1590
 2015-10-09 09:08:31 -04:00
Matt Drayer
994f8bd7b4 Merge pull request #10075 from edx/saleem-latif/SOL-1266 
SOL-1266: Display course numbers in certificate configuration
 2015-10-08 08:30:40 -04:00
Usman Khalid
f6193c872e Merge pull request #10059 from edx/usman/use-included-staticfiles-app 
Upgrade django pipeline to v.1.5.3.
 2015-10-08 16:10:36 +05:00
Saleem Latif
9799d15373 course-number and override course-number added in Certificate Editor View 2015-10-08 11:29:14 +05:00
Eric Fischer
0d2dc431c9 Merge pull request #10066 from edx/efischer/edit_studio_test 
TNL-3305 HTML Editing Bok Choy Test
 2015-10-07 15:01:13 -04:00
Calen Pennington
624bc9a734 Merge pull request #9911 from cpennington/fix-plat-858 
Delete DIRECT_ONLY_CATEGORIES from both draft and published branches by default
 2015-10-07 14:41:40 -04:00
Eric Fischer
2bbea43d06 Adding Bok Choy Test for HTML editing 
TNL-3296 would have been prevented with this test, adding it now to
prevent similar issues in the future. Squashed commit with doc changes,
review feedback, and run-20-times-to-ensure-not-flaky-then-unmark
all included.
 2015-10-07 14:09:03 -04:00
Andy Armstrong
8914aaf8d4 Refactor discussions code to address flaky test 
TNL-3247

Removed remaining synchronous AJAX calls from discussions
Updated the profile view tests to use an attached view for testing
Removed one-time JQuery intiialization that could fail and break multiple tests
 2015-10-07 11:22:48 -04:00
Waheed Ahmed
2dd26a8d60 Fixed split get_courses. 
PLAT-747
 2015-10-07 16:39:53 +05:00
raeeschachar
ee0cd9e873 Merge pull request #10011 from edx/raees-chrome-bok-choy-test-undo-changes 
Fixed 2 bok choy tests failing on chrome
 2015-10-07 12:07:52 +05:00
Afeef Janjua
ee203ed930 Merge pull request #10015 from edx/afeef/bugfix/tnl-3258-fix-confirm-navigation-popup-unmodified-group-configurations 
TNL-3258 Reset group configuration model when a child content group i…
 2015-10-07 11:13:46 +05:00
Calen Pennington
f8f9b91c16 Make unpublish raise the same errors in split and old-mongo when asked to unpublish a DIRECT_ONLY_CATEGORY 2015-10-06 16:54:34 -04:00
Calen Pennington
e65730b9d2 Rationalize all cases around direct-only categories (both as blocks and parents) and delete 2015-10-06 16:54:34 -04:00
raeeschachar
cb02b62b7c Fixed test_undo_changes and test_manaul_change that were failing on Chrome 2015-10-06 23:07:49 +05:00
Usman Khalid
111a45664c Use settings.PIPELINE_ENABLED instead of settings.FEATURES[USE_DJANGO_PIPELINE]. 2015-10-06 19:52:38 +05:00
Usman Khalid
dbcd1bf430 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-06 19:52:38 +05:00
Usman Khalid
130bbd7993 Upgrade to django-pipeline v1.5.3. 
TNL-3137
 2015-10-06 19:52:38 +05:00
Peter Fogg
87e3988c6a Merge pull request #10042 from edx/peter-fogg/flaky-tests 
Mark flaky tests (TNL-3514 and TNL-3515).
 2015-10-05 16:13:30 -04:00
Clinton Blackburn
17f0193362 Merge pull request #10044 from edx/merge-release-into-master 
Merging changes for hotfix/2015-10-05
 2015-10-05 16:11:31 -04:00
Brian Beggs
143ca802ae Merge pull request #10043 from edx/revert-9934-usman/use-included-staticfiles-app 
Revert "Upgrade django-pipeline and staticfiles"
 2015-10-05 15:29:17 -04:00
Bill DeRusha
fe23052511 Merge pull request #9979 from edx/bderusha/boardman-traffic 
Add IP to all python Segment tracking calls
 2015-10-05 14:55:55 -04:00
Peter Fogg
dbeb9beb2d Mark flaky tests (TNL-3514 and TNL-3515). 2015-10-05 14:47:25 -04:00
Clinton Blackburn
f967cfce8b Merged release to master 
Resolved conflicts from hotfix-2015-10-05
 2015-10-05 14:46:32 -04:00
Brian Beggs
0ca679e244 Revert "Upgrade django-pipeline and staticfiles" 2015-10-05 14:40:28 -04:00
Matt Drayer
0a347e1234 Merge pull request #10013 from edx/asadiqbal08/SOL-1262 
SOL-1262 Update Studio Button Copy
 2015-10-05 09:46:57 -04:00
Clinton Blackburn
0dba843608 Multiple credit fixes 
- Added support for Unicode characters when creating the signature
- Using <textarea> for form data to support newline characters
- Generating form with jQuery instead of relying on existing DOM element
- Removed duplicated credit request code
- Corrected spaing on dashboard
- Enabled functionality by default

Dashboard cleanup
-- Cleaned styles
-- Added wrapper class to use for hiding the actions
-- Cleaned JS toggling of error container
-- Corrected dashboard and receipt text

ECOM-2172
 2015-10-05 09:35:10 -04:00
Matt Drayer
86e523e667 Merge pull request #10018 from edx/saleem-latif/MAYN-141 
MAYN-141: WL Favicon not displaying correctly
 2015-10-05 07:52:58 -04:00
asadiqbal
aec1b95945 SOL-1262 2015-10-05 16:28:28 +05:00
Ben Patterson
c8782f1401 Merge pull request #10024 from edx/benp/tnl-3492-flaky-test 
Flag test as flaky. See TNL-3492.
 2015-10-02 14:10:26 -04:00
Ben Patterson
6570552c8e Merge pull request #10020 from edx/benp/TNL3489-flag-flaky-test 
TNL-3489. Flag test as flaky.
 2015-10-02 14:04:53 -04:00
Brian Beggs
5550ca30b1 Merge pull request #9999 from edx/bbeggs/TNL-3452-master 
Fixed select_related fields for course embargos and the mobile user api. TNL-3452
 2015-10-02 13:55:30 -04:00
Usman Khalid
0ce679fc06 Merge pull request #9934 from edx/usman/use-included-staticfiles-app 
Upgrade django-pipeline and staticfiles.
 2015-10-02 22:37:24 +05:00
Ben Patterson
ecdba7301a Flag test as flaky. See TNL-3492. 2015-10-02 13:21:26 -04:00
Alison Hodges
eab5c60752 Merge pull request #9984 from edx/ahodges/enroll_api 
Updates the description provided for a new enrollment report
 2015-10-02 13:10:35 -04:00
David Baumgold
0219e18fa8 Merge pull request #10023 from edx/release 
Release into master
 2015-10-02 12:58:50 -04:00
Afeef Janjua
6cc8c47ca0 TNL-3258 Reset group configuration model when a child content group is deleted (+5 squashed commits) 
Squashed commits:
[450761c] found an alternative way to restore model when any of the nested model is deleted
[1b7eb85] passed the context to the inner functions
[c87dafd] refactored the model access using encapsulation instead of directly accessing it
[5d025ff] return the promise
[d8d1f50] fixup! quality (+1 squashed commit)
Squashed commits:
[daa7f81] reset the configuration when the model is deleted (+1 squashed commit)
Squashed commits:
[c7f41f7] reverted: skip test_can_delete_unused_content_group due to flakiness
 2015-10-02 21:57:32 +05:00
Calen Pennington
ac507c3d22 Upgrade AboutItemSemantics test to verify for all direct-only categories 2015-10-02 12:51:50 -04:00
Calen Pennington
a7c7ceb975 Use super(...) to call delete_item from split_draft.py 2015-10-02 12:51:50 -04:00
Calen Pennington
f19605af1a Use a clearer error message when split is unable to delete an XBlock 2015-10-02 12:51:50 -04:00
Calen Pennington
6da7bff185 Allow test_mixed_modulestore to be run without django setup 2015-10-02 12:51:49 -04:00
Calen Pennington
92eadf1afb Delete DIRECT_ONLY_CATEGORIES from published and draft branches. 
This fixes https://openedx.atlassian.net/browse/PLAT-858.
 2015-10-02 12:51:49 -04:00
Calen Pennington
1f7082ebfe Add a test of the semantics of About items 
These are XBlocks that are detached (not part of the course content hierarchy),
and are also DIRECT_ONLY_CATEGORIES (meaning they are always autopublished).

https://openedx.atlassian.net/browse/PLAT-858 identifies a bug
where an About item isn't correctly deleted in SplitDraft, and this test
reproduces that case.
 2015-10-02 12:51:40 -04:00
Ben Patterson
ed13815b4f TNL-3489. Flag test as flaky. 
See ticket for details.
 2015-10-02 10:57:57 -04:00
Fred Smith
9d13ccdb50 Merge pull request #10016 from edx/bderusha/segment-fix 
Rename SEGMENT_KEY to have a unique key name for both CMS and LMS
 2015-10-02 09:56:23 -04:00
Usman Khalid
2b59d46a31 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-02 18:26:25 +05:00
Usman Khalid
98df2336f3 Upgrade to django-pipeline v.1.5.3. 
TNL-3137
 2015-10-02 18:26:25 +05:00
Saleem Latif
4725f7f579 favicon display bug corrected 2015-10-02 18:15:49 +05:00
Dustin Gadal
dfc0a35799 Fix import error 
See also:
https://github.com/edx/edx-platform/pull/9969

I'm not at a linux box to do a rebase from the command line, so I'm creating a new PR.
 2015-10-01 22:33:39 -04:00
chrisndodge
4b37d788eb Merge pull request #9977 from edx/cdodge/flaky-test 
Mark test_can_add_remove_allowance Bokchoy test as flaky for now
 2015-10-01 22:07:20 -04:00
Bill DeRusha
ca6633bd98 Add IP to all python Segment tracking calls 2015-10-01 21:21:16 -04:00