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

12020 Commits

Author SHA1 Message Date
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
raeeschachar
cb02b62b7c Fixed test_undo_changes and test_manaul_change that were failing on Chrome 2015-10-06 23:07:49 +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
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
Bill DeRusha
bcb71a3255 Rename SEGMENT_KEY to have a unique key name for both CMS and LMS 2015-10-01 19:40:27 -04:00
Alison Hodges
adffb10cbe Updates the description provided for a new enrollment report 
https://github.com/edx/edx-platform/pull/9345
 2015-10-01 16:28:42 -04:00
David Baumgold
69bc10235e Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts 2015-10-01 15:28:55 -04:00
Brian Beggs
b73bf35899 fixed snapshot functionality for RestrictedCrouse embargo, select_related is now passed the proper hint. TNL-3452 2015-10-01 13:50:46 -04:00
Mushtaq Ali
42c02c8036 Merge pull request #9809 from edx/mushtaq/force-publish-command 
'force_publish' command for publishing a course forcefully by making …
 2015-10-01 22:42:54 +05:00
Peter Fogg
c67bcaefc5 Merge pull request #9948 from edx/peter-fogg/fix-team-membership-count 
Fix displaying wrong membership on "My Team" view.
 2015-10-01 12:51:32 -04:00
Peter Fogg
ffe2aef41e Fix displaying wrong membership on "My Team" view. 
The heart of this fix is to change the "My Team" view to use a
collection of teams instead of memberships. The team card is
refactored to only take a team, rather than attempt to be polymorphic
over teams and team memberships. This change enabled removing a good
amount of old code. This also requires adding a `username` parameter
to the teams list endpoint which allows getting a list of all teams
for a single user, in order to allow refreshing the "My Teams" view
correctly. Currently this list is of length at most one.

TNL-3410
 2015-10-01 11:56:15 -04:00
Matt Drayer
635e54918d Merge pull request #9968 from edx/asadiqbal08/SOL-1225 
SOL-1225: Pressing tab button does not takes user to next field
 2015-10-01 10:02:38 -04:00
Mushtaq Ali
11741f118f 'force_publish' command for publishing a course forcefully by making the published branch point to the same structure as the draft branch. add force_publish functionality to split courses. 2015-10-01 15:46:37 +05:00
asadiqbal
b09c20f02f SOL-1225 2015-10-01 15:12:13 +05:00
Syed Hassan Raza
42662426c3 Revert "prevent delete public oprhans" 
This reverts commit 3849a8fa81.
 2015-09-30 13:40:22 -07:00
David Baumgold
aa8ecca536 Remove the edx.org comprehensive theme 
There's a lot of useful things in PR #8271 that provide a framework
for the comprehensive theming system. If we need to remove the edx.org
theme from the codebase, we can leave most of PR #8271 in, to make it
easier to build on top of and get this feature back in.
 2015-09-30 12:18:01 -04:00
David Baumgold
3f6e39054e Merge pull request #9955 from edx/partially-revert-comprehensive-theming 
Remove the edx.org comprehensive theme
 2015-09-30 12:17:22 -04:00
Christine Lytwynec
d3fefa5978 Merge pull request #9866 from edx/clytwynec/update-bokchoy 
Update bok-choy version to v0.4.5
 2015-09-30 11:17:07 -04:00
David Baumgold
116ca29189 Remove the edx.org comprehensive theme 
There's a lot of useful things in PR #8271 that provide a framework
for the comprehensive theming system. If we need to remove the edx.org
theme from the codebase, we can leave most of PR #8271 in, to make it
easier to build on top of and get this feature back in.
 2015-09-30 11:04:28 -04:00
Chris Dodge
ac79909ba5 Mark test_can_add_remove_allowance Bokchoy test as flaky for now 2015-09-30 10:21:50 -04:00
Christine Lytwynec
9387b60746 skip test_can_delete_unused_content_group due to flakiness 2015-09-30 10:12:54 -04:00
Christine Lytwynec
b84f35349a update bok-choy version to v0.4.5 2015-09-30 10:12:54 -04:00
Awais Qureshi
c486f857ca Merge pull request #9881 from edx/awais786/ECOM-1988-upgrade-msg-with-credit-mode 
Hide upgrade message on student dashboard for credit enrollments
 2015-09-30 12:51:38 +05:00