Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

0.17.x into master (0.17.6 release) #5612

Draft
wants to merge 226 commits into
base: master
Choose a base branch
from
Draft

0.17.x into master (0.17.6 release) #5612

wants to merge 226 commits into from

Commits on Feb 4, 2015

  1. Student should be redirected to login page if he/she gets looged out … 

    …while doing playlist exercies
    @anuragkanungo
    anuragkanungo committed Feb 4, 2015
    Configuration menu
    Copy the full SHA
    95ae21e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2939 from anuragkanungo/nalanda-rct3 

    Student should be redirected to login page if he/she gets looged out while doing playlist exercies
    @aronasorman
    aronasorman committed Feb 4, 2015
    Configuration menu
    Copy the full SHA
    0615773 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2015

  1. Added Unit Variable to ExerciseLog Export

    @anuragkanungo
    anuragkanungo committed Feb 7, 2015
    Configuration menu
    Copy the full SHA
    3daac46 View commit details
    Browse the repository at this point in the history

  2. Updated code for unit variable in exercise log

    @anuragkanungo
    anuragkanungo committed Feb 7, 2015
    Configuration menu
    Copy the full SHA
    30758b4 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2015

  1. Increased height of exercise name column in exam reports

    @anuragkanungo
    anuragkanungo committed Feb 10, 2015
    Configuration menu
    Copy the full SHA
    5d6a29d View commit details
    Browse the repository at this point in the history

  2. Added Exam Prep Playlists

    @anuragkanungo
    anuragkanungo committed Feb 10, 2015
    Configuration menu
    Copy the full SHA
    6d7e510 View commit details
    Browse the repository at this point in the history

  3. Added student_testing/data/407.json

    @anuragkanungo
    anuragkanungo committed Feb 10, 2015
    Configuration menu
    Copy the full SHA
    0cef1b9 View commit details
    Browse the repository at this point in the history

  4. Added 15Nov2014 RCT condition check for unit variable

    @anuragkanungo
    anuragkanungo committed Feb 10, 2015
    Configuration menu
    Copy the full SHA
    6c70ea7 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3016 from anuragkanungo/smps_4b_exam_results 

    Added student_testing/data/407.json
    @aronasorman
    aronasorman committed Feb 10, 2015
    Configuration menu
    Copy the full SHA
    8fea95e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3011 from anuragkanungo/exam_topic_width 

    Increased the height of exercise name column in exam reports
    @aronasorman
    aronasorman committed Feb 10, 2015
    Configuration menu
    Copy the full SHA
    318a01a View commit details
    Browse the repository at this point in the history

  7. Merge pull request #3012 from anuragkanungo/playlist 

    Added Exam Prep Playlists
    @aronasorman
    aronasorman committed Feb 10, 2015
    Configuration menu
    Copy the full SHA
    bf146dc View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2015

  1. Added Student Mastery/Class Mastery CoachReports

    @anuragkanungo
    anuragkanungo committed Feb 11, 2015
    Configuration menu
    Copy the full SHA
    c6402d3 View commit details
    Browse the repository at this point in the history

  2. RCT Unit Variable comment

    @anuragkanungo
    anuragkanungo committed Feb 11, 2015
    Configuration menu
    Copy the full SHA
    c1abb70 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2015

  1. Removed Unit Selection Box and Added Class Level Mastery

    @anuragkanungo
    anuragkanungo committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    5105876 View commit details
    Browse the repository at this point in the history

  2. correct unit for those we are sure else unit 0

    @anuragkanungo
    anuragkanungo committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    6e6c0f0 View commit details
    Browse the repository at this point in the history

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

    @anuragkanungo
    anuragkanungo committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    26592ee View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2958 from anuragkanungo/nalanda-rct3 

    Added Unit Variable to ExerciseLog Export
    @jamalex
    jamalex committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    61fb56b View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2015

  1. Code cleanup and renamed report view to exercise_mastery_view

    @anuragkanungo
    anuragkanungo committed Feb 13, 2015
    Configuration menu
    Copy the full SHA
    5286833 View commit details
    Browse the repository at this point in the history

  2. On Facility Switch remove playlist values from url, to avoid get exer… 

    …cise error
    @anuragkanungo
    anuragkanungo committed Feb 13, 2015
    Configuration menu
    Copy the full SHA
    af8d016 View commit details
    Browse the repository at this point in the history

  3. Fixed minor bugs related to division by zero and exercise selection

    @anuragkanungo
    anuragkanungo committed Feb 13, 2015
    Configuration menu
    Copy the full SHA
    350a7f5 View commit details
    Browse the repository at this point in the history

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

    @anuragkanungo
    anuragkanungo committed Feb 13, 2015
    Configuration menu
    Copy the full SHA
    1c582c2 View commit details
    Browse the repository at this point in the history

  5. Refactoring and percentage in float

    @anuragkanungo
    anuragkanungo committed Feb 13, 2015
    Configuration menu
    Copy the full SHA
    66a0248 View commit details
    Browse the repository at this point in the history

  6. removed extra comma, tests was failing

    @anuragkanungo
    anuragkanungo committed Feb 13, 2015
    Configuration menu
    Copy the full SHA
    c106ca1 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2015

  1. Merge pull request #3033 from anuragkanungo/coach_reports 

    Added Student Mastery/Class Mastery CoachReports
    @jamalex
    jamalex committed Feb 20, 2015
    Configuration menu
    Copy the full SHA
    8e5e8e5 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2015

  1. Fix 3040, Redirect to login page in case of Unauthorized

    @anuragkanungo
    anuragkanungo committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    bc21a36 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2015

  1. Used SetGetParam for url

    @anuragkanungo
    anuragkanungo committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    3bffde5 View commit details
    Browse the repository at this point in the history

  2. Test for redirect unauthorized playlist view request to login page

    @anuragkanungo
    anuragkanungo committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    5e0b016 View commit details
    Browse the repository at this point in the history

  3. Added test for unauthorized request to redirect to login page

    @anuragkanungo
    anuragkanungo committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    d4c91a2 View commit details
    Browse the repository at this point in the history

  4. Moved import to top

    @anuragkanungo
    anuragkanungo committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    cfb423d View commit details
    Browse the repository at this point in the history

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

    @anuragkanungo
    anuragkanungo committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    14c8701 View commit details
    Browse the repository at this point in the history

  6. Updated implicit wait after selector

    @anuragkanungo
    anuragkanungo committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    b56a514 View commit details
    Browse the repository at this point in the history

  7. Increase implict wait timeout time

    @anuragkanungo
    anuragkanungo committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    4ffdb35 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2015

  1. Merge pull request #3092 from anuragkanungo/nalanda-rct3 

    Fix 3040, Redirect to login page in case of Unauthorized
    @aronasorman
    aronasorman committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    7c9085b View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2015

  1. Fixing up loadtesting.

    @rtibbles
    rtibbles committed Feb 27, 2015
    Configuration menu
    Copy the full SHA
    b68aadf View commit details
    Browse the repository at this point in the history

  2. Final tweaks and fixes for loadtesting.

    @rtibbles
    rtibbles committed Feb 27, 2015
    Configuration menu
    Copy the full SHA
    618314d View commit details
    Browse the repository at this point in the history

  3. Fixes up load_testing for nalanda_rct3

    @rtibbles
    rtibbles committed Feb 27, 2015
    Configuration menu
    Copy the full SHA
    2c5cce4 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2015

  1. Adds description comment to loadtesting view.

    @rtibbles
    rtibbles committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    b3f28a0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3149 from rtibbles/load_testing_nalanda 

    Load testing nalanda
    @jamalex
    jamalex committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    c06bab5 View commit details
    Browse the repository at this point in the history

  3. Fixes video playback during loadtest

    @rtibbles
    rtibbles committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    dd65adb View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3161 from rtibbles/load_testing_video 

    Fixes video playback during loadtest
    @jamalex
    jamalex committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    0299599 View commit details
    Browse the repository at this point in the history

  5. Fixes exercise answering for nalanda-rct3

    @rtibbles
    rtibbles committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    e890a2d View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3163 from rtibbles/load_testing_video 

    Fixes exercise answering for nalanda-rct3
    @jamalex
    jamalex committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    b289d0f View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2015

  1. Ignore content/khan folder in git.

    @jamalex
    jamalex committed Mar 1, 2015
    Configuration menu
    Copy the full SHA
    54c23cb View commit details
    Browse the repository at this point in the history

  2. Re-enable motivational features by default for Nalanda.

    @jamalex
    jamalex committed Mar 1, 2015
    Configuration menu
    Copy the full SHA
    1509abc View commit details
    Browse the repository at this point in the history

  3. Fixes and simplification to loadtesting app.

    @jamalex
    jamalex committed Mar 1, 2015
    Configuration menu
    Copy the full SHA
    0597547 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3165 from jamalex/loadtesting_fix 

    Loadtesting fix for Nalanda
    @jamalex
    jamalex committed Mar 1, 2015
    Configuration menu
    Copy the full SHA
    a6d62e5 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2015

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

    @jamalex
    jamalex committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    6e8da48 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3169 from jamalex/loadtesting_robustness 

    On loadtesting, set a timeout to continue even if page fails.
    @rtibbles
    rtibbles committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    6177f63 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2015

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

    DJANGO_SETTINGS_MODULE too
    @aronasorman
    aronasorman committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    ee90bd5 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2015

  1. Skip unauthorzied redirect to login test on travis

    @anuragkanungo
    anuragkanungo committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    a5a5b1b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3198 from anuragkanungo/nalanda-rct3 

    Skip unauthorzied redirect to login test on travis
    @anuragkanungo
    anuragkanungo committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    3bbd98e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3200 from learningequality/nalanda-rct3 

    Nalanda rct3 into Central Master
    @jamalex
    jamalex committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    abb207c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3156 from learningequality/develop 

    Develop into central-develop
    @jamalex
    jamalex committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    e6f34b2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'central-master' of github.com:learningequality/ka-lite … 

    …into central-develop

Conflicts:
	.gitignore
	kalite/coachreports/urls.py
	kalite/coachreports/views.py
	kalite/control_panel/api_resources.py
	kalite/distributed/static/js/distributed/exercises.js
	kalite/distributed/templates/distributed/loadtesting/load_test.html
	kalite/playlist/static/js/playlist/view_playlist.js
	kalite/playlist/templates/playlist/assign_playlists.html
    @jamalex
    jamalex committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    1f19654 View commit details
    Browse the repository at this point in the history

  6. Remove exercise_mastery_view.

    @jamalex
    jamalex committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    2ebd3ed View commit details
    Browse the repository at this point in the history

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

    @jamalex
    jamalex committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    097a747 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2015

  1. add --no-assessment-download command for setup

    @aronasorman
    aronasorman committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    073046f View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2015

  1. Merge pull request #3254 from jamalex/device_metadata_fix 

    Merge develop into central-develop
    @jamalex
    jamalex committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    105272d View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2015

  1. Cherry pick changes from develop

    @MCGallaspy
    MCGallaspy committed Mar 16, 2015
    Configuration menu
    Copy the full SHA
    e1d6c23 View commit details
    Browse the repository at this point in the history

  2. Fix js linting issue

    @MCGallaspy
    MCGallaspy committed Mar 16, 2015
    Configuration menu
    Copy the full SHA
    63824f6 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2015

  1. Really fix device metadata issue (cherry pick from develop)

    @MCGallaspy
    MCGallaspy committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    f13286c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'mcgallaspy/central-develop' into centra… 

    …l-develop
    @MCGallaspy
    MCGallaspy committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    c29c18d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3309 from MCGallaspy/central-develop 

    Cherry pick changes from develop
    @aronasorman
    aronasorman committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    645c7f0 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2015

  1. Merge branch 'develop' into central-develop 

    Conflicts:
	kalite/contentload/management/commands/generate_assessment_zips.py
	kalite/distributed/tests/browser_tests/quiz.py
	static-libraries/js/khan-lite.js
    @aronasorman
    aronasorman committed Mar 20, 2015
    Configuration menu
    Copy the full SHA
    1648ace View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2015

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

    Conflicts:
	kalite/distributed/management/commands/setup.py
    @aronasorman
    aronasorman committed Mar 30, 2015
    1 Configuration menu
    Copy the full SHA
    3755b72 View commit details
    Browse the repository at this point in the history

  2. fix the double-colons

    @aronasorman
    aronasorman committed Mar 30, 2015
    Configuration menu
    Copy the full SHA
    d24b7ab View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2015

  1. make sure we're not the central server when checking for assessment i… 

    …tems.
    @aronasorman
    aronasorman committed Mar 31, 2015
    Configuration menu
    Copy the full SHA
    05bf1cd View commit details
    Browse the repository at this point in the history

  2. wrap unpack assessment item handling in settings.CENTRAL_SERVER state… 

    …ment
    @aronasorman
    aronasorman committed Mar 31, 2015
    Configuration menu
    Copy the full SHA
    3aaeea8 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2015

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

    0.13.x to central-develop
    @aronasorman
    aronasorman committed Apr 3, 2015
    Configuration menu
    Copy the full SHA
    5f82a77 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2015

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

    Aron Fyodor Asor committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    99dbcdb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3482 from jamalex/restore_response_count_to_its_f… 

    …ormer_glory

Restore response_count to its former glory on central-develop
    @jamalex
    jamalex committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    c12f0ce View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2015

  1. Additional diagnostic error data for bad client device import.

    @jamalex
    jamalex committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    a276b0c View commit details
    Browse the repository at this point in the history

  2. Set the django module if given by kwargs. 

    Since this is called by the ecosystem tests, not doing this causes our
inferior distributed server process to use the normal kalite.settings module.
    Aron Fyodor Asor committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    8a4d4be View commit details
    Browse the repository at this point in the history

  3. use CENTRAL_SERVER_URL instead of SECURESYNC_PROTOCOL + 

    CENTRAL_SERVER_HOST.

CENTRAL_SERVER_URL is the new cool kid in town.
    Aron Fyodor Asor committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    f0bd27c View commit details
    Browse the repository at this point in the history

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

    Somehow the a bad username returns a 200 status code, so it's not enough
that we check for that.
    Aron Fyodor Asor committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    34a27be View commit details
    Browse the repository at this point in the history

  5. parse self.url. 

    Otherwise parsing `host` which can be empty would error out.
    Aron Fyodor Asor committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    65330fb View commit details
    Browse the repository at this point in the history

  6. Stop using deprecated command, update requirements, fix import

    @MCGallaspy
    MCGallaspy committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    eb670d5 View commit details
    Browse the repository at this point in the history

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

    The screenshot directive for building the docs has now been updated to use
the recommended management command invocation, and an error in kalitectl.py
has been fixed so that the python path is set correctly.
    @MCGallaspy
    MCGallaspy committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    8ffa4d2 View commit details
    Browse the repository at this point in the history

  8. Remove errant pdb.set_trace

    @MCGallaspy
    MCGallaspy committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    ea857a6 View commit details
    Browse the repository at this point in the history

  9. Add language option to screenshots management command 

    Conflicts:
	kalite/distributed/management/commands/screenshots.py
    @MCGallaspy
    MCGallaspy committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    3ae33e7 View commit details
    Browse the repository at this point in the history

  10. Fix language option on screenshot mgmt command

    @MCGallaspy
    MCGallaspy committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    3510566 View commit details
    Browse the repository at this point in the history

  11. Set up docs for translation. Need translated pofiles.

    @MCGallaspy
    MCGallaspy committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    3d273f2 View commit details
    Browse the repository at this point in the history

  12. Don't build screenshots when making messages

    @MCGallaspy
    MCGallaspy committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    ab8bc62 View commit details
    Browse the repository at this point in the history

  13. Update README

    @MCGallaspy
    MCGallaspy committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    263e52b View commit details
    Browse the repository at this point in the history

  14. Add dep for python 2.6

    @MCGallaspy
    MCGallaspy committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    b0a9d48 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #3490 from MCGallaspy/pick-docs-intl 

    Pick docs intl
    @aronasorman
    aronasorman committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    83006de View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2015

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

    Merging 0.13.x into central-develop to get latest bug fix
    @jamalex
    jamalex committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    a253c1b View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2015

  1. Merge pull request #3515 from jamalex/0.13-fixes 

    0.13.x (plus #3514) into central-develop
    @jamalex
    jamalex committed Apr 12, 2015
    Configuration menu
    Copy the full SHA
    c3cc5ef View commit details
    Browse the repository at this point in the history

Commits on May 27, 2015

  1. Merge branch 'develop' into central-develop 

    Conflicts:
	kalite/coachreports/static/css/coachreports/test_view.css
	kalite/coachreports/urls.py
	kalite/distributed/tests/browser_tests/quiz.py
	kalite/playlist/views.py
	kalite/settings.py
	kalitectl.py
	sphinx-docs/requirements.txt
	static-libraries/js/khan-lite.js
    Aron Fyodor Asor committed May 27, 2015
    Configuration menu
    Copy the full SHA
    626f915 View commit details
    Browse the repository at this point in the history

  2. add missing import.

    Aron Fyodor Asor committed May 27, 2015
    Configuration menu
    Copy the full SHA
    9801731 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2015

  1. Merge remote-tracking branch 'refs/remotes/u/develop' into central-de… 

    …velop
    Aron Fyodor Asor committed May 28, 2015
    Configuration menu
    Copy the full SHA
    452e19e View commit details
    Browse the repository at this point in the history

Commits on May 29, 2015

  1. Merge branch 'develop' into central-develop

    Aron Fyodor Asor committed May 29, 2015
    Configuration menu
    Copy the full SHA
    4d408f3 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2015

  1. Merge branch 'develop' into central-develop

    Aron Fyodor Asor committed Jun 1, 2015
    Configuration menu
    Copy the full SHA
    4771c3c View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2015

  1. Merge branch '0.14.x' of github.com:learningequality/ka-lite into cen… 

    …tral-develop

Conflicts:
	.gitignore
	kalite/distributed/management/commands/setup.py
    @jamalex
    jamalex committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    171f2f7 View commit details
    Browse the repository at this point in the history

  2. Merge branch '0.14.x' of github.com:learningequality/ka-lite into cen… 

    …tral-develop
    @jamalex
    jamalex committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    1c49921 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2015

  1. Merge branch 'tweaks_based_on_central_server' into central-develop

    @jamalex
    jamalex committed Jul 9, 2015
    Configuration menu
    Copy the full SHA
    de616c3 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2015

  1. Merge pull request #4084 from jamalex/setup_fixes 

    Updating central-develop from 0.14.x
    @jamalex
    jamalex committed Jul 11, 2015
    Configuration menu
    Copy the full SHA
    c682fa4 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2015

  1. Merge branch 'tweaks_based_on_central_server' of github.com:jamalex/k… 

    …a-lite into central-develop
    @jamalex
    jamalex committed Jul 12, 2015
    Configuration menu
    Copy the full SHA
    5942943 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2015

  1. Merge branch '0.14.x' of github.com:learningequality/ka-lite into cen… 

    …tral-develop
    @jamalex
    jamalex committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    259d8ae View commit details
    Browse the repository at this point in the history

  2. Merge branch '0.14.x' of github.com:learningequality/ka-lite into cen… 

    …tral-develop
    @jamalex
    jamalex committed Jul 24, 2015
    Configuration menu
    Copy the full SHA
    cabc30f View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2015

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

    0.14.x into central-develop
    @jamalex
    jamalex committed Jul 25, 2015
    Configuration menu
    Copy the full SHA
    2a5fa54 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2015

  1. Softload KHAN_ASSESSMENT_ITEM_DATABASE_PATH in case DB not defined.

    @jamalex
    jamalex committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    590752e View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2015

  1. Merge pull request #4171 from jamalex/central_server_fixes 

    Updating central-develop from 0.14.x (plus additional fix from #4170)
    @jamalex
    jamalex committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    1f87909 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2015

  1. Merge pull request #4207 from jamalex/securesync_fixes 

    Update central-develop from 0.14.x (plus some incoming fixes)
    @jamalex
    jamalex committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    8adb6f3 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2015

  1. Merge pull request #4230 from rtibbles/zone_space_coach_reports 

    Zone space coach reports
    @jamalex
    jamalex committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    68c6ffe View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4236 from rtibbles/zone_space_coach_reports 

    Zone space coach reports
    @jamalex
    jamalex committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    30f8bd1 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2015

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

    0.14.x into central-develop
    @jamalex
    jamalex committed Aug 15, 2015
    Configuration menu
    Copy the full SHA
    6f62e04 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2015

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

    @jamalex
    jamalex committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    41923fc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4252 from jamalex/safer_removal_recursion_14 

    Update central-develop from 0.14.x (plus some more incoming fixes)
    @jamalex
    jamalex committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    d6abcae View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4255 from jamalex/fix_container_overflow 

    Fix container-inside-container overflow issue.
    @jamalex
    jamalex committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    0c49a77 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2015

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

    0.14.x to central-develop
    @aronasorman
    aronasorman committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    fbc2912 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2015

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

    Conflicts:
	kalite/distributed/static/js/distributed/base/baseview.js
	kalite/playlist/static/js/playlist/assign_playlists.js
	static-libraries/js/khan-lite.js
    @MCGallaspy
    MCGallaspy committed Sep 18, 2015
    Configuration menu
    Copy the full SHA
    c01942e View commit details
    Browse the repository at this point in the history

  2. Remove duplicate TestCase subclass 

    TestUrlConversion is defined twice... one was clearly inadvertantly left in, since
  the other has the same tests, but updated.
    @MCGallaspy
    MCGallaspy committed Sep 18, 2015
    Configuration menu
    Copy the full SHA
    719921a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4455 from MCGallaspy/central-develop 

    Remove duplicate TestCase subclass
    @MCGallaspy
    MCGallaspy committed Sep 18, 2015
    Configuration menu
    Copy the full SHA
    361834b View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2015

  1. Add get_cookie to base module & global scope 

    Add it to the global scope, so that it can be accessed by inline JS
  in central server templates.
    @MCGallaspy
    MCGallaspy committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    1323db0 View commit details
    Browse the repository at this point in the history

  2. Do not use os-specific separator

    @MCGallaspy
    MCGallaspy committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    cd4cb41 View commit details
    Browse the repository at this point in the history

  3. Massage the Popen arguments into windows form 

    On windows we need to specify the python interpreter for invoking bin/kalite.
    @MCGallaspy
    MCGallaspy committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    e418511 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4465 from MCGallaspy/central-develop 

    Add get_cookie to base module & global scope
    @rtibbles
    rtibbles committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    4951c10 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2015

  1. Merge pull request #4498 from MCGallaspy/central-develop 

    Massage the Popen arguments into windows form
    @rtibbles
    rtibbles committed Sep 24, 2015
    Configuration menu
    Copy the full SHA
    90d20c6 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2015

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

    0.15.x into central-develop
    @rtibbles
    rtibbles committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    d7cdc84 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2015

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

    0.15.x to central-develop
    @aronasorman
    aronasorman committed Nov 24, 2015
    Configuration menu
    Copy the full SHA
    dc56afc View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2016

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

    @aronasorman
    aronasorman committed Mar 17, 2016
    Configuration menu
    Copy the full SHA
    c789b22 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2016

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

    Update central-develop to 0.16.x
    @jamalex
    jamalex committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    bf2cfa4 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2016

  1. Merge pull request #5034 from jamalex/pin_npm_versions 

    Pin npm versions
    @jamalex
    jamalex committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    cb25c26 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2016

  1. Add options object to reference org_id from to ZoneSelectView in data… 

    … exports.
    @rtibbles
    rtibbles committed Apr 20, 2016
    Configuration menu
    Copy the full SHA
    45cc3e4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5095 from rtibbles/central-develop-org-id 

    Add options object to reference org_id from to ZoneSelectView in data…
    @jamalex
    jamalex committed Apr 20, 2016
    Configuration menu
    Copy the full SHA
    a118a2d View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2016

  1. Remove .gitmodules file causing RTD to break

    Benjamin Bach committed Nov 14, 2016
    Configuration menu
    Copy the full SHA
    bdf518c View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2016

  1. Remove unused submodule for RTD to build

    Benjamin Bach committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    635c5ea View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2017

  1. Make version visible in docs for installation guide - fixes #5165

    Benjamin Bach committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    a2b59b0 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2017

  1. Fix wrong message about overwriting database when there is none: 

    Simplify some of the reasoning around whether a database exists at a clean install
    Benjamin Bach committed Aug 19, 2017
    Configuration menu
    Copy the full SHA
    cc760cf View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2019

  1. Merge remote-tracking branch 'upstream/master' into 0.17.x

    Benjamin Bach committed Jan 12, 2019
    Configuration menu
    Copy the full SHA
    1ba44dc View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into 0.17.x-master

    Benjamin Bach committed Jan 12, 2019
    Configuration menu
    Copy the full SHA
    3b4bd80 View commit details
    Browse the repository at this point in the history

  3. Always raise an error when importing from django.contrib.gis

    Benjamin Bach committed Jan 12, 2019
    Configuration menu
    Copy the full SHA
    768629a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5591 from benjaoming/0.17.x-master 

    master into 0.17.x
    @benjaoming
    benjaoming authored Jan 12, 2019
    Configuration menu
    Copy the full SHA
    d5a3462 View commit details
    Browse the repository at this point in the history

  5. release note for libgeos fix [ci-skip]

    Benjamin Bach committed Jan 12, 2019
    Configuration menu
    Copy the full SHA
    56bee65 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2019

  1. Merge pull request #5592 from benjaoming/gis-fix 

    Always raise an error when importing from django.contrib.gis
    @benjaoming
    benjaoming authored Mar 7, 2019
    Configuration menu
    Copy the full SHA
    703b862 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2019

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

    Final 0.16.3

 - Fixes #5087 related to certain Linux kernel version labels
 - Few docs changes
    Benjamin Bach committed Jul 4, 2019
    Configuration menu
    Copy the full SHA
    3555f82 View commit details
    Browse the repository at this point in the history

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

    Benjamin Bach committed Jul 4, 2019
    Configuration menu
    Copy the full SHA
    9272dcf View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2019

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

    Benjamin Bach committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    3fccd47 View commit details
    Browse the repository at this point in the history

  2. Remove duplicated line

    Benjamin Bach committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    a56efba View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2019

  1. Remove unused JS and cherry-picked CSS from #3033

    Benjamin Bach committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    54bc417 View commit details
    Browse the repository at this point in the history

  2. Remove unused .json file from #3033

    Benjamin Bach committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    650a95d View commit details
    Browse the repository at this point in the history

  3. Remove Nalanda-specific code from #3033

    Benjamin Bach committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    e554397 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2019

  1. call_outside_command_with_output moved to central server

    Benjamin Bach committed Jul 17, 2019
    Configuration menu
    Copy the full SHA
    338fc49 View commit details
    Browse the repository at this point in the history

  2. Remove debug statement

    Benjamin Bach committed Jul 17, 2019
    Configuration menu
    Copy the full SHA
    f2ae87c View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2019

  1. Remove unreferenced JS library jquery.cookie.js

    Benjamin Bach committed Sep 2, 2019
    Configuration menu
    Copy the full SHA
    5161c9b View commit details
    Browse the repository at this point in the history

  2. Unify approach from 0.17.x and central-develop

    Benjamin Bach committed Sep 2, 2019
    Configuration menu
    Copy the full SHA
    bc367a0 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2019

  1. Add missing field description and expand Version length

    Benjamin Bach committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    6dd0c9d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5595 from benjaoming/central-develop-into-0.17.x 

    central-develop into 0.17.x [WIP]
    Benjamin Bach authored Sep 3, 2019
    Configuration menu
    Copy the full SHA
    fe802df View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2019

  1. Merge pull request #5597 from benjaoming/fix-version-issue 

    Add missing field description and expand Version length
    Benjamin Bach authored Sep 7, 2019
    Configuration menu
    Copy the full SHA
    42a573d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5506 from benjaoming/fix-database-move-message 

    Fix database move message
    Benjamin Bach authored Sep 7, 2019
    Configuration menu
    Copy the full SHA
    e269639 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

  1. Clean up test requirements a bit

    Benjamin Bach committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    33830f4 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2019

  1. Re-introduce testing commands, used by ecosystem tests on centralserver

    Benjamin Bach committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    478c9a6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5601 from benjaoming/reintroduce-testing-commands 

    Re-introduce testing commands, used by ecosystem tests on centralserver
    Benjamin Bach authored Sep 12, 2019
    Configuration menu
    Copy the full SHA
    7f8a3ae View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2019

  1. Bump requests to latest version, fix import error in non-vendored pac… 

    …kage
    Benjamin Bach committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    894069e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5608 from benjaoming/requests-upgrade 

    Bump requests to latest version
    Benjamin Bach authored Oct 28, 2019
    Configuration menu
    Copy the full SHA
    3fa70f9 View commit details
    Browse the repository at this point in the history

  3. Fix re-added column in South migration

    Benjamin Bach committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    4340aa2 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2019

  1. Merge pull request #5610 from benjaoming/fix-migration 

    Fix re-added column in South migration
    Benjamin Balder Bach authored Oct 29, 2019
    Configuration menu
    Copy the full SHA
    d5f286b View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2019

  1. Merge pull request #5600 from benjaoming/req-clean 

    Clean up test requirements a bit
    Benjamin Balder Bach authored Nov 1, 2019
    Configuration menu
    Copy the full SHA
    2c64bb3 View commit details
    Browse the repository at this point in the history

  2. Using pip install -t had also compiled pyc files for the local platform

    Benjamin Bach committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    3da6bc4 View commit details
    Browse the repository at this point in the history

  3. Update release notes

    Benjamin Bach committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    5184c7c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5611 from benjaoming/fix-pyc-files-in-dist 

    Fix pyc files in dist
    Benjamin Balder Bach authored Nov 1, 2019
    Configuration menu
    Copy the full SHA
    41b403d View commit details
    Browse the repository at this point in the history

  5. Point to staging.kalite.learningequality.org when developing

    Benjamin Bach committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    475e81e View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2019

  1. Merge pull request #5613 from benjaoming/fix-dev-settings-staging 

    Point to staging.kalite.learningequality.org when developing
    Benjamin Balder Bach authored Nov 2, 2019
    Configuration menu
    Copy the full SHA
    a0242d7 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2019

  1. Fix issues with sync'ing being slow or timing out #5614

    Benjamin Bach committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    b921e6b View commit details
    Browse the repository at this point in the history

  2. Ensure an understandable log by logging django requests

    Benjamin Bach committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    2871915 View commit details
    Browse the repository at this point in the history

  3. Add release notes

    Benjamin Bach committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    e65b7ab View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5615 from benjaoming/fix-sync-issues 

    Fix sync issues
    Benjamin Balder Bach authored Nov 8, 2019
    Configuration menu
    Copy the full SHA
    c58d603 View commit details
    Browse the repository at this point in the history

  5. Ignore build artifact kalite/VERSION

    Benjamin Bach committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    88f23c4 View commit details
    Browse the repository at this point in the history

  6. Improve feedback from AssertionError

    Benjamin Bach committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    472a946 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #5616 from benjaoming/ignore-VERSION 

    Ignore build artifact kalite/VERSION
    Benjamin Balder Bach authored Nov 8, 2019
    Configuration menu
    Copy the full SHA
    c5d43df View commit details
    Browse the repository at this point in the history

  8. Merge pull request #5617 from benjaoming/testing-feedback 

    Improve feedback from AssertionError
    Benjamin Balder Bach authored Nov 8, 2019
    Configuration menu
    Copy the full SHA
    1a2baff View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2019

  1. centralserver imports (albeit hackish) should anticipate a sane path … 

    …environment
    Benjamin Bach committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    6c46b2a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5618 from benjaoming/centralserver-imports 

    Anticipate a sane path environment on central server
    Benjamin Balder Bach authored Nov 14, 2019
    Configuration menu
    Copy the full SHA
    6e60f6f View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2019

  1. Fix an unstable test utility

    Benjamin Bach committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    00d95e9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5621 from benjaoming/unstable-test 

    Fix an unstable test utility
    Benjamin Balder Bach authored Nov 25, 2019
    Configuration menu
    Copy the full SHA
    0cf4f79 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2019

  1. CSP header should not block development Central Server

    Benjamin Bach committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    504a23f View commit details
    Browse the repository at this point in the history

  2. Fixes control panel errors occurring in certain cases on Central Server

    Benjamin Bach committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    3c38e10 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #5623 from benjaoming/fix-control-panel-central 

    Fixes control panel errors occurring in certain cases on Central Server
    Benjamin Balder Bach authored Dec 3, 2019
    Configuration menu
    Copy the full SHA
    8937a36 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5622 from benjaoming/fix-csp-dev 

    CSP header should not block development Central Server
    Benjamin Balder Bach authored Dec 3, 2019
    Configuration menu
    Copy the full SHA
    64fe3fd View commit details
    Browse the repository at this point in the history

  5. Fix a typo in decorator pattern

    Benjamin Bach committed Dec 3, 2019
    Configuration menu
    Copy the full SHA
    4437ff0 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5624 from benjaoming/fix-control-panel-central 

    Fix a typo in decorator pattern
    Benjamin Balder Bach authored Dec 3, 2019
    Configuration menu
    Copy the full SHA
    3d698ec View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2019

  1. Add missing *not* in exception help text

    Benjamin Bach committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    1aff2dc View commit details
    Browse the repository at this point in the history

  2. Fix missing test data for video logs

    Benjamin Bach committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    eadd414 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2020

  1. Unpin Python versions to avoid security warnings

    Benjamin Bach committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    ddb54b1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5625 from benjaoming/missing-not 

    Central server test-related fixes
    Benjamin Balder Bach authored Jan 17, 2020
    Configuration menu
    Copy the full SHA
    524b1c5 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2020

  1. Add upper bounds to some libs, setuptools fails on Py 3.4

    Benjamin Bach committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    d8c6f7b View commit details
    Browse the repository at this point in the history

  2. Upper bound httplib2 because of upstream bug

    Benjamin Bach committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    e817236 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #5626 from benjaoming/pipeline-bump 

    Upper bounds and unpinned Python versions for build pipeline
    Benjamin Balder Bach authored Jan 19, 2020
    Configuration menu
    Copy the full SHA
    e645658 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2020

  1. WIP Circle CI 2.0 conf

    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    458d7a8 View commit details
    Browse the repository at this point in the history

  2. Downgrade Node

    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    9c55360 View commit details
    Browse the repository at this point in the history

  3. Fix a wrongly wrapped line

    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    f894019 View commit details
    Browse the repository at this point in the history

  4. tests to require build to be completed

    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    7ca504b View commit details
    Browse the repository at this point in the history

  5. update old pattern for adding geckodriver to path

    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    feb2da0 View commit details
    Browse the repository at this point in the history

  6. Make nothing parallel, Dockerized w/ artifacts etc. is not a rabbit h… 

    …ole to venture into now
    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    ebd04b1 View commit details
    Browse the repository at this point in the history

  7. Upgrade pip before installing virtualenv 

    Issue: pypa/virtualenv#1630
    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    a6942a4 View commit details
    Browse the repository at this point in the history

  8. Expand sleep step due to a timeout (exit status 5) in previous `kalit… 

    …e status`
    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    529831d View commit details
    Browse the repository at this point in the history

  9. Put an upper bould on pex

    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    6f7af73 View commit details
    Browse the repository at this point in the history

  10. Debug firefox version

    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    d858195 View commit details
    Browse the repository at this point in the history

  11. Try bionic for builds due to Python 3.4 incompatibility in newer virt… 

    …ualenvs
    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    59c7015 View commit details
    Browse the repository at this point in the history

  12. Change Firefox version (v75 did not work w/ current Selenium/geckodri… 

    …ver stack)
    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    0481ee1 View commit details
    Browse the repository at this point in the history

  13. Add orb to use older Firefox

    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    436ebff View commit details
    Browse the repository at this point in the history

  14. Pin nodejs version because of Bionic update

    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    c26940e View commit details
    Browse the repository at this point in the history

  15. Disable installing geckodriver in script

    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    29b8b33 View commit details
    Browse the repository at this point in the history

  16. nodejs repository is borked so don't pin... 6.14 is reported, althoug… 

    …h 6.17 is the latest hmm
    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    c5c6cda View commit details
    Browse the repository at this point in the history

  17. Bump Firefox to v55

    Benjamin Bach committed May 25, 2020
    Configuration menu
    Copy the full SHA
    d069371 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2020

  1. Specify Python 3.5 (from Vader build server)

    Benjamin Bach committed May 26, 2020
    Configuration menu
    Copy the full SHA
    b8dc3ea View commit details
    Browse the repository at this point in the history

  2. Try latest Firefox and geckodriver

    Benjamin Bach committed May 26, 2020
    Configuration menu
    Copy the full SHA
    a3b3b76 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Fix a syntax error

    Benjamin Bach committed May 28, 2020
    Configuration menu
    Copy the full SHA
    3c9eb77 View commit details
    Browse the repository at this point in the history

  2. Update selenium following tests w/ Firefox 76 and geckodriver 0.26.0

    Benjamin Bach committed May 28, 2020
    Configuration menu
    Copy the full SHA
    024e77c View commit details
    Browse the repository at this point in the history

  3. Move sauceclient import to local scope, since it's not a dependency

    Benjamin Bach committed May 28, 2020
    Configuration menu
    Copy the full SHA
    dc12c58 View commit details
    Browse the repository at this point in the history

  4. Simple fix for failing test

    Benjamin Bach committed May 28, 2020
    Configuration menu
    Copy the full SHA
    8b0f54f View commit details
    Browse the repository at this point in the history

  5. Suspecting bad test isolation, move bdd-only tests to run after no-bdd

    Benjamin Bach committed May 28, 2020
    Configuration menu
    Copy the full SHA
    52cc6b4 View commit details
    Browse the repository at this point in the history

  6. Skip unreliable test cases which are not assumed to actually be broke… 

    …n / harmless
    Benjamin Bach committed May 28, 2020
    Configuration menu
    Copy the full SHA
    2d144e6 View commit details
    Browse the repository at this point in the history

  7. Disable 3 more tests that turned out unreliable

    Benjamin Bach committed May 28, 2020
    Configuration menu
    Copy the full SHA
    578fe27 View commit details
    Browse the repository at this point in the history

  8. Disable jshint

    Benjamin Bach committed May 28, 2020
    Configuration menu
    Copy the full SHA
    00387b6 View commit details
    Browse the repository at this point in the history

  9. Disable artifact upload to Google Cloud, it is not necessary and buggy

    Benjamin Bach committed May 28, 2020
    Configuration menu
    Copy the full SHA
    923aa17 View commit details
    Browse the repository at this point in the history

  10. Update the Getting Started instructions for developers

    Benjamin Bach committed May 28, 2020
    Configuration menu
    Copy the full SHA
    da9ca76 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2020

  1. Collect coverage for kalite management commands invoked

    Benjamin Bach committed May 29, 2020
    Configuration menu
    Copy the full SHA
    22af528 View commit details
    Browse the repository at this point in the history

  2. Add test of the setup command

    Benjamin Bach committed May 29, 2020
    Configuration menu
    Copy the full SHA
    b16d38d View commit details
    Browse the repository at this point in the history

  3. Disabling unreliable test - StaleElementReferenceException

    Benjamin Bach committed May 29, 2020
    Configuration menu
    Copy the full SHA
    c72582a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5627 from benjaoming/circle-ci-2 

    Circle CI 2.1 conf
    Benjamin Balder Bach authored May 29, 2020
    Configuration menu
    Copy the full SHA
    e85c24b View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2021

  1. Scrubbed mentions of torrent and added warning to use Kolibri

    @radinamatic
    radinamatic committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    02447ac View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5630 from radinamatic/update-docs 

    Scrubbed mentions of torrent and added warning to use Kolibri
    @radinamatic
    radinamatic authored Apr 16, 2021
    Configuration menu
    Copy the full SHA
    7894f84 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2021

  1. Update the image to show the proper font

    @radinamatic
    radinamatic committed Apr 19, 2021
    Configuration menu
    Copy the full SHA
    81f326c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5632 from radinamatic/update-docs 

    Update the image to show the Proxima Nova font
    @radinamatic
    radinamatic authored Apr 19, 2021
    Configuration menu
    Copy the full SHA
    8cd9579 View commit details
    Browse the repository at this point in the history