Download as
Browse Code »

Commit 166a69fb877359fa9f4397b3200fe6345f06e659

Authored by Sergio Oliveira
2 parents 391c7119 e32b47e8
Exists in master and in 31 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd

Merge branch 'fix_master'

Showing 7 changed files with 22 additions and 49 deletions   Show diff stats
Vagrantfile
  Diff comments   View file @166a69f
... ... @@ -9,22 +9,28 @@
9 9 default_box = "precise64"
10 10 if $stdin.isatty
11 11 if Dir.glob(File.join(File.dirname("__FILE__"), '.vagrant/**/id')).empty?
  12 + options = ["precise64", "trusty64", "chef/centos-7.0"]
  13 +
12 14 puts "Bases boxes available locally:"
13 15 puts '------------------------------'
14 16 system('vagrant', 'box', 'list')
15 17 puts
16 18 puts 'Base boxes we can provide you:'
17 19 puts '------------------------------'
18   - puts 'precise64 (virtualbox)'
19   - puts 'trusty64 (virtualbox)'
20   - puts 'chef/centos-7.0 (virtualbox)'
21   - puts
  20 + options.each_with_index do |value, i|
  21 + puts "[#{i + 1}] #{value}"
  22 + end
  23 +
22 24 print "Which box to use [#{default_box}]: "
23 25 choice = $stdin.gets.strip
24   - if !choice.empty?
25   - default_box = choice
  26 + options.each_with_index do |option, i|
  27 + if option == choice || choice.to_i == (i + 1)
  28 + default_box = option
  29 + puts default_box
  30 + break
  31 + end
26 32 end
27   - end
  33 + end
28 34 end
29 35  
30 36 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
... ...
colab/accounts/search_indexes.py
  Diff comments   View file @166a69f
... ... @@ -22,7 +22,6 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):
22 22 google_talk = indexes.CharField(model_attr='google_talk', null=True,
23 23 stored=False)
24 24 webpage = indexes.CharField(model_attr='webpage', null=True, stored=False)
25   - message_count = indexes.IntegerField(stored=False)
26 25  
27 26 def get_model(self):
28 27 return User
... ...
colab/settings.py
  Diff comments   View file @166a69f
... ... @@ -244,7 +244,6 @@ TASTYPIE_DEFAULT_FORMATS = ['json', ]
244 244  
245 245 from .utils.conf import load_colab_apps, load_py_settings
246 246  
247   -BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False
248 247 SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False
249 248  
250 249 locals().update(load_colab_apps())
... ...
colab/templates/header.html
  Diff comments   View file @166a69f
... ... @@ -37,21 +37,13 @@
37 37 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
38 38 <ul class="dropdown-menu">
39 39 {% trans 'Login' as login_text %}
40   - {% if BROWSERID_ENABLED %}
41   - <li>{% browserid_login text=login_text %}</li>
42   - {% else %}
43   - <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
44   - <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
45   - {% endif %}
  40 + <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
  41 + <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
46 42 </ul>
47 43 </li>
48 44 {% trans 'Login' as login_text %}
49   - {% if BROWSERID_ENABLED %}
50   - <li class="visible-xs hidden-sm hidden-md">{% browserid_login text=login_text %}</li>
51   - {% else %}
52   - <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
53   - <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
54   - {% endif %}
  45 + <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
  46 + <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
55 47 {% else %}
56 48 <li id="user-menu" class="dropdown">
57 49 <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
... ... @@ -66,11 +58,7 @@
66 58 <div>
67 59 <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
68 60 {% trans 'Logout' as logout_text %}
69   - {% if BROWSERID_ENABLED %}
70   - {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
71   - {% else %}
72   - <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
73   - {% endif %}
  61 + <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
74 62 </div>
75 63 </div>
76 64 </li>
... ...
setup.py
  Diff comments   View file @166a69f
... ... @@ -7,16 +7,13 @@ REQUIREMENTS = [
7 7 'pytz>=2011n',
8 8 'django-hitcounter>=0.1.1',
9 9 'django-tastypie>=0.12.1',
10   - 'django-revproxy>=0.9.0',
  10 + 'django-revproxy>=0.9.3',
11 11 'django-haystack>=2.2',
12 12 'Whoosh>=2.7.0',
13 13  
14 14 # Diazo
15 15 'diazo>=1.0.5',
16 16  
17   - # Deps for Single SignOn (SSO)
18   - 'django-browserid>=0.11',
19   -
20 17 ### Move out of colab (as plugins):
21 18  
22 19 # Deps for badger
... ... @@ -31,6 +28,7 @@ REQUIREMENTS = [
31 28  
32 29 # Deps for gitlab plugin
33 30 'python-dateutil>=1.5',
  31 + 'requests',
34 32  
35 33 # Converse.js (XMPP client)
36 34 'django-conversejs>=0.3.4',
... ...
vagrant/centos.sh
  Diff comments   View file @166a69f
... ... @@ -19,7 +19,7 @@ fi
19 19  
20 20 yum -y groupinstall "Development tools"
21 21  
22   -yum install -y git unzip mercurial libev-devel gettext libxml2-devel libxslt-devel openssl-devel libffi-devel libjpeg-turbo-devel zlib-devel freetype-devel postgresql-devel python-devel postgresql-server java
  22 +yum install -y git unzip mercurial libev-devel gettext libxml2-devel libxslt-devel openssl-devel libffi-devel libjpeg-turbo-devel zlib-devel freetype-devel postgresql-devel python-devel postgresql-server java epel-release
23 23  
24 24 ### Install Virtualenvwrapper
25 25 which pip2.7 > /dev/null ||
... ... @@ -60,3 +60,4 @@ sudo -u postgres -i createdb --owner=colab colab 2&gt; /dev/null | echo
60 60  
61 61 ### Forcing postgresql to start at boot
62 62 sudo chkconfig postgresql on
  63 +
... ...
vagrant/provision.sh
  Diff comments   View file @166a69f
... ... @@ -36,21 +36,3 @@ fi
36 36 colab-admin migrate
37 37 colab-admin loaddata /vagrant/tests/test_data.json
38 38  
39   -
40   -### Install solr
41   -
42   -colab-admin build_solr_schema -f /tmp/schema.xml
43   -
44   -export SOLR_VERSION=4.10.3
45   -export SOLR_CONFS="/tmp/schema.xml"
46   -
47   -$basedir/ci/install_solr.sh
48   -/home/vagrant/solr-4.10.3/bin/solr stop -p 8983
49   -
50   -# Init.d Solr files
51   -sudo cp $basedir/vagrant/misc/etc/init.d/solr /etc/init.d/
52   -cp $basedir/vagrant/solr/start.sh /home/vagrant/solr-$SOLR_VERSION
53   -sudo chkconfig --add solr
54   -sudo service solr start
55   -
56   -colab-admin rebuild_index --noinput
... ...