asadiqbal
c1162864aa
SOL-1158
2015-08-31 21:17:40 +05:00
Feanil Patel
035bf4fbf2
Merge pull request #9537 from edx/feanil/upgrade_uglify
...
Upgrade uglify-js to 2.4.24
2015-08-31 11:01:18 -04:00
Clinton Blackburn
4bc9cb4ddd
Merge pull request #9531 from edx/credit-api-csrf-fix
...
Diabled CSRF protection for Credit Course API endpoints
2015-08-31 07:55:10 -07:00
Feanil Patel
354693a794
Upgrade uglify-js to 2.4.24
...
The latest version of uglify-js fixed a vulnerability which allows a specially crafted Javascript file to have altered functionality after minification.
Changelog between the versions we are running can be found in the Readme file from this diff: https://github.com/mishoo/UglifyJS2/compare/v2.4.15...v2.4.24#diff-04c6e90faac2675aa89e2176d2eec7d8
We use the command line without any special arguments so I don't expect any issues.
2015-08-31 09:19:46 -04:00
tasawernawaz
ab2d006329
Merge pull request #9454 from edx/tasawer/bugfix/ecom-1165-fixing-password-reset-test
...
Removing flaky decorator from test
2015-08-31 13:53:23 +05:00
Tasawer
58a2dc2466
Removing flaky decorator from test
...
ECOM-1165
2015-08-31 07:43:17 +00:00
Ned Batchelder
0de0fbb91a
Merge pull request #9519 from edx/ned/sass-import-dot
...
Add current directory to the sass compilation path.
2015-08-29 12:35:53 -04:00
Clinton Blackburn
a1ba77d6b3
Diabled CSRF protection for Credit Course API endpoints
...
CSRF protection needs to be disabled so that requests made using OAuth and other non-session-based authentication mechanisms can be properly processed. If session authentication is used, DRF will enforce CSRF protection.
XCOM-524
2015-08-29 03:02:05 -04:00
Ned Batchelder
3c8dbe774f
Merge pull request #9530 from edx/ned/tweak-release-email
...
Add a sentence to the release email about how to change where the email is sent.
2015-08-28 17:17:07 -04:00
Peter Fogg
9e7c93d931
Merge pull request #9504 from edx/peter-fogg/sort-team-page
...
Allow sorting of teams in a topic
2015-08-28 16:25:57 -04:00
Ned Batchelder
0219d97c88
Add a sentence to the release email about how to change where the email is sent.
2015-08-28 16:22:07 -04:00
Peter Fogg
2c774fd271
Allow sorting of teams in a topic.
...
TNL-1937
2015-08-28 15:46:07 -04:00
David Ormsbee
1e430a76ca
Merge pull request #9495 from edx/ormsbee/faster_tests_course_struct
...
Convert course_structure_api tests to SharedModuleStoreTestCase.
2015-08-28 15:06:16 -04:00
Jesse Zoldak
4876865c37
Merge pull request #9528 from edx/zoldak/TNL-3166
...
Skip flaky JS test TNL-3166
2015-08-28 15:04:01 -04:00
Ned Batchelder
5a3b69ba4b
Add current directory to the sass compilation path.
...
This is the default in 3.2, but will need to be explicitly stated in
Sass 3.4.
Also, added a --force parameter to compile_sass to make it easier to see
what warnings are current.
2015-08-28 14:52:18 -04:00
Jesse Zoldak
d3754af2f4
Skip flaky JS test TNL-3166
2015-08-28 14:51:59 -04:00
Matt Drayer
b37ddc7e1d
Merge pull request #9518 from edx/asadiqbal08/updating_organization_app_hash
...
asadiqbal08/SOL-1127: Update the organization app hash
2015-08-28 14:38:59 -04:00
David Ormsbee
f696c98f82
Merge pull request #9510 from edx/ormsbee/faster_tests_disc_api_serializers
...
Use SharedModuleStoreTestCase in Discussion API serializer tests.
2015-08-28 13:39:15 -04:00
clrux
d57e777dec
Merge pull request #9523 from edx/revert-9367-clrux/ac-76-course-nav
...
Revert "Course navigation menu accessibility issue"
2015-08-28 13:28:47 -04:00
clrux
5b545c2b0d
Revert "Course navigation menu accessibility issue"
2015-08-28 13:28:08 -04:00
clrux
52a8bc50cb
Merge pull request #9367 from edx/clrux/ac-76-course-nav
...
Course navigation menu accessibility issue
2015-08-28 13:27:44 -04:00
chrisndodge
69ddbc0dc4
Merge pull request #9370 from edx/cdodge/add-course-id-to-survey-answers
...
add the ability to persist the course_key where the user answered the…
2015-08-28 13:03:58 -04:00
David Ormsbee
e9378881e8
Use SharedModuleStoreTestCase in Discussion API serializer tests.
2015-08-28 11:43:48 -04:00
Andy Armstrong
a8284058e6
Merge pull request #9517 from edx/andya/disable-flaky-forum-test
...
Disable team discussion Jasmine tests
2015-08-28 11:41:15 -04:00
asadiqbal
132400c831
Update the organization app hash
2015-08-28 20:15:52 +05:00
Ned Batchelder
741f06864a
Merge pull request #9502 from edx/ned/import-path-differently
...
Change imports from path to use the stablest name.
2015-08-28 11:12:10 -04:00
David Ormsbee
1f64506c31
Merge pull request #9507 from edx/ormsbee/faster_tests_comment_client
...
Convert CohortedTestCase to use SharedModuleStoreTestCase.
2015-08-28 10:59:09 -04:00
Andy Armstrong
b74a1b9825
Disable team discussion Jasmine tests
...
This is a temporary solution until we can fix TNL-3007
2015-08-28 10:46:41 -04:00
Matt Drayer
a8cc585021
Merge pull request #9498 from edx/ziafazal/MAYN-86
...
MAYN-86: Use microsite platform_name and email_from_address if available
2015-08-28 10:37:28 -04:00
raeeschachar
39c7e30d4d
Merge pull request #9514 from edx/raees-chrome-bok-choy-test-about-me-field
...
Fixed test_about_me_field failing on chrome bok choy
2015-08-28 19:37:13 +05:00
Bill DeRusha
9eafe4dfe6
Merge pull request #9489 from edx/bderusha/teams-mock-callback
...
Improve teams test run times by skipping signals
2015-08-28 10:09:17 -04:00
Chris Rodriguez
ab569feba5
Removing focus outline from menus
2015-08-28 09:56:40 -04:00
Chris Rodriguez
60e6d80c19
PR feedback for styles
2015-08-28 09:03:31 -04:00
Muzaffar yousaf
f37371e3f0
Merge pull request #9512 from edx/muzaffar/tnl2964-breadcrumbs
...
Adjust create new team page breadcrumbs.
2015-08-28 17:47:21 +05:00
Chris Rodriguez
566c0f57c4
Fixing quality line length
2015-08-28 07:50:34 -04:00
Chris Rodriguez
c20075e8a6
Changing all #accordion for .accordion
2015-08-28 07:50:34 -04:00
Chris Rodriguez
6e6c7568f2
Bokchoy test fixes
2015-08-28 07:50:34 -04:00
Chris Rodriguez
917947d809
Markup and style tweaks to address test reqs
2015-08-28 07:50:34 -04:00
Chris Rodriguez
895867a812
Fixing quality, again
2015-08-28 07:50:33 -04:00
Chris Rodriguez
8de854dfb1
Cleanup for Quality
2015-08-28 07:50:33 -04:00
Chris Rodriguez
f8e23e91b0
test fixes
2015-08-28 07:50:33 -04:00
Chris Rodriguez
c0bfdf5e5d
Removing instances of old mechanism; tests
2015-08-28 07:50:33 -04:00
Chris Rodriguez
c9b775bda2
wip test fixes
2015-08-28 07:50:33 -04:00
Chris Rodriguez
07ca51c3f5
Accordion HTML cleanup, removing old markup
2015-08-28 07:50:33 -04:00
Chris Rodriguez
04ff637016
PR feedback on JS
2015-08-28 07:50:33 -04:00
Chris Rodriguez
1d07b278b5
Test fixes
2015-08-28 07:50:32 -04:00
Chris Rodriguez
a31eb4a815
Jasmine tests
2015-08-28 07:50:32 -04:00
Chris Rodriguez
888030c639
Removing coffeescript and adding custom JS
2015-08-28 07:49:32 -04:00
Chris Rodriguez
4185c11b31
Updating markup and styles
2015-08-28 07:49:31 -04:00
Ahsan Ulhaq
b32d2205d4
Course navigation menu accessibility issue
...
Following have been done
1- Change the structure of the course navigation Menu HTML
2- Add some basic styling
3- Add basic JS for html rendering
4- Update tests according to new structure
AC-76
2015-08-28 07:49:31 -04:00
