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

31970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Morales
dd67f8aa72 updated inline discussion styling to account for lack of expand / show message (which was being relied on for layout) and also removed issues of generic pagination styling impacting the older inline discussion pagination pattern with a class renaming 2015-08-06 11:15:55 -04:00
cahrens
41173fefee Only verify course access for threads with course context. 2015-08-06 11:15:55 -04:00
Andy Armstrong
63da1907eb Show inline discussion component on Team view 
TNL-2515
 2015-08-06 11:15:55 -04:00
David Baumgold
df936837ae Merge pull request #9210 from edx/dont-click-here 
Should never just link the word 'here'
 2015-08-06 10:10:43 -04:00
Ben Patterson
c4eed7bbc2 Merge pull request #9196 from edx/benp/bok-choy-shard-7 
Benp/bok choy shard 7
 2015-08-06 07:27:56 -04:00
Syed Hasan raza
486aa58fe7 Merge pull request #8889 from edx/shr/bug/TNL-2686-library-export-then-import-error 
Test library failed to export after import
 2015-08-06 02:09:05 -07:00
David Baumgold
668c7fdca3 Should never just link the word 'here' 2015-08-05 15:53:51 -04:00
Syed Hassan Raza
4c1c4619f0 Test library failed to export after import 2015-08-05 12:47:27 -07:00
Jesse Zoldak
4c9b66376a Merge pull request #9205 from edx/zoldak/script-cleanup-2 
Clean up unused CI scripts
 2015-08-05 15:21:33 -04:00
Ben Patterson
92c9c1d529 New bok-choy shard (#7). 2015-08-05 13:52:39 -04:00
Jesse Zoldak
a147857a43 Merge pull request #9091 from jzoldak/zoldak/test-circle 
Configure for unit tests to run on circleci
 2015-08-05 13:27:56 -04:00
Jesse Zoldak
8672455fda Get circleci configuration working for forks 2015-08-05 13:25:30 -04:00
Matt Drayer
f7594ecdcb Merge pull request #9149 from edx/ziafazal/SOL-1088 
ziafazal/SOL-1088: Show Certificate function only when advanced setting is true
 2015-08-05 12:38:37 -04:00
Nimisha Asthagiri
73810f6a23 Merge pull request #8888 from edx/mobile/MA-977-supports 
MA-977 Use "supports" decorator on XBlocks for multi-device support
 2015-08-05 12:29:25 -04:00
Nimisha Asthagiri
5a44f391b0 MA-977 Use "supports" decorator on XBlocks for multi-device support 2015-08-05 11:37:33 -04:00
Jesse Zoldak
7713bed48f Clean up unused CI scripts 
Most of these were originally created under TE-465 for
aggregating results in Solano. See PR #5672.
 2015-08-05 11:32:15 -04:00
Clinton Blackburn
5c8f79c067 Merge pull request #9203 from edx/release 
ECOM Patch 2015-08-04
 2015-08-05 11:31:48 -04:00
Clinton Blackburn
09405a758e Merge pull request #9193 from edx/patch/2015-08-04 
ECOM Patch
 2015-08-05 10:08:18 -04:00
Muhammad Ammar
205f341730 Merge pull request #9075 from edx/ammar/tnl1899-create-new-team 
Create new team
 2015-08-05 18:44:00 +05:00
muhammad-ammar
69450fce47 create a new team 
TNL-1899
 2015-08-05 17:55:26 +05:00
Matt Drayer
70d4d885e7 Merge pull request #9185 from edx/asadiqbal08/SOL-1035 
asadiqbal08/SOL-1035: Signatory fields should use placeholders and not text values
 2015-08-05 08:31:30 -04:00
John Eskew
56da28526e Merge pull request #9155 from edx/jeskew/csm_api_events_to_datadog 
Add DataDog histogram events to DjangoXBlockUserStateClient class.
 2015-08-04 18:19:55 -04:00
John Eskew
f3e59acbf1 Add DataDog histogram events to DjangoXBlockUserStateClient class. 2015-08-04 17:14:05 -04:00
Diana Huang
39cccac7e5 Merge pull request #9176 from edx/diana/add-team-creator-automatically 
Add the creator of a team to that team.
 2015-08-04 17:06:54 -04:00
Diana Huang
1c6c1654be Add the creator of a team to that team. 
TNL-1908
 2015-08-04 16:08:40 -04:00
Vedran Karačić
2e3242eec9 Merge pull request #9165 from edx/vkaracic/TNL-394-confirmation-msg 
TNL-394: Fixed confirmation message display for StaffDebug actions
 2015-08-04 21:39:43 +02:00
Clinton Blackburn
69e9ac1a40 Exposing course verification deadline via Commerce API 
The course now supports reading and writing the verification deadline attribute.

XCOM-536
 2015-08-04 14:35:47 -04:00
Clinton Blackburn
38d7a12f63 Exposing course name via Commerce API 
The course now includes a read-only name attribute.

XCOM-536
 2015-08-04 14:35:29 -04:00
Clinton Blackburn
f273c5a7e6 Merge pull request #9175 from edx/clintonb/commerce-api-course-verification-deadline 
Exposing course verification deadline via Commerce API
 2015-08-04 14:34:01 -04:00
Ned Batchelder
ff243eaa70 Merge pull request #9187 from edx/release 
Release merge to master
 2015-08-04 14:18:50 -04:00
Awais Jibran
6d16da7339 Merge pull request #9015 from edx/aj/tnl2857-mathjax-probelm-in-problem-hints 
Fixed MathJax rendering in problem hint
 2015-08-04 23:12:03 +05:00
Awais Jibran
99cd48c858 Merge pull request #9179 from edx/aj/tnl2855-depricated-blocks-in-edge 
Fixed ORA1 deprecated warning message
 2015-08-04 23:09:00 +05:00
Clinton Blackburn
b2b40e2770 Exposing course verification deadline via Commerce API 
The course now supports reading and writing the verification deadline attribute.

XCOM-536
 2015-08-04 14:04:04 -04:00
Bertrand Marron
ba5da45141 Add circle configuration 2015-08-04 13:52:27 -04:00
Ned Batchelder
8477146ca8 Merge pull request #9189 from edx/ned/fix-django-debug-toolbar-settings 
We should only add the DjDT urls if it is enabled.
 2015-08-04 12:56:29 -04:00
Ned Batchelder
8476baf4dd We should only add the DjDT urls if it is enabled. 2015-08-04 11:01:45 -04:00
Ned Batchelder
69be9000ab Merge pull request #9153 from edx/rc/2015-08-04 
Rc/2015-08-04
 2015-08-04 10:38:49 -04:00
Dennis Jen
009e8a1050 Merge pull request #9085 from edx/dsjen/return-courses-via-roles 
Optimize OpenID Course Claims for non-global-staff users.
 2015-08-04 09:37:23 -04:00
Ned Batchelder
ceb5655b2d Merge pull request #9171 from edx/ned/update-pylint 
Update pylint and astroid, reduces pylint count by 400
 2015-08-04 09:28:35 -04:00
asadiqbal
10d4d0ba06 SOL-1035 2015-08-04 18:23:21 +05:00
Awais Jibran
1ac90573ae Fixed ORA1 deprecated warning message when a component does not have a display_name 
TNL-2855
 2015-08-04 18:18:18 +05:00
vkaracic
0fb1bf6ff9 Fixed confirmation message display for StaffDebug actions 
This is an addition to TNL-394:
https://openedx.atlassian.net/browse/TNL-394
Fixed the confirmation messages that didn't appear when an escapable character
is in the location name of the problem.
 2015-08-04 07:59:00 +00:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
Jim Abramson
0e3be9de80 Merge pull request #9123 from edx/jsa/xcom-442 
Add historical course enrollment table.
 2015-08-03 17:06:24 -04:00
Dennis Jen
f0d1772da3 Optimize OpenID Course Claims for non-global-staff users. 2015-08-03 16:48:28 -04:00
Clinton Blackburn
6e0013c4cc Merge pull request #9174 from edx/clintonb/commerce-api-course-name 
Exposing course name via Commerce API
 2015-08-03 16:02:18 -04:00
Ned Batchelder
ee0f4b2594 Remove 'pylint: disable=no-value-for-parameter' that we no longer need. 2015-08-03 15:44:29 -04:00
Clinton Blackburn
880da5a09d Exposing course name via Commerce API 
The course now includes a read-only name attribute.

XCOM-536
 2015-08-03 15:16:45 -04:00
Peter Pinch
53db053c18 Merge pull request #8986 from jazkarta/remove-ccx-enrollment 
Use the standard enrollment table instead of a custom CCX table for CCX enrollments
 2015-08-03 13:18:41 -04:00
David Baumgold
386a8a27dd Merge pull request #8936 from edx/db/remove-unneeded-template-block 
Remove unneeded block from courses.html template
 2015-08-03 13:13:58 -04:00