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

Updating central-develop from 0.14.x #4084

Merged
merged 47 commits into from
Jul 11, 2015
Merged

Updating central-develop from 0.14.x #4084

merged 47 commits into from
Jul 11, 2015

Conversation

jamalex
Copy link
Member

@jamalex jamalex commented Jul 11, 2015

No description provided.

benjaoming and others added 30 commits July 2, 2015 01:58
@benjaoming
Clean up settings regarding config packages, removing the demo one. A…
25fdac7 
…dd deprecation warnings. Move screenshot stuff to kalite.project.settings.screenshots ( @MCGallaspy )
@benjaoming
user configuration for raspberry pi added and automatic setup of init…
5e2ef5e 
….d script
@benjaoming
fix grep statement, add dialogue before creating init.d config
84cdd1d
@benjaoming
Rename script to be easier to find
474f1a8
@benjaoming
generalize deprecation warning message
0f42add
@benjaoming
CONFIG_PACKAGE has to be initialized
8087c94
@benjaoming
update wsgi config to new standards
cd583ab
@benjaoming
Re-ordering installation chapters to be more logical
d895132
@benjaoming
Removing invalid entry install_rasp_pi
dbc76b5
@benjaoming
add settings for screenshots
3a5e605
@benjaoming
Use RTD theme, add screenshots_ship config option, fix various syntax…
9efee40 
… and formatting errors
@benjaoming
Use consistent screenshot names so screenshots can be re-used
1f18e82
@benjaoming
remove py 2.6 req, not building on that
1914ce9
@benjaoming
do not truncate screenshots when skipping, skip by default, do not im…
9c8b564 
…port heavy dependencies unless needed
@benjaoming
Move to conventional location
0bd02de
@benjaoming
ignore new location of docs
b70ee2e
@benjaoming
resize screenshots so they are readable
b47928e
@radinamatic
Adding the server restart requirement after language packs download/u…
0aba821 
…pdate.
@benjaoming
Merge branch 'restart_reqs_docs' of https://github.com/radinamatic/ka…
a2de786 
…-lite into raspberry_pi_finalizations

Conflicts:
	docs/screenshot.py
@benjaoming
Return code 0 on "kalite stop" when already stopped
0117bb3
@benjaoming
Merge branch '0.14.x' of github.com:learningequality/ka-lite into ras…
7d31312 
…pberry_pi_finalizations
@benjaoming
implement mike's learningequality#4048
97d37ca
@benjaoming
Merge branch '0.14.x' into raspberry_pi_finalizations
38ab3c0 
Conflicts:
	docs/screenshot.py
@benjaoming
Also fail on broken -x 123, should be -x123 for now
c306a03
@jamalex
Do not attempt to load assessment items on the central server.
8ea04ca
@aronasorman
explicitly recognize the --settings option, and set the
a65f81e 
DJANGO_SETTINGS_MODULE with it.

This will allow 'kalite start' to work with a custom settings module
specified with --settings=<module>.
@MCGallaspy
Merge pull request learningequality#4046 from benjaoming/return-code-…
2b7a892 
…already-stopped

Return code 0 on "kalite stop" when already stopped
@radinamatic
Adding the server restart requirement after language packs download/u…
e4431c6 
…pdate.

Correcting the link for server restart.

Updating cross-reference with :ref: role.
@MCGallaspy
Remove kalite.css
13ce1fa
@MCGallaspy
Clarify bundled vs non-bundled kalite package
018e592
MCGallaspy and others added 17 commits July 9, 2015 14:31
@MCGallaspy
Update uninstall directions
3181098
@MCGallaspy
Remove errant print stmt
e16be65
@MCGallaspy
Fix heading
e29a8d3
@MCGallaspy
Fixup in settings
bbbfdd9
@MCGallaspy
Make sure xvfb display is always stopped
f5d4d3a
@MCGallaspy
remove problematic req
726c45d
@MCGallaspy
use consistent subheadings
2168370
@MCGallaspy
Merge branch '0.14.x' of https://github.com/learningequality/ka-lite …
4b7e60c 
…into raspberry_pi_finalizations

Conflicts:
	requirements_dev.txt
@MCGallaspy
Merge pull request learningequality#4075 from MCGallaspy/raspberry_pi…
6fcf998 
…_finalizations

Update installation docs, Raspberry Pi finalization + settings module / config package cleanup
@MCGallaspy
Merge remote-tracking branch 'radina/restart_reqs_docs' into 0.14.x
3ca0f27 
Conflicts:
	docs/usermanual/userman_admin.rst
@MCGallaspy
Merge pull request learningequality#4061 from benjaoming/option-failu…
5409cc5 
…re-fix

Also fail on broken -x 123, should be -x123 for now
@benjaoming
add conditional
fb3f57d
@aronasorman
Merge pull request learningequality#19 from benjaoming/respect-your-s…
bfd791a 
…ettings2

add conditional
@rtibbles
Merge pull request learningequality#4068 from aronasorman/respect-you…
1ead450 
…r-settings

explicitly recognize the --settings option, and set the
@rtibbles
Merge pull request learningequality#4063 from jamalex/do_not_load_ass…
e3fe48d 
…essment_items_on_central_server

Do not attempt to load assessment items on the central server.
@jamalex
Update setup command with correct link and better version display.
47c8490
@jamalex
Add "--no-assessment-items" option to setup command, for central server
b0e5c0a
@jamalex jamalex added the has PR label Jul 11, 2015
jamalex added a commit that referenced this pull request Jul 11, 2015
@jamalex
Merge pull request #4084 from jamalex/setup_fixes
c682fa4 
Updating central-develop from 0.14.x
@jamalex jamalex merged commit c682fa4 into learningequality:central-develop Jul 11, 2015
@jamalex jamalex removed the has PR label Jul 11, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jamalex @benjaoming @radinamatic @aronasorman @MCGallaspy @rtibbles