Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,702 Commits 1 Branch 0 Tags
439ddfa97edcf0bfca51b31a2aae007235155423
Commit Graph

12243 Commits

Author SHA1 Message Date
Andy Armstrong
439ddfa97e Merge pull request #9668 from edx/andya/team-search-i18n-bug 
Improve support for Chinese characters in team search
 2015-09-10 11:09:17 -04:00
Daniel Friedman
d1d44e7bd0 Merge pull request #9611 from edx/dan-f/add-team-page-viewed-events 
Add page viewed events to teams app.
 2015-09-10 10:37:59 -04:00
clrux
530312ab6d Merge pull request #9676 from edx/clrux/hotfix-lms-dashboard-link-hover 
Updating reset link colors
 2015-09-10 09:17:30 -04:00
Chris Rodriguez
16ae0df38d LMS: updating hover colors for visited links 2015-09-10 08:05:18 -04:00
Daniel Friedman
3b957a7ee9 Add page viewed events to teams app. 
TNL-3188
 2015-09-09 23:04:44 -04:00
Peter Fogg
1c910cfbbb Merge pull request #9631 from edx/peter-fogg/teams-ajax-errors 
Respond to AJAX errors in Teams UI.
 2015-09-09 18:49:39 -04:00
Peter Fogg
95339311b0 Respond to AJAX errors in Teams UI. 
TNL-3042
 2015-09-09 17:04:23 -04:00
chrisndodge
34e01581c1 Merge pull request #9680 from edx/cdodge/only-show-proctoring-download-when-enabled 
only show proctoring download button when the course has proctoring e…
 2015-09-09 15:01:18 -04:00
chrisndodge
0afa0ab764 Merge pull request #9674 from edx/muhhshoaib/PHX-141-proctoring-timer-count-down-acccessibility 
PHX-141
 2015-09-09 14:28:43 -04:00
Andy Armstrong
321a0ea6a0 Fix searching with Chinese characters 
TNL-3228
 2015-09-09 14:16:05 -04:00
Clinton Blackburn
b5d6b210fd Merge pull request #9681 from edx/release 
Release 2015-09-09
 2015-09-09 12:38:15 -04:00
Chris Dodge
5591101a18 only show proctoring download button when the course has proctoring enabled 2015-09-09 12:06:58 -04:00
Sarina Canelake
c5bca132bd Merge pull request #9670 from edx/sarina/fix-inherited-tests 
Fix Pylint warning for monkey_patch tests
 2015-09-09 10:06:21 -04:00
Christine Lytwynec
8d0bc488e1 Merge pull request #9664 from edx/clytwynec/AC-166 
Remove unicode quotes in courseware html attrs
 2015-09-09 09:43:37 -04:00
Sarina Canelake
b19a0e71d3 Fix pylint issues in spoc_gradebook test 2015-09-09 09:13:29 -04:00
Muhammad Shoaib
24195c12ea PHX-141 
added the accessibility element for timer count down
 2015-09-09 15:51:14 +05:00
Bill DeRusha
6c09ceaef9 Merge pull request #9669 from edx/bderusha/teams-search-flag 
Add ENABLE_SEARCH_TEAMS flag to tests
 2015-09-08 20:58:30 -04:00
Bill DeRusha
8bfa4e9c21 Add ENABLE_SEARCH_TEAMS flag to tests 2015-09-08 19:12:48 -04:00
Andy Armstrong
72ea41f9c7 Don't localize search indexes for teams 
TNL-3239
 2015-09-08 18:26:12 -04:00
Bill DeRusha
fb874f4805 Merge pull request #9665 from edx/bderusha/teams-search-config 
Add search specific feature flag in front of search features
 2015-09-08 17:39:07 -04:00
Bill DeRusha
49807ab6a5 Add search specific feature flag in front of search features 2015-09-08 17:13:30 -04:00
Andy Armstrong
a08fe9fb06 Merge pull request #9059 from edx/andya/faster-update-assets 
Don't package or optimize assets on devstack
 2015-09-08 16:48:11 -04:00
Kevin Falcone
ee7d47c7ec Merge pull request #9640 from edx/jibsheet/lti-consumer-default-token 
Use the oauth provider utils to ship a generated key/secret
 2015-09-08 16:15:59 -04:00
Christine Lytwynec
9a45e831ac Merge pull request #9497 from edx/clytwynec/AC-155 
Add role="presentation" to .course-wrapper to prevent table
 2015-09-08 15:43:46 -04:00
Christine Lytwynec
3aff77021a Remove unicode quotes in courseware html attrs 2015-09-08 15:41:31 -04:00
Diana Huang
0b78ffdf83 Merge pull request #9632 from edx/diana/teams-changed-event 
Add events for tracking when teams are edited.
 2015-09-08 15:21:49 -04:00
Bill DeRusha
ade4734308 Merge pull request #9661 from edx/bderusha/teams-search-index 
Add more defensive code around elasticsearch connection
 2015-09-08 14:31:41 -04:00
chrisndodge
815a3d6cf3 Merge pull request #9646 from edx/muhhshoaib/SOL-1171-return-display-string-from-backbone-view 
SOL-1171
 2015-09-08 14:09:06 -04:00
Sarina Canelake
3015c4a51d Merge pull request #9638 from jolyonb/fixspace 
Fixing spacing in tooltip
 2015-09-08 13:00:05 -04:00
Bill DeRusha
62ef4b5b8f Add more defensive code around elasticsearch connection 2015-09-08 12:12:05 -04:00
Muhammad Shoaib
1b861b9d81 SOL-1171 
passed the display string to the underscore template so that the word "proctored" is not hard coded in the underscore file.

updated the git tag for proctoring repo
 2015-09-08 11:47:33 -04:00
Kevin Falcone
bb285f9f3c Use the oauth provider utils to suggest a key/secret 
You can still edit this to meet your needs, but you won't need to
manually generate one.
 2015-09-08 11:28:28 -04:00
Zubair Afzal
dae0285af8 Merge pull request #9473 from edx/zub/story/ecom-2044-login-registration-requirejs 
use the standard syntax to load JavaScript dependencies on logistrati…
 2015-09-08 17:30:33 +05:00
Matt Drayer
bd3dfee911 Merge pull request #9629 from edx/asadiqbal08/SOL-1159 
SOL-1159 Remove hash cert asset file name
 2015-09-08 08:10:01 -04:00
Muhammad Shoaib
f495c135d6 Merge pull request #9458 from edx/muhhshoaib/PHX-update-dialog-box-css 
PHX-120
 2015-09-08 12:41:12 +05:00
zubair-arbi
d2a4790855 use the standard syntax to load JavaScript dependencies on logistration js files 
ECOM-2044
 2015-09-07 18:19:56 +05:00
asadiqbal
17f10d21d0 SOL-1159 2015-09-07 16:24:09 +05:00
Zia Fazal
0adea67662 hide shopping cart menu 
Hide shopping cart menu only if request is coming from a micro site and
requested page is from courseware.
 2015-09-07 12:23:45 +05:00
Jolyon Bloomfield
8e04f92167 Fixing spacing in tooltip 2015-09-06 15:37:19 -04:00
Diana Huang
8c1bf2cd3a Add events for tracking when teams are edited. 
TNL-3190
 2015-09-04 15:27:40 -04:00
Peter Fogg
1ba4200a84 Merge pull request #9624 from edx/peter-fogg/forum-teams-events 
Update discussion events to include team_id when appropriate.
 2015-09-04 13:58:43 -04:00
Peter Fogg
d7e1ec1922 Merge pull request #9613 from edx/peter-fogg/team-search-events 
Add teams eventing for search.
 2015-09-04 13:22:39 -04:00
Peter Fogg
607bd538e6 Update discussion events to include team_id when appropriate. 
TNL-3196
 2015-09-04 13:10:39 -04:00
tasawernawaz
7179fac6a2 Merge pull request #9575 from edx/tasawer/story/xcom-285-removing-deprecated-view 
removing deprecated view VerifyLaterView
 2015-09-04 21:50:07 +05:00
Peter Fogg
86cce5f0ef Add teams eventing for search. 
TNL-3187
 2015-09-04 12:40:37 -04:00
Diana Huang
deacfebd7e Merge pull request #9607 from edx/diana/teams-event-tracking 
Add teams eventing and tests.
 2015-09-04 11:32:25 -04:00
Diana Huang
a743f4a642 Add teams eventing and tests. 2015-09-04 10:45:01 -04:00
Calen Pennington
7c62d09eba Merge pull request #8930 from ubc/wmono/lti-sso 
Feature: LTI third-party-auth providers
 2015-09-04 10:40:55 -04:00
Matt Drayer
9cc1859eed Merge pull request #9596 from edx/ziafazal/MAYN-118 
MAYN-118: load header extra file
 2015-09-04 10:37:35 -04:00
Kevin Falcone
57a0356b69 Merge pull request #9608 from edx/jibsheet/lti-provider-admin-ui 
Add details to the admin listing of LTI Consumers
 2015-09-04 10:31:58 -04:00