Wrap some other extremely long lines

(imported from commit e7d55f318c8865ca953bf4520d1b07f7e84a4aeb)
This commit is contained in:
Keegan McAllister 2012-10-25 00:11:28 -04:00
parent b0462ebef7
commit f8540dcdae
5 changed files with 23 additions and 7 deletions

View File

@ -1,6 +1,14 @@
#!/bin/sh
# Two quick API tests using curl
curl https://app.humbughq.com/api/v1/send_message -d "api-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" -d "email=tabbott@humbughq.com" -d "type=personal" -d "content=test" -d "recipient=tabbott@humbughq.com"
curl https://app.humbughq.com/api/v1/get_messages -d "api-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" -d "email=tabbott@humbughq.com"
curl https://app.humbughq.com/api/v1/send_message \
-d "api-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \
-d "email=tabbott@humbughq.com" \
-d "type=personal" -d "content=test" \
-d "recipient=tabbott@humbughq.com"
curl https://app.humbughq.com/api/v1/get_messages \
-d "api-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \
-d "email=tabbott@humbughq.com"
# Or replace https://app.humbughq.com with your local test instance

View File

@ -56,7 +56,8 @@ if settings.ALLOW_REGISTER:
urlpatterns += patterns('',
url(r'^accounts/home/', 'zephyr.views.accounts_home', name='accounts_home'),
url(r'^accounts/register/', 'zephyr.views.accounts_register', name='accounts_register'),
url(r'^accounts/send_confirm/(?P<email>[\S]+)?', 'django.views.generic.simple.direct_to_template', {'template': 'zephyr/accounts_send_confirm.html'}, name='send_confirm'),
url(r'^accounts/send_confirm/(?P<email>[\S]+)?', 'django.views.generic.simple.direct_to_template',
{'template': 'zephyr/accounts_send_confirm.html'}, name='send_confirm'),
url(r'^accounts/do_confirm/(?P<confirmation_key>[\w]+)', 'confirmation.views.confirm', name='confirm'),
# Terms of service

View File

@ -29,7 +29,9 @@ define common::append ($file, $line) {
}
class humbug_base {
$packages = [ "screen", "sudo", "strace", "vim", "emacs", "git", "python-tz", "sqlite3", "python-tornado", "python-simplejson", "python-pygments", "ipython", "python-django", "openssh-server", "python-pip", "puppet-el", ]
$packages = [ "screen", "sudo", "strace", "vim", "emacs", "git", "python-tz", "sqlite3",
"python-tornado", "python-simplejson", "python-pygments", "ipython",
"python-django", "openssh-server", "python-pip", "puppet-el", ]
package { $packages: ensure => "installed" }
group { 'humbug':

View File

@ -136,11 +136,13 @@ var is_floating_recipient_bar_showing = false;
function replace_floating_recipient_bar(desired_label) {
if (desired_label !== old_label) {
if (desired_label.children(".message_header_stream").length !== 0) {
$("#current_label_stream td:last").replaceWith(desired_label.children(".message_header_stream.right_part").clone());
$("#current_label_stream td:last").replaceWith(
desired_label.children(".message_header_stream.right_part").clone());
$("#current_label_huddle").css('display', 'none');
$("#current_label_stream").css('display', 'table-row');
} else {
$("#current_label_huddle td:last").replaceWith(desired_label.children(".message_header_huddle.right_part").clone());
$("#current_label_huddle td:last").replaceWith(
desired_label.children(".message_header_huddle.right_part").clone());
$("#current_label_stream").css('display', 'none');
$("#current_label_huddle").css('display', 'table-row');
}

View File

@ -3,4 +3,7 @@ mkdir -p zephyr/fixtures
rm -f zephyr/tests/zephyrdb.test
python manage.py syncdb --noinput --settings=humbug.test_settings
python manage.py populate_db --settings=humbug.test_settings -n20
python manage.py dumpdata --settings=humbug.test_settings auth.User zephyr.UserProfile zephyr.Stream zephyr.Recipient zephyr.Subscription zephyr.Message zephyr.Huddle zephyr.Realm zephyr.UserMessage zephyr.Client > zephyr/fixtures/messages.json
python manage.py dumpdata --settings=humbug.test_settings \
auth.User zephyr.UserProfile zephyr.Stream zephyr.Recipient \
zephyr.Subscription zephyr.Message zephyr.Huddle zephyr.Realm \
zephyr.UserMessage zephyr.Client > zephyr/fixtures/messages.json