Code

central-develop into 0.17.x#5595

Code

Merged

benjaoming merged 140 commits intolearningequality:0.17.xlearningequality/ka-lite:0.17.xfrom benjaoming:central-develop-into-0.17.xbenjaoming/ka-lite:central-develop-into-0.17.xCopy head branch name to clipboardSep 3, 2019

+19-10

Commits

Commits on Feb 4, 2015

• Student should be redirected to login page if he/she gets looged out while doing playlist exercies

  anuragkanungo

  committed
  95ae21e

• Merge pull request learningequality#2939 from anuragkanungo/nalanda-rct3

  Show description for 0615773
  aronasorman

  committed
  0615773

Commits on Feb 7, 2015

• Added Unit Variable to ExerciseLog Export

  anuragkanungo

  committed
  3daac46

• Updated code for unit variable in exercise log

  anuragkanungo

  committed
  30758b4

Commits on Feb 10, 2015

• Increased height of exercise name column in exam reports

  anuragkanungo

  committed
  5d6a29d

• Added Exam Prep Playlists

  anuragkanungo

  committed
  6d7e510

• Added student_testing/data/407.json

  anuragkanungo

  committed
  0cef1b9

• Added 15Nov2014 RCT condition check for unit variable

  anuragkanungo

  committed
  6c70ea7

• Merge pull request learningequality#3016 from anuragkanungo/smps_4b_exam_results

  Show description for 8fea95e
  aronasorman

  committed
  8fea95e

• Merge pull request learningequality#3011 from anuragkanungo/exam_topic_width

  Show description for 318a01a
  aronasorman

  committed
  318a01a

• Merge pull request learningequality#3012 from anuragkanungo/playlist

  Show description for bf146dc
  aronasorman

  committed
  bf146dc

Commits on Feb 11, 2015

• Added Student Mastery/Class Mastery CoachReports

  anuragkanungo

  committed
  c6402d3

• RCT Unit Variable comment

  anuragkanungo

  committed
  c1abb70

Commits on Feb 12, 2015

• Removed Unit Selection Box and Added Class Level Mastery

  anuragkanungo

  committed
  5105876

• correct unit for those we are sure else unit 0

  anuragkanungo

  committed
  6e6c0f0

• Added comment why to keep unit variable as 0 for some cases

  anuragkanungo

  committed
  26592ee

• Merge pull request learningequality#2958 from anuragkanungo/nalanda-rct3

  Show description for 61fb56b
  jamalex

  committed
  61fb56b

Commits on Feb 13, 2015

• Code cleanup and renamed report view to exercise_mastery_view

  anuragkanungo

  committed
  5286833

• On Facility Switch remove playlist values from url, to avoid get exercise error

  anuragkanungo

  committed
  af8d016

• Fixed minor bugs related to division by zero and exercise selection

  anuragkanungo

  committed
  350a7f5

• Moved jquery.js required for dyna-tree persistance to static-libraries

  anuragkanungo

  committed
  1c582c2

• Refactoring and percentage in float

  anuragkanungo

  committed
  66a0248

• removed extra comma, tests was failing

  anuragkanungo

  committed
  c106ca1

Commits on Feb 20, 2015

• Merge pull request learningequality#3033 from anuragkanungo/coach_reports

  Show description for 8e5e8e5
  jamalex

  committed
  8e5e8e5

Commits on Feb 23, 2015

• Fix 3040, Redirect to login page in case of Unauthorized

  anuragkanungo

  committed
  bc21a36

Commits on Feb 24, 2015

• Used SetGetParam for url

  anuragkanungo

  committed
  3bffde5

• Test for redirect unauthorized playlist view request to login page

  anuragkanungo

  committed
  5e0b016

• Added test for unauthorized request to redirect to login page

  anuragkanungo

  committed
  d4c91a2

• Moved import to top

  anuragkanungo

  committed
  cfb423d

• Added implicit wait for css selector to be found in selenium test

  anuragkanungo

  committed
  14c8701

• Updated implicit wait after selector

  anuragkanungo

  committed
  b56a514

• Increase implict wait timeout time

  anuragkanungo

  committed
  4ffdb35

Commits on Feb 25, 2015

• Merge pull request learningequality#3092 from anuragkanungo/nalanda-rct3

  Show description for 7c9085b
  aronasorman

  committed
  7c9085b

Commits on Feb 27, 2015

• Fixing up loadtesting.

  rtibbles

  committed
  b68aadf

• Final tweaks and fixes for loadtesting.

  rtibbles

  committed
  618314d

• Fixes up load_testing for nalanda_rct3

  rtibbles

  committed
  2c5cce4

Commits on Feb 28, 2015

• Adds description comment to loadtesting view.

  rtibbles

  committed
  b3f28a0

• Merge pull request learningequality#3149 from rtibbles/load_testing_nalanda

  Show description for c06bab5
  jamalex

  committed
  c06bab5

• Fixes video playback during loadtest

  rtibbles

  committed
  dd65adb

• Merge pull request learningequality#3161 from rtibbles/load_testing_video

  Show description for 0299599
  jamalex

  committed
  0299599

• Fixes exercise answering for nalanda-rct3

  rtibbles

  committed
  e890a2d

• Merge pull request learningequality#3163 from rtibbles/load_testing_video

  Show description for b289d0f
  jamalex

  committed
  b289d0f

Commits on Mar 1, 2015

• Ignore content/khan folder in git.

  jamalex

  committed
  54c23cb

• Re-enable motivational features by default for Nalanda.

  jamalex

  committed
  1509abc

• Fixes and simplification to loadtesting app.

  jamalex

  committed
  0597547

• Merge pull request learningequality#3165 from jamalex/loadtesting_fix

  Show description for a6d62e5
  jamalex

  committed
  a6d62e5

Commits on Mar 2, 2015

• On loadtesting, set a timeout to continue even if page fails.

  jamalex

  committed
  6e8da48

• Merge pull request learningequality#3169 from jamalex/loadtesting_robustness

  Show description for 6177f63
  rtibbles

  committed
  6177f63

Commits on Mar 4, 2015

• when running an external kalite process, make sure we change the

  Show description for ee90bd5
  aronasorman

  committed
  ee90bd5

Commits on Mar 9, 2015

• Skip unauthorzied redirect to login test on travis

  anuragkanungo

  committed
  a5a5b1b

• Merge pull request learningequality#3198 from anuragkanungo/nalanda-rct3

  Show description for 3bbd98e
  anuragkanungo

  committed
  3bbd98e

• Merge pull request learningequality#3200 from learningequality/nalanda-rct3

  Show description for abb207c
  jamalex

  committed
  abb207c

• Merge pull request learningequality#3156 from learningequality/develop

  Show description for e6f34b2
  jamalex

  committed
  e6f34b2

• Merge branch 'central-master' of github.com:learningequality/ka-lite into central-develop

  Show description for 1f19654
  jamalex

  committed
  1f19654

• Remove exercise_mastery_view.

  jamalex

  committed
  2ebd3ed

• Don't download assessment items when on central server.

  jamalex

  committed
  097a747

Commits on Mar 10, 2015

• add --no-assessment-download command for setup

  aronasorman

  committed
  073046f

Commits on Mar 11, 2015

• Merge pull request learningequality#3254 from jamalex/device_metadata_fix

  Show description for 105272d
  jamalex

  committed
  105272d

Commits on Mar 16, 2015

• Cherry pick changes from develop

  MCGallaspy

  committed
  e1d6c23

• Fix js linting issue

  MCGallaspy

  committed
  63824f6

Commits on Mar 17, 2015

• Really fix device metadata issue (cherry pick from develop)

  MCGallaspy

  committed
  f13286c

• Merge remote-tracking branch 'mcgallaspy/central-develop' into central-develop

  MCGallaspy

  committed
  c29c18d

• Merge pull request learningequality#3309 from MCGallaspy/central-develop

  Show description for 645c7f0
  aronasorman

  committed
  645c7f0

Commits on Mar 20, 2015

• Merge branch 'develop' into central-develop

  Show description for 1648ace
  aronasorman

  committed
  1648ace

Commits on Mar 30, 2015

• Merge branch '0.13.x' into central-develop

  Show description for 3755b72
  aronasorman

  committed
  3755b72

• fix the double-colons

  aronasorman

  committed
  d24b7ab

Commits on Mar 31, 2015

• make sure we're not the central server when checking for assessment items.

  aronasorman

  committed
  05bf1cd

• wrap unpack assessment item handling in settings.CENTRAL_SERVER statement

  aronasorman

  committed
  3aaeea8

Commits on Apr 3, 2015

• Merge pull request learningequality#3454 from learningequality/0.13.x

  Show description for 5f82a77
  aronasorman

  committed
  5f82a77

Commits on Apr 6, 2015

• Merge branch '0.13.x' into central-develop

  

  Aron Fyodor Asor

  committed
  99dbcdb

• Merge pull request learningequality#3482 from jamalex/restore_response_count_to_its_former_glory

  Show description for c12f0ce
  jamalex

  committed
  c12f0ce

Commits on Apr 7, 2015

• Additional diagnostic error data for bad client device import.

  jamalex

  committed
  a276b0c

• Set the django module if given by kwargs.

  Show description for 8a4d4be
  

  Aron Fyodor Asor

  committed
  8a4d4be

• use CENTRAL_SERVER_URL instead of SECURESYNC_PROTOCOL +

  Show description for f0bd27c
  

  Aron Fyodor Asor

  committed
  f0bd27c

• error out on registration when we get an invalid user error message.

  Show description for 34a27be
  

  Aron Fyodor Asor

  committed
  34a27be

• parse self.url.

  Show description for 65330fb
  

  Aron Fyodor Asor

  committed
  65330fb

• Stop using deprecated command, update requirements, fix import

  MCGallaspy

  committed
  eb670d5

• use absolute path in kalitectl.py, update screenshot command

  Show description for 8ffa4d2
  MCGallaspy

  committed
  8ffa4d2

• Remove errant pdb.set_trace

  MCGallaspy

  committed
  ea857a6

• Add language option to screenshots management command

  Show description for 3ae33e7
  MCGallaspy

  committed
  3ae33e7

• Fix language option on screenshot mgmt command

  MCGallaspy

  committed
  3510566

• Set up docs for translation. Need translated pofiles.

  MCGallaspy

  committed
  3d273f2

• Don't build screenshots when making messages

  MCGallaspy

  committed
  ab8bc62

• Update README

  MCGallaspy

  committed
  263e52b

• Add dep for python 2.6

  MCGallaspy

  committed
  b0a9d48

• Merge pull request learningequality#3490 from MCGallaspy/pick-docs-intl

  Show description for 83006de
  aronasorman

  committed
  83006de

Commits on Apr 9, 2015

• Merge pull request learningequality#3498 from learningequality/0.13.x

  Show description for a253c1b
  jamalex

  committed
  a253c1b

Commits on Apr 12, 2015

• Merge pull request learningequality#3515 from jamalex/0.13-fixes

  Show description for c3cc5ef
  jamalex

  committed
  c3cc5ef

Commits on May 27, 2015

• Merge branch 'develop' into central-develop

  Show description for 626f915
  

  Aron Fyodor Asor

  committed
  626f915

• add missing import.

  

  Aron Fyodor Asor

  committed
  9801731

Commits on May 28, 2015

• Merge remote-tracking branch 'refs/remotes/u/develop' into central-develop

  

  Aron Fyodor Asor

  committed
  452e19e

Commits on May 29, 2015

• Merge branch 'develop' into central-develop

  

  Aron Fyodor Asor

  committed
  4d408f3

Commits on Jun 1, 2015

• Merge branch 'develop' into central-develop

  

  Aron Fyodor Asor

  committed
  4771c3c

Commits on Jul 7, 2015

• Merge branch '0.14.x' of github.com:learningequality/ka-lite into central-develop

  Show description for 171f2f7
  jamalex

  committed
  171f2f7

• Merge branch '0.14.x' of github.com:learningequality/ka-lite into central-develop

  jamalex

  committed
  1c49921

Commits on Jul 9, 2015

• Merge branch 'tweaks_based_on_central_server' into central-develop

  jamalex

  committed
  de616c3

Commits on Jul 11, 2015

• Merge pull request learningequality#4084 from jamalex/setup_fixes

  Show description for c682fa4
  jamalex

  committed
  c682fa4

Commits on Jul 12, 2015

• Merge branch 'tweaks_based_on_central_server' of github.com:jamalex/ka-lite into central-develop

  jamalex

  committed
  5942943

Commits on Jul 24, 2015

• Merge branch '0.14.x' of github.com:learningequality/ka-lite into central-develop

  jamalex

  committed
  259d8ae

• Merge branch '0.14.x' of github.com:learningequality/ka-lite into central-develop

  jamalex

  committed
  cabc30f

Commits on Jul 25, 2015

• Merge pull request learningequality#4161 from learningequality/0.14.x

  Show description for 2a5fa54
  jamalex

  committed
  2a5fa54

Commits on Jul 27, 2015

• Softload KHAN_ASSESSMENT_ITEM_DATABASE_PATH in case DB not defined.

  jamalex

  committed
  590752e

Commits on Jul 28, 2015

• Merge pull request learningequality#4171 from jamalex/central_server_fixes

  Show description for 1f87909
  jamalex

  committed
  1f87909

Commits on Aug 5, 2015

• Merge pull request learningequality#4207 from jamalex/securesync_fixes

  Show description for 8adb6f3
  jamalex

  committed
  8adb6f3

Commits on Aug 13, 2015

• Merge pull request learningequality#4230 from rtibbles/zone_space_coach_reports

  Show description for 68c6ffe
  jamalex

  committed
  68c6ffe

• Merge pull request learningequality#4236 from rtibbles/zone_space_coach_reports

  Show description for 30f8bd1
  jamalex

  committed
  30f8bd1

Commits on Aug 15, 2015

• Merge pull request learningequality#4243 from learningequality/0.14.x

  Show description for 6f62e04
  jamalex

  committed
  6f62e04

Commits on Aug 18, 2015

• Safer BaseView.remove: remove el before reflow, no infinite recursion.

  jamalex

  committed
  41923fc

• Merge pull request learningequality#4252 from jamalex/safer_removal_recursion_14

  Show description for d6abcae
  jamalex

  committed
  d6abcae

• Merge pull request learningequality#4255 from jamalex/fix_container_overflow

  Show description for 0c49a77
  jamalex

  committed
  0c49a77

Commits on Aug 24, 2015

• Merge pull request learningequality#4279 from learningequality/0.14.x

  Show description for fbc2912
  aronasorman

  committed
  fbc2912

Commits on Sep 18, 2015

• Merge remote-tracking branch 'upstream/0.15.x' into central-develop

  Show description for c01942e
  MCGallaspy

  committed
  c01942e

• Remove duplicate TestCase subclass

  Show description for 719921a
  MCGallaspy

  committed
  719921a

• Merge pull request learningequality#4455 from MCGallaspy/central-develop

  Show description for 361834b
  MCGallaspy

  committed
  361834b

Commits on Sep 22, 2015

• Add get_cookie to base module & global scope

  Show description for 1323db0
  MCGallaspy

  committed
  1323db0

• Do not use os-specific separator

  MCGallaspy

  committed
  cd4cb41

• Massage the Popen arguments into windows form

  Show description for e418511
  MCGallaspy

  committed
  e418511

• Merge pull request learningequality#4465 from MCGallaspy/central-develop

  Show description for 4951c10
  rtibbles

  committed
  4951c10

Commits on Sep 24, 2015

• Merge pull request learningequality#4498 from MCGallaspy/central-develop

  Show description for 90d20c6
  rtibbles

  committed
  90d20c6

Commits on Oct 8, 2015

• Merge pull request learningequality#4513 from learningequality/0.15.x

  Show description for d7cdc84
  rtibbles

  committed
  d7cdc84

Commits on Nov 24, 2015

• Merge pull request learningequality#4683 from learningequality/0.15.x

  Show description for dc56afc
  aronasorman

  committed
  dc56afc

Commits on Mar 17, 2016

• Merge remote-tracking branch 'origin/0.16.x' into central-develop

  aronasorman

  committed
  c789b22

Commits on Mar 21, 2016

• Merge pull request learningequality#5014 from learningequality/update-central-develop

  Show description for bf2cfa4
  jamalex

  committed
  bf2cfa4

Commits on Mar 23, 2016

• Merge pull request learningequality#5034 from jamalex/pin_npm_versions

  Show description for cb25c26
  jamalex

  committed
  cb25c26

Commits on Apr 20, 2016

• Add options object to reference org_id from to ZoneSelectView in data exports.

  rtibbles

  committed
  45cc3e4

• Merge pull request learningequality#5095 from rtibbles/central-develop-org-id

  Show description for a118a2d
  jamalex

  committed
  a118a2d

Commits on Nov 14, 2016

• Remove .gitmodules file causing RTD to break

  

  Benjamin Bach

  committed
  bdf518c

Commits on Nov 16, 2016

• Remove unused submodule for RTD to build

  

  Benjamin Bach

  committed
  635c5ea

Commits on Mar 16, 2017

• Make version visible in docs for installation guide - fixes learningequality#5165

  

  Benjamin Bach

  committed
  a2b59b0

Commits on Jul 4, 2019

• Merge tag '0.16.x' into central-develop

  Show description for 3555f82
  

  Benjamin Bach

  committed
  3555f82

• Merge remote-tracking branch 'upstream/0.16.x' into central-develop

  

  Benjamin Bach

  committed
  9272dcf

Commits on Jul 15, 2019

• Merge branch 'central-develop' into central-develop-into-0.17.x

  

  Benjamin Bach

  committed
  3fccd47

• Remove duplicated line

  

  Benjamin Bach

  committed
  a56efba

Commits on Jul 16, 2019

• Remove unused JS and cherry-picked CSS from learningequality#3033

  

  Benjamin Bach

  committed
  54bc417

• Remove unused .json file from learningequality#3033

  

  Benjamin Bach

  committed
  650a95d

• Remove Nalanda-specific code from learningequality#3033

  

  Benjamin Bach

  committed
  e554397

Commits on Jul 17, 2019

• call_outside_command_with_output moved to central server

  

  Benjamin Bach

  committed
  338fc49

• Remove debug statement

  

  Benjamin Bach

  committed
  f2ae87c

Commits on Sep 2, 2019

• Remove unreferenced JS library jquery.cookie.js

  

  Benjamin Bach

  committed
  5161c9b

• Unify approach from 0.17.x and central-develop

  

  Benjamin Bach

  committed
  bc367a0