Download as
Browse Code »

Commit cd1013bb8f45121ac494be74d36cf6c3fff8e9a6

Authored by Charles Oliveira
Committed by Sergio Oliveira
1 parent 4b4c1cff
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, 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_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

XMPP now depends on setting CONVERSEJS_ENABLED

Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
colab/accounts/templates/accounts/user_update_form.html
  Diff comments   View file @cd1013b
@@ -179,7 +179,7 @@ $(function() { @@ -179,7 +179,7 @@ $(function() {
179 </div> 179 </div>
180 </div> 180 </div>
181 </div> 181 </div>
182 - 182 + {% if CONVERSEJS_ENABLED %}
183 <div class="row"> 183 <div class="row">
184 <div class="col-lg-12"> 184 <div class="col-lg-12">
185 <div class="panel panel-default"> 185 <div class="panel panel-default">
@@ -197,6 +197,7 @@ $(function() { @@ -197,6 +197,7 @@ $(function() {
197 </div> 197 </div>
198 </div> 198 </div>
199 </div> 199 </div>
  200 + {% endif %}
200 201
201 <div class="row"> 202 <div class="row">
202 <div class="submit"> 203 <div class="submit">