Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
cb44752
FAIL: Better home and forms
daonb Oct 22, 2013
45e4328
Merge branch 'dev' of github.com:hasadna/ok-qa into dev
daonb Oct 22, 2013
83b44b1
A permalink for the default avatar
daonb Oct 22, 2013
fed2970
merge
daonb Oct 22, 2013
fd20efb
polish to the home - #TODO move entity_from to top
daonb Oct 22, 2013
e133239
Merge branch 'dev' of github.com:hasadna/ok-qa into dev
daonb Oct 22, 2013
979934b
fab commands now flush the cache
daonb Oct 22, 2013
5307921
better default avatar
daonb Oct 22, 2013
245d28c
need to find an easier way to change the avatar..."
daonb Oct 22, 2013
8697000
Fixing linux installation instructions
daonb Oct 22, 2013
d07dbbc
Installation improvements for big server
daonb Oct 22, 2013
4449b6a
the right avatar
daonb Oct 23, 2013
62ea1fb
fix a couple of annoying server errors
tbrisker Oct 24, 2013
a65e8a7
fix another annoying error
tbrisker Oct 25, 2013
b49082c
even better error handling
tbrisker Oct 25, 2013
f10b18c
Merge branch 'master' of github.com:hasadna/open-shot into dev
daonb Oct 26, 2013
bd76a01
Merge branch 'dev' of github.com:hasadna/open-shot into dev
daonb Oct 26, 2013
d02bb54
Fix Javascript errors in taggit-autosuggest
danielhers Sep 9, 2013
d16010f
Use my clone of django-taggit-autosuggest for the updated js
danielhers Sep 20, 2013
4826426
Try to apply character limit on answer with "clean". Does not work
Oct 21, 2013
6d4eb6b
fix #422 - order candidates in list page
Oct 28, 2013
98874ea
Fix jquery.js inclusion to be in the header instead of footer
danielhers Nov 4, 2013
834275a
Merge pull request #449 from michalten/order_candidates
daonb Nov 6, 2013
dbaf974
Merge pull request #450 from danielhers/autosuggest
daonb Nov 6, 2013
37c7a5c
fixxing settings
daonb Nov 6, 2013
a5a83c0
Merge branch 'dev' of github.com:hasadna/open-shot into dev
daonb Nov 11, 2013
22e19d1
version and admins
daonb Nov 11, 2013
0bd1aa4
Merge branch 'release/1.0.3'
daonb Nov 11, 2013
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ Quick Start - Linux
$ sudo apt-get install git-core mercurial python2.7-dev python-setuptools libjpeg-dev
$ sudo easy_install pip
$ sudo pip install virtualenv
$ virtualenv ENV
$ source ENV/bin/activate
$ git clone https://github.com/hasadna/open-shot.git
$ cd open-shot
$ virtualenv -p /usr/bin/python2.7 ENV
$ source ENV/bin/activate
$ pip install -r requirements.txt
$ python manage.py test
$ python manage.py syncdb --migrate --noinput
Expand Down
2 changes: 2 additions & 0 deletions fabfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def refresh(branch='master'):
with cd('~oshot/src/oshot'):
run('git pull origin ' + branch)
sudo('restart oshot')
run("echo 'flush_all' | netcat localhost 11211 -q 1")

def deploy(branch='master'):
local('git push origin ' + branch)
Expand All @@ -30,3 +31,4 @@ def deploy(branch='master'):
run('honcho run python manage.py migrate --no-initial-data')
run('honcho run python manage.py collectstatic --noinput')
sudo('restart oshot')
run("echo 'flush_all' | netcat localhost 11211 -q 1")
Binary file modified locale/he/LC_MESSAGES/django.mo
Binary file not shown.
Loading