Skip to content

0.15.0#4470

Merged
rtibbles merged 682 commits into
masterfrom
0.15.x
Oct 13, 2015
Merged

0.15.0#4470
rtibbles merged 682 commits into
masterfrom
0.15.x

Conversation

@aronasorman

@aronasorman aronasorman commented Sep 23, 2015

Copy link
Copy Markdown
Collaborator

The intention of this PR is to take a look at all the changes made, as well as allow our users to monitor the progress of 0.15. They can subscribe to this PR and be alerted as to when it's merged to master. I also intend to put a summary of new features here in this description.

rtibbles and others added 30 commits September 11, 2015 15:32
@rtibbles
Merge pull request #4420 from learningequality/rtibbles-patch-1
6d28f74 
Add a tunnel identifier to SauceConnect instances for different Circle CI builds and nodes.
@rtibbles
Merge branch '0.15.x' into coach_report_fixes
b146ba8
@MCGallaspy
Merge remote-tracking branch 'upstream/0.15.x' into 4407-cr-reduce-ajax
5f3ff2a
@66eli77
Merge branch '0.15.x' of https://github.com/learningequality/ka-lite …
f4f5d5d 
…into 0.15.x
@MCGallaspy
Merge remote-tracking branch 'upstream/0.15.x' into docs-screenshots-…
1bf17d2 
…fixup
@rtibbles
Reinstate classname required for test. Fix test for new class reference.
4452afd
@rtibbles
Filter completed exercises out of 'next steps' content recommendaton.
d62a3d8
@rtibbles
Render Kind name in Resume. Differentiate Topic link in next steps.
d57d611
@rtibbles
Fixes sidebar back button display.
46d2c46
@rtibbles
Fixes extra white space caused by thumbnail image.
3c4b70b
@rtibbles
Reinstate icons for videojs player.
52c0c2f
@rtibbles
Ensure recursion during path deduplication.
44dfbf2
@rtibbles
Removes unused topic_hierarchy.json.
cfc7c6d
@rtibbles
Updates content caches.
f491bcf
@rtibbles
Imports sprintf.
04504a7
@rtibbles
Merge pull request #4422 from rtibbles/topic_tree_dedup
6df799a 
Deduplicate Topic Tree slugs
@66eli77
Merge branch '0.15.x' of https://github.com/learningequality/ka-lite …
b50233a 
…into 0.15.x
@rtibbles
Default all_assessment_items to empty list, not JSON string.
570b42c
expire sessions every 30 minutes.
47f5031
@66eli77
Merge branch '0.15.x' of https://github.com/learningequality/ka-lite …
409a641 
…into 0.15.x
@rtibbles
Removes error catching for TransactionManagementError during Behave t…
69ee64c 
…ests.
@aronasorman
Merge pull request #4424 from rtibbles/update_language
e7bb877 
Imports sprintf in update app
@rtibbles
Merge pull request #4427 from learningequality/transaction-behave
3ce5e37 
Removes error catching for TransactionManagementError during Behave tests.
@66eli77
Merge pull request #4421 from rtibbles/content_fixes
0218272 
Content bug fixes
@66eli77
Merge branch '0.15.x' of https://github.com/learningequality/ka-lite …
84c956c 
…into 0.15.x
@rtibbles
Merge pull request #4411 from aronasorman/30-minute-rule
35624e8 
expire sessions every 30 minutes.
@rtibbles
Disabled timepicker button rather than hiding and displaying it.
2ad6dbb
@MCGallaspy
Merge pull request #4414 from rtibbles/coach_report_fixes
c538bcd 
Coach report fixes
@MCGallaspy
Gracefully handle failure to connect to saucelabs
f86f281
@MCGallaspy
redirect sc output
d31bf43
mrpau-richard and others added 19 commits October 9, 2015 20:14
@mrpau-richard
Add step to install kalite OS X installer
ad1655d
@mrpau-richard
Update the release notes.
e8f52eb
@cpauya
Merge pull request #4590 from mrpau/4501-final-docs-release-notes
8efdcdb 
Add a note in system_requirements.rst and release_notes.rst.
@aronasorman
Merge pull request #4585 from learningequality/dbbackup-version-update
6cf3eac 
Avoid unnecessary dependencies for old dbbackup version
@aronasorman
Merge pull request #4597 from rtibbles/update_perseus
bd8df62 
Reinstate Khan i18n helpers, overwrite $._ to ensure translation.
@benjaoming
Include docs in sdist and add Makefile for common build, dev, test
f268378
@benjaoming
do not clean before making assets, bad for automated testing scenario
03b6df0
@rtibbles
Fixes doRequest reference.
e8444ab
@rtibbles
Don't try to parse empty responses. Bloody TastyPie.
b2e9ad8
@rtibbles
Translate stuff in the guts of Khan Exercises i18n.
903cf61
@benjaoming
Say 0.16 about the fix for cmd line options
c91c646
@benjaoming
Remove regressions from bad rebase
f7ce373
@benjaoming
fix platform dependent pattern
f01c301
@benjaoming
use @MCGallaspy's wording
435d35a
@rtibbles
Adds additional requires for force_sync.
aa5c0c1
@MCGallaspy
Merge pull request #4565 from benjaoming/makefile-dist-docs
583743c 
Include docs in sdist and add Makefile for common build, dev, test
@MCGallaspy
Fix require stmt
928d890
@rtibbles
Merge pull request #22 from MCGallaspy/fix_js_errors
7a48b87 
Fix require stmt
@MCGallaspy
Merge pull request #4607 from rtibbles/fix_js_errors
7e9f53e 
Fix js errors
@MCGallaspy

MCGallaspy commented Oct 13, 2015

Copy link
Copy Markdown
Contributor

Uh-oh, merge conflicts. This is on my TODO list tomorrow, as I think we are actually really ready to release 0.15.0 now.

@benjaoming

benjaoming commented Oct 13, 2015

Copy link
Copy Markdown
Contributor 
both modified:      data/version.yml
both modified:      kalite/main/api_resources.py
both modified:      kalite/settings/base.py
both modified:      kalite/version.py

@benjaoming
Merge branch 'master' into 0.15.x
b813124 
Conflicts:
	data/version.yml
	kalite/main/api_resources.py
	kalite/settings/base.py
	kalite/version.py
@benjaoming

benjaoming commented Oct 13, 2015

Copy link
Copy Markdown
Contributor

#4621 is resolving conflicts

rtibbles added a commit that referenced this pull request Oct 13, 2015
@rtibbles
Merge pull request #4470 from learningequality/0.15.x
8e1b1ac 
0.15.0
@rtibbles
rtibbles merged commit 8e1b1ac into master Oct 13, 2015
@rtibbles rtibbles removed the has PR label Oct 13, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@aronasorman aronasorman

Labels

None yet

Projects

None yet

Milestone

0.15.0

Development

Successfully merging this pull request may close these issues.