Commit Graph

1186 Commits

Author SHA1 Message Date
Leo Franchi 05564ec0e2 [schema] Add a config option for enabling/disabling push notifications
(imported from commit 5649188cd5e0e4edb6e71559ec7d7fc5e92efaf8)
2013-10-24 14:54:30 -04:00
Allen Rabinovich 3a5276aa4e Settings page changes
Bug fixes

Small fix to integrations and api links

(imported from commit 5944b175fbe0fdc4fdb5ecb3cab4e333127ca353)
2013-10-22 23:28:46 -07:00
Kevin Mehall a32f15aa2f Add Hubot to /integrations.
(imported from commit 1adc564a50ac473a6a117de24283154fc4222cc3)
2013-10-22 13:42:22 -04:00
Steve Howell 3be4641625 Subsume /queries into the main /activity report.
This moves the reports from /queries into six new tabs on the
main /queries report.

(imported from commit e4ccf6e7edfc900d929e85613f21437b40f046ae)
2013-10-22 11:11:54 -04:00
acrefoot e35e2d62b4 In invitation reminders, take advantage of realm names
(imported from commit 68607b015c640529d4d65065ace82a18d57610a3)
2013-10-21 11:33:34 -04:00
acrefoot 1d6e841964 Queue invitation reminder email
The queued email gets deleted if the user signs up before it gets sent.
Otherwise, they are reminded in 2 days that they still haven't signed up.

This addressses Trac #1812

(imported from commit c1bdc09c03ac576b08986e56994de72d52fd293b)
2013-10-21 11:08:38 -04:00
Jessica McKellar a9c7f3a387 [manual] Use the name instead of the domain for the user-visible realm identifier.
Do not push this commit to prod until the historical realm names have
been populated.

(imported from commit a58191d181d2fb2b8b5e9793ea57707b36812cfc)
2013-10-17 13:47:51 -04:00
Steve Howell f2be9f046a Create /queries page with canned queries for Waseem.
These are some queries on API usage, desktop usage, and
Android usage that would be of interest to Waseem.  These
will eventually be subsumed into /activity, but some interim
data issues may make them easier to keep separate for now.

(imported from commit 697a8496cbf4447d557a3fc89f64c1c4d3e67e70)
2013-10-16 23:40:04 -04:00
Jessica McKellar cd62c77e08 integrations: add the Twitter search bot.
(imported from commit 9afca400889baae3b90b53cbe1efa8ccf7b798a7)
2013-10-16 21:26:01 -04:00
Jessica McKellar da3b394a64 Specify the email input type for the email login field.
(imported from commit 2c2ff574627fd7d933512d9bb0585aa948ea536a)
2013-10-15 17:40:16 -04:00
Waseem Daher af16617fcc Use 'www' for API download.
Only www has the cert, apparently, so the old URL complains
if you try to wget it.

(imported from commit 47f8c12b3d2bb8ed47ea92a78b38861fa3ae7bc4)
2013-10-15 14:02:09 -04:00
Jessica McKellar 0dddd80b2b settings: Indicate that bot avatars are optional.
(imported from commit 6603ca8b73286587d9cac0f44097129a2c341d1f)
2013-10-14 13:15:11 -04:00
Steve Howell 3ca1ef9a0a Use custom titles for the activity report.
(imported from commit ed991108715d043d5d21d8e9f7573eaedb21fec1)
2013-10-11 16:29:26 -04:00
Steve Howell 8aaff7c772 Show hours per user in activity report
(imported from commit b2932d725b9886ce962cc8ff0dd7073a0265a46c)
2013-10-11 15:44:42 -04:00
Steve Howell f0512e91e0 Split out bot counts
(imported from commit 2e5afae98a28774f555c45019ebbba778160962b)
2013-10-11 15:32:30 -04:00
Steve Howell 276e14e06a Use Hours, not Minutes, on the activity report.
(imported from commit abe1eb306b6505d61671d526bac7bc116caeba1f)
2013-10-11 15:22:16 -04:00
Steve Howell 671d146bb9 [notify customer] Put "Getting started" higher on the integrations page.
A customer gave us feedback that he didn't see the instructions
to create a bot, because it's below the fold.  Also, the image
was horribly out of date.  I moved the instructions up and
simplified them.

Please follow up with user1@customer10.invalid and thank
him for the feedback, once we push to prod.

(imported from commit 22fe3b3c5f94183c402c10005504b94b35e6f7e4)
2013-10-11 07:58:29 -04:00
acrefoot 98897fe5e3 Queue the day 1 and day 2 Zulip followup emails
Handled by the queue processor for signups. Added a management command
that accomplishes the same task, in case it's needed for manually added users,
or in case we goof and need to remove queued emails for a given user.

This addresses Trac #1807

(imported from commit 6727b82a07fa6a3ea3d827860c9e60fd0602297a)
2013-10-10 19:32:21 -04:00
Allen Rabinovich fe9cc4597f Make settings menu more apparent
(imported from commit 15e5db5c4792d39b54fa5a354f1156cde355160b)
2013-10-09 08:42:54 -07:00
Jessica McKellar 50613af43c Hint on your settings page that you can change per-stream notifications.
Lots of users don't realize you can do this. This commit is probably
not sufficient but is a start.

(imported from commit 730a43c6966b9bc6db1bdd6fb3995953d35ffe89)
2013-10-08 11:10:57 -04:00
Jessica McKellar dbc0c036c3 Update /apps to get the iOS app from the iTunes Store.
(imported from commit 22468bad537ab116f6568d08b0bae83d72e4cb96)
2013-10-08 11:10:53 -04:00
Jessica McKellar 3b7143d3ec Linkify narrows in missed message emails.
This will hopefully incentivize people to click one and get back into
the app.

We'll also need this for digest emails.

(imported from commit 57191c3fcca3b12df93a81e4692bb7eb8ccc83b2)
2013-10-08 10:46:52 -04:00
Allen Rabinovich bb62b816f1 Hello pages fixes: minor layout fixes, new cover image
(imported from commit 744bf64ecab9e37f745f517d376117c5cc123fca)
2013-10-07 13:52:17 -07:00
Steve Howell 498523b278 Remove stray hr tag
(imported from commit 2a7f8a8a960d4651ad386dad7242c92f074a566b)
2013-10-05 18:17:37 -04:00
Steve Howell 0bd06311f0 Move alerts to the bottom of the settings page.
(imported from commit 310f8f29f6ca46ebc2ddb9c30098442a6607255a)
2013-10-05 15:50:04 -04:00
Jeff Arnold bdb8b89c3d Update terms for export compliance
(imported from commit 8f9c692352adf9606a336478c3dd4577105544c2)
2013-10-04 17:49:37 -04:00
Waseem Daher 68e6370447 Rebrand "not in home view" as "muting".
There's one place where we don't really get this right, though,
which is the Streams page -- there's still a checkbox labeled
"include in home view".

I'm basically OK with that.

(imported from commit 55319b57f0c3d005a9937258a55254b9a91ce6ae)
2013-10-04 01:34:58 -04:00
Waseem Daher b64c1f7362 features: Update mention of apps.
(imported from commit 1eab6f46f8ca38f0c81689b43605e16134ec1ec6)
2013-10-04 01:29:18 -04:00
Allen Rabinovich a6889080ce New styles for the portico pages.
(imported from commit 832ad6eb0c2a7be91152d33a6f1ed5d96880839c)
2013-10-03 09:30:21 -07:00
Steve Howell a51f7949b7 Add minutes column to the main Activity tab.
Add the number of person-minutes for the last 24 hours to the
realm report on the main tab of /activity.

(imported from commit 2ff46eacc4c8276ab0407fc6ff9f28f5137f1ed2)
2013-10-03 09:33:51 -04:00
Leo Franchi cd60b8992d Bump API tarball to 0.2.1
(imported from commit d9b0f12a7ad28e8ab3e457737d3bcf1e0b9f7152)
2013-10-02 17:41:21 -04:00
Leo Franchi 54d83a3a36 Add a Codebase integration
(imported from commit d1ea870cd6ac6bf5d00c03d8859d66638d3242e8)
2013-10-02 10:55:17 -04:00
Jessica McKellar 3d1fd4a1e9 Add Redmine integration documentation.
(imported from commit ef68b6e1e97b26b2ba47e6811403c338f93e41af)
2013-09-30 11:30:04 -04:00
Steve Howell a9b3b3ad23 Fix column names in General tab for /activity.
(imported from commit 6be24be9ad022f2b0aa6fddefffd772dfb2ebfd6)
2013-09-26 22:04:50 -04:00
Steve Howell 902185f8fb Add User Profile Count to General tab on /activity.
(imported from commit 231b3d6f2fe48f511d6387e25c2fea5e3accc186)
2013-09-26 22:04:36 -04:00
Waseem Daher 219bbe255b activity: Only make the summary table not-full-width.
For whatever reason, it makes it easier to compare the detail pages
when they are full width, since each column is in a more or less
consistent place every time.

(imported from commit cba47ac1a370884c0397d26d6028248f0b9cc9d7)
2013-09-26 15:29:29 -04:00
Steve Howell 85b7c93bd2 Show count of active sites.
(imported from commit 023c7880cd7784bbbb49589acde9f59aed8f1765)
2013-09-26 14:46:35 -04:00
Steve Howell 430aee6f87 Add a "General" tab to the /activity summary report.
It shows domains and how many active users they have.  A
user is consider active if they have done something at least
as active as updating their pointer in the last day.  Domains
with no meaningful activity in the last two weeks are excluded
from the report.

(imported from commit 700cecfc7f1732e9ac3ea590177da18f75b01303)
2013-09-26 13:20:02 -04:00
Steve Howell e93dce9ce6 Extract activity_table.html template for /activity.
A small functional change here was to eliminate an enormous "Usage"
headline that was already implicit from the tabs.  It would have
complicated the refactoring to try to preserve it, and I don't think
anyone will miss it.

Extracting this template will give us a little more flexibility
to customize future tabs in the /activity page.

(imported from commit bdb0b7030c8ec1e20d4451dc059830c3f5ea7632)
2013-09-26 13:20:02 -04:00
Steve Howell 0950aa45c4 Eliminate the default_tab attribute in ActivityTable.
(Just have the template automatically select the first tab.)

(imported from commit 4a1877c8d3d6215f8e8ad6a184c79bf4eb001001)
2013-09-26 13:20:01 -04:00
Steve Howell 9110ebd208 Improve the UI for /activity.
We are still showing the same data points, but the logic to drill
down on details for a particular realm is now all server side,
not client side, and we are smarter about omitting fields.  In
summary mode, we don't show empty Name or Email columns.  In
detailed mode, we show the realm as a headline instead of a column.

In this version you do lose the ability to see all system users in
the same view, but Waseem is ok with this.

(imported from commit edd2e646ab4cf5783ea64232d0cd621debece8d4)
2013-09-26 13:20:00 -04:00
Steve Howell b8f3b38524 Make /activity client tab order be deterministic.
Use an array of tuples, not a dictionary, for the client tabs.

(imported from commit d0ef09bd7885fbb261227786b90ea2949cea7ab4)
2013-09-26 13:19:59 -04:00
Steve Howell 4d5842cdcd Add summary view to the /activity report.
When you load the activity report, it will just show summary
counts for realms, but if you click on a realm, you will see
details about users in the realms.  You can also click "Show all"
to see an interleaved view of realms and users.

(imported from commit b106557b1fae64d525071afc124b5a8aed319086)
2013-09-25 11:33:11 -04:00
acrefoot c5f8ffc767 Make call_on_each_{message,event} examples more clear
Before these examples weren't obviously blocking calls (they seemed
more like a callback registration, which may make more sense in the future)

(imported from commit 78fdf98d791b19843526437c710901d8dff62e8c)
2013-09-24 16:19:54 -04:00
Steve Howell f00c8d783a Add Phabricator integration instructions
(imported from commit 065d25a64dcb4e1f51938f63df5b1e5538edc7ea)
2013-09-24 16:19:53 -04:00
Waseem Daher 7afd3ecc81 Custom invite text for MIT invitations.
(imported from commit 21b72861e991159eb7faa74809edb8d01027c6c8)
2013-09-20 12:06:26 -04:00
Kevin Mehall 4af8eaaa7a Remove data-toggle="modal" from gear menu links
It makes bootstrap look up the href as a DOM element, which caused
a browser error because the path is not a CSS selector.

(imported from commit 196a5983ae6a31716b14ae577239fe7ab1416226)
2013-09-19 17:30:12 -04:00
Allen Rabinovich 0b9b01e96a Revert to old logo
(imported from commit 0e4ccff295797d36ee89ffb078bef06b5a5edca0)
2013-09-19 13:20:27 -07:00
Kevin Mehall bc36aad698 Show desktop apps alert when tutorial completes
(imported from commit 7719ec798dbcca519fd79ac8da9196e1a862764f)
2013-09-19 13:23:35 -04:00
Allen Rabinovich 1b4ee0c027 An alert informing about the desktop app
(imported from commit 627351b4bcd8caea22c8e83b0a09e18dd08a1ee1)
2013-09-19 13:23:35 -04:00
Jessica McKellar 5a32dc68c8 Fix a bug in the missed message count used for plaintext missed message emails.
We were previously using the true count of unread message for HTML
emails but the number of conversations for plaintext. Make them
consistent.

(imported from commit efb140abcc95faf00631c03580f518ca4d8ef58c)
2013-09-19 11:55:43 -04:00
Allen Rabinovich 5622e59b48 CUSTOMER7-specific left side user list at narrow widths.
(imported from commit 7504d86fe57e4e96f85dee18ede663c542d0144d)
2013-09-18 12:17:32 -07:00
Jessica McKellar c417f3323d Add gear menu items for the apps, integrations, and API.
This will hopefully make them more discoverable.

(imported from commit 931dd7d7ee6d5904ebb1da9c1b810f2e3701b215)
2013-09-18 13:05:19 -04:00
Jessica McKellar 0d55be1e65 Add links to /integrations and /api from the bots section of your settings page.
This is one effort to make them more discoverable.

(imported from commit e07e49e8dbcfcf085550f9732ba48392819cd546)
2013-09-18 13:02:55 -04:00
Leo Franchi 0cf588cd25 Show a warning and action button when @-mentioning someone not on the stream
(imported from commit 464d5a028f6a8f2698683e7317972dc0c7b9e336)
2013-09-17 16:49:47 -04:00
Allen Rabinovich 176346183b Visual updates to the navbar
(imported from commit c55988ce1f1af105662ee4e8c9d4cccf4ef847c2)
2013-09-16 19:29:21 -07:00
Leo Franchi f559d27190 Remove stale new-user and redirect to /hello
(imported from commit e32946dea1512fa2593f3e9023c40a5541289dcd)
2013-09-11 18:10:17 -04:00
Allen Rabinovich 30ab909182 Standardize unread counts for global filters
(imported from commit 0158206d40e873309999c266f5aa4d79e17c5760)
2013-09-06 08:36:14 -07:00
Allen Rabinovich 67f05f4df4 Remove email from user info and add name linebreak
(imported from commit e76b6dba7fa6c3e9c179d91c575b809977774d94)
2013-09-06 08:33:05 -07:00
Waseem Daher 8e1470fb05 integrations: Update desk.com blurb.
(imported from commit e1bbaca1c47fac7b194d6a531ffe4a7ce15dbd06)
2013-09-05 15:23:09 -04:00
Leo Franchi 663fd4653f Feature-flag alert words to staging + reddit
(imported from commit 1fe9c596b26ce6676514719e4ed2e185108685cb)
2013-09-05 10:21:39 -04:00
Leo Franchi 802ea78fb0 Add a settings option to configure per-user alert words
(imported from commit b24d352fffdde13f2cf0467b31c706ebf0534d6a)
2013-09-05 10:18:41 -04:00
Leo Franchi c62c6359af Slightly shrink size of headers on settings page
(imported from commit d3471c641fb58dba18db6c1a8363bb268f5e8c74)
2013-09-05 10:18:40 -04:00
Allen Rabinovich 2f8bd32ef8 Add background to 'You and' and adjust vertical alignment
(imported from commit 3bec31298c030299509e48596662a0618c359994)
2013-09-04 13:08:04 -07:00
Scott Feeney 6f5cb9bf17 Document Desk.com integration
(imported from commit bcd48f3446cd8f65b25d928136bd09275d8196ea)
2013-09-04 13:19:23 -04:00
Scott Feeney 002cba4496 Minor fix to API docs for topic names
"Subject" => "topic" in the prose description (though the API field is
still "subject"), and fix a misspelled word.

(imported from commit b5a65c87e419c2cacb9f87a03f32a1a8701b440d)
2013-09-04 13:19:23 -04:00
Kevin Mehall f0c447bb4b Fix typo in email integrations help
(imported from commit 65a108b4f052fd32f84812e199097835a80cb33d)
2013-09-04 13:13:02 -04:00
acrefoot 0cb72c6259 Unread counts on the toggle buttons when in skinny mode
(imported from commit 99102d1bf752c077ee4c23bf1aa0b095a9f739d7)
2013-09-04 12:35:48 -04:00
Allen Rabinovich 4aa9798f29 Move the lock to the left and widen the topic input field
(imported from commit 1d70afdc82b653239f7d016997c7e9cbe9eb5f14)
2013-09-03 20:15:17 -07:00
Jessica McKellar 8c4ebb83aa integrations: fix typos in Bitbucket integration instructions.
(imported from commit 0ccdd670eabab8742f8cfa52b37465ec38f40b83)
2013-09-03 12:06:13 -04:00
Allen Rabinovich 6eeeb631c3 Fix lock icon position
(imported from commit 5f48abc8dc568cb501fdca648b7eb17d39d5830e)
2013-09-03 08:59:24 -07:00
Allen Rabinovich ef937ec1a5 Update the styles and layout of the composition pane
(imported from commit 030318ffe4b898e224f2e7c709dd876194121b8f)
2013-09-03 08:33:32 -07:00
Jessica McKellar de383c43c4 integrations: document email forwarding.
(imported from commit db4b258382c3be5a03ed41a4c12a1972777112c4)
2013-08-29 18:13:21 -04:00
acrefoot a25b77287e Documentation on the integrations page for the Basecamp mirror script
(imported from commit 302fbd4e14ca92e4462ddf19e5b874a69d4a96f3)
2013-08-30 20:06:32 +00:00
Scott Feeney f386d87f8e Add "announce stream" option to frontend UI
When creating a new stream, this option lets you announce its
creation to everyone who you didn't explicitly add.

(imported from commit ae4140b4268b73e8b4bb54f5a6eea12fe07cd110)
2013-08-29 10:32:37 -04:00
Scott Feeney affe78355a Improve JIRA integration docs
Specifically, add more clarity to whether users should use the web-hook
or plugin method.

(imported from commit 0b3b8626ccbe6d9a658e7e58d662c5f6127be32e)
2013-08-28 17:59:11 -04:00
Jessica McKellar a7023cac17 Add a landing page just for new MIT users.
(imported from commit 023151e9d057b37f93c0a589e08429b14cc94225)
2013-08-28 16:30:18 -04:00
Jeff Arnold 5d8083a5e0 Fix capitalization typo in MIT Webathena instructions
(imported from commit 1c62f5d1a5e92c211c2f30b1e67d367d6d2d7aff)
2013-08-27 18:08:02 -04:00
Jeff Arnold db88a03115 In the docs, clarify that MIT users need to link with Webathena
(imported from commit dc16e63631f69434f9bb2f495eeae944298da131)
2013-08-27 17:13:14 -04:00
Jeff Arnold 8d5047a6ce In the docs, clarify that the .humbug-api-key name is correct
(imported from commit 769b64dfb2c0668ebc3bc9494476ce542d0bac60)
2013-08-27 17:13:14 -04:00
Tim Abbott 8601c2d766 Disable Webathena-related UI for desktop app.
(imported from commit 4de9ecbd5acd90826da1941593fe03aa8a6bd80c)
2013-08-27 16:21:41 -04:00
Tim Abbott e95a81addb Add Webathena login button to our mirroring page.
(imported from commit 43d8323bb502299027436a8c94c04f55d87bf953)
2013-08-27 15:41:43 -04:00
Scott Feeney e1b82b03e5 Fix unescaped & in markup
(imported from commit b0d9f9ce825b04a444a947b17d98b15c63aa6c8e)
2013-08-27 15:32:20 -04:00
Jeff Arnold b2c89d21ff Add MIT encrypted zephyr class documentation
(imported from commit b911cd4294f0b515e8ce1927e6d7e9f79a472eca)
2013-08-27 14:25:38 -04:00
Jeff Arnold 2d0f8a9bba Update documentation for MIT zephyr
(imported from commit 96cbd71e5d574bf8a0fb2e7fe17c75e4ec4ebfdb)
2013-08-27 14:25:38 -04:00
Jeff Arnold b4684db9a5 Some wording changes to /hello.
(imported from commit 1aeff0bddf31b67767285e71b523531cc5ef250d)
2013-08-26 19:00:55 -04:00
Tim Abbott 134da30fdf Add webathena authentication button for Zephyr users.
This shows up when you're not running a Zephyr mirroring bot and lets
you use Webathena to have us run it.  Obviously needs more docs.

Current problems include:

* supervisorctl reload ends up recreating /var/run/supervisor.sock
  with the wrong permissions, so it only works once in a row before
  you need to chmod that.

* /etc/supervisor/conf.d needs to be humbug-writeable; this is a clear
  local root vulnerability

* This uses SSH and thus is kinda slow.

(imported from commit 7029979615ffd50b10f126ce2cf9a85a5eefd7a2)
2013-08-26 18:17:25 -04:00
Jessica McKellar 6571afd281 integrations: state explicitly that you must create the notification stream.
(imported from commit aedf0e27294c41298e184787c1803217b6d90b8b)
2013-08-26 17:24:49 -04:00
Waseem Daher 78e52bcfc4 hello: Landing page text refinements.
Largely suggested by jrv.

(imported from commit aac2a1d90b50fdce6b6dcf9201a9fc2a9d78e354)
2013-08-26 15:31:22 -04:00
Scott Feeney bf0909a94d Lazy load Dropbox widget, and only when enabled
This brings several improvements:

* The Dropbox script won't slow loading our app.
* If it fails to load, no traceback; Dropbox link just won't appear.
* For users with Dropbox disabled (most at this point), no loading at all.

(imported from commit e71ae5790fc85a185e622bdafb350109527b4eee)
2013-08-26 13:13:00 -04:00
Allen Rabinovich 5e38463800 Add retractable left sidebar.
Specifically:
   * Add and style the sidebar toggle button to the header and remove the
     gravatar.
   * Add the logic for retracting the left side bar.
   * Modify the logic for clicking on the referral pane to prevent it from
     closing the sidebar.
   * Modify the logic for clicking on the stream filters to prevent them
     from closing the sidebar.
   * Modify the logic for clicking on the stream settings dropdown and the
     user info dropdown to prevent them from closing the sidebars.

(imported from commit 73e00eb834a6e87cb8d659fdcf6c2e06fff3731d)
2013-08-23 14:16:51 -07:00
Allen Rabinovich 778fa955a9 Make the right sidebar retractable at narrower window widths.
As part of this commit:
   * Add and style a top right button that controls the sidebar
   * Add the necessary styles for the right sidebar when it's in that mode.
   * Add the logic for controlling the sidebar expansion
   * Modify the logic for prevent default click events to generally
     hide popovers correctly.

(imported from commit ca8063f6c62b436799f952e88541ff0ae8ba85fe)
2013-08-23 09:22:31 -07:00
Steve Howell b4214c987e Remove count-related markup from All Messages
(imported from commit 36d6bb8373634cbcd2ac5e3128586e27a3442e1f)
2013-08-22 16:26:52 -04:00
Allen Rabinovich c529c3038c Make the floating recipient bar visible in Safari
(imported from commit 89d73c59a30dd3f8ca3e187834c1f1a56edcf788)
2013-08-21 18:52:08 -07:00
Allen Rabinovich 834ff7d750 Remove JS logic for resizing floating recipient bar and composition area and do it with pure CSS instead
(imported from commit b19d1b008cc070f29e08fd93416e9a5d01e2f110)
2013-08-21 12:26:45 -07:00
Zev Benjamin 707898b236 bitbucket: Allow the stream to be specified
(imported from commit eea7392551b568502c01e59c89056b4369fe53e0)
2013-08-21 13:41:03 -04:00
Tim Abbott 8641749774 Move zephyr/administration.html to zerver/ path.
This one slipped through through a race between it being added and the
zerver migration.

(imported from commit 23ed79efa16584f062844fa05db3a95b8835060c)
2013-08-20 14:57:14 -04:00
Jessica McKellar b32219c8eb Don't display unread counts until after making a bankruptcy decision.
Users were getting confused about why the unread count in the sidebar
/ notification bar / Dock was different from what the bankruptcy modal
said, so only show them the true server count until they've made a
decision.

(imported from commit 71d376cd4a85749ccf49936b251e6b8ac21361b7)
2013-08-20 10:26:52 -04:00
Luke Faraone 53e2639906 Revise and simplify instructions.
(imported from commit beee4446caeb53d0e1a7c10fc2878fbd5a0c3dbd)
2013-08-16 17:24:55 -04:00
Luke Faraone f03a15ea6e Switch to apt.zulip.com.
Use HTTPS for the initial key download but not for the APT repo line.

(imported from commit 5afa07832ca09919ad4ea6d2b15b2679a902ffa1)
2013-08-16 17:24:55 -04:00
Zev Benjamin ba62cab801 Add Bitbucket integration instructions
(imported from commit 6976e75577ebacfbd2330a45f430d544c1a2cfcf)
2013-08-16 14:38:54 -04:00
Allen Rabinovich 17e07d551f Additional fixes for relayout regressions.
Specifically:
   * Fix the settings menu positioning and appearance
   * Restyle menu and add arrow on top
   * Remove labels from new message buttons in narrow windows and adjust the close button on the composition pane

(imported from commit 586753b6526289b32ec0a90b62d8b2ac1c8182cd)
2013-08-15 15:28:51 -07:00
Waseem Daher 78b1f7140e Reorganize 'Share the love' layout slightly.
(imported from commit 6afb3d491753e28f58b0b801ede2398f49deb8f9)
2013-08-15 18:04:43 -04:00
Waseem Daher 90617db8a1 Allow "Share the love" to be expanded and collapsed.
(imported from commit 9e620c5882d58f41d25124a690aa4154f93173db)
2013-08-15 18:04:43 -04:00
Allen Rabinovich 0b78fab636 Switch to fixed sidebar layout and remove bootstrap layout hooks.
(imported from commit 060340a2febb7b8df6477a3419e7588a8503e377)
2013-08-15 11:05:11 -04:00
Scott Feeney 49a511ff20 Use "Zulip", not "Zulip logo", as logo alt text
(imported from commit e3d3024a136c61643d1e5557712cc82880e4dcbf)
2013-08-15 11:02:05 -04:00
Waseem Daher bae322f020 apps: Link to apt.humbughq.com instead.
apt.zulip.com is not yet operational.

(imported from commit 4d3c15d0764b4c979fb8c5b7d829e88345872468)
2013-08-14 17:14:52 -04:00
Jeff Arnold ec2f013723 Make the left sidebar and right sidebar more consistent.
Addresses Trac #1500.

(imported from commit ad59d6f78042ce89a99ad60c7c34f67144e9c776)
2013-08-13 16:34:16 -04:00
Luke Faraone ecc42bc9f8 Add administrative panel to allow for user deactivations etc.
We now show a list of users and allow you to deactivate a user using the
same process as `python manage.py deactivate_user`.

We add a new menu item accessible from the gear icon which will eventually
have much more than just this, but we have a good start here.

Here we also add a property to UserProfile which determines whether you're
eligible to access the administration panel, and then have code which shows
the menu option if so.

This introduces a new JS file, admin.js.

(imported from commit 52296fdedb46b4f32d541df43022ffccfb277297)
2013-08-13 14:20:18 -04:00
Waseem Daher dfb60ee966 File uploads using Dropbox.
(imported from commit c552133fc7025eca526fbfef24fd544260d7111b)
2013-08-12 17:22:23 -04:00
Zev Benjamin 46eb90a238 referral: Clean up display of validation errors
* We now clear the validation errors when the input box is de-focused
* We make the left sidebar height accommodate the validation error messages

(imported from commit 4b39bfd3e8e8dd707722492a3f98967ee4ccf0ab)
2013-08-12 12:50:33 -04:00
Zev Benjamin 51beeba854 referral: Prevent empty form submission
(imported from commit cc012e84c21bc424adaaa79611f09415480a2ba5)
2013-08-12 12:50:32 -04:00
Zev Benjamin 9a0851f82f referral: Move explanatory text above input box
(imported from commit e4802b4b05a5aa8c4fa4631c5d36876632ba393b)
2013-08-12 12:50:32 -04:00
Zev Benjamin 126fcd42d7 referral: Show feedback immediately and don't show errors
(imported from commit 3bf6071c4fdeeaa50ea05c60b4bf0244c78ebeb0)
2013-08-12 12:50:32 -04:00
Waseem Daher da01c3b3da customer3: Explanatory text on registration form(s).
(imported from commit 39f2a06149514df271e3302ca32c41934b0fc630)
2013-08-12 11:13:15 -04:00
Tim Abbott e9d53578a4 Fix Python bindings function in docs for /register API endpoint.
(imported from commit ba6b31f78a897c6b647e38d91749639509e0a491)
2013-08-09 20:47:12 -04:00
Tim Abbott dd50f29b3d get_events: Don't return a queue ID unless we allocated one.
(imported from commit 85ad1aa2a0d52247c5efcecfab5212e40b876b88)
2013-08-09 15:35:33 -04:00
Tim Abbott 9d6627d269 Rewrite documentation for /api/endpoints.
The main changes are:
(1) Changing the input format for the example response so that it is
human-readable and editable
(2) Updating it to use the events API

(imported from commit 308fade9595d6877836d343d2307e3fceff3e7d4)
2013-08-09 15:34:57 -04:00
Tim Abbott e3bd106397 Clean up the API main documentation a bit.
(imported from commit 7f9dc5f98ac50be6e7e6d4ce69716cb9477099f0)
2013-08-09 15:34:57 -04:00
Tim Abbott 06d6d14fd7 [manual] Bump API version to 0.2.0.
When we deploy this, we'll need to of course actually build and deploy
the new API tarball.

(imported from commit 03c853e8a9424a63f1c74bb83637d5a1e50a159a)
2013-08-09 15:34:57 -04:00
Tim Abbott b0d7830311 api: Fix whitespace in Python example.
(imported from commit 6bad9210b4c85ea097679ff70b4b0ed2176a6945)
2013-08-09 15:34:57 -04:00
Steve Howell 626a737973 [important fix] Restore buddy list.
(There was an extra </div> tag.)

(imported from commit 500114eea1c93264ea590e6c7a9c0b1bacfb9710)
2013-08-08 13:19:01 -04:00
Steve Howell 6f49f13b03 Use 2-space indents consistently in settings.html.
(imported from commit eb8bb4b5078db29b65ba5c40989651151275dea3)
2013-08-08 13:03:10 -04:00
Steve Howell 722c1b1a43 Allow user to change their API key.
(imported from commit b7c50779d0209c6e6600b59c8760a81273fe2454)
2013-08-08 13:03:09 -04:00
Waseem Daher aa29719bbd Update zephyr_mirror instructions slightly.
(imported from commit 0660dfdd1ba16179c88d750f9d319603234d2480)
2013-08-08 12:09:22 -04:00
Tim Abbott 87f8c9333c Rename Humbug => Zulip in app screenshot filenames.
(imported from commit a1a753143e77e0efd1de727378d505815a6d44d3)
2013-08-08 10:22:32 -04:00
Tim Abbott b4d74b4fbc Rename /usr/local/share/humbug/ to /usr/local/share/zulip/.
(imported from commit 6b5d13b36f96c7174e70ce1391f1d66724c45a62)
2013-08-08 10:22:32 -04:00
Tim Abbott f137fa833b Rename Humbug-based variables/paths in jira plugin.
(imported from commit a4596acc5c2d8da5cecad772e9cda5a371189299)
2013-08-08 10:22:31 -04:00
Tim Abbott aba11be192 Rename Humbug-based variables/paths in svn plugin.
(imported from commit 43a9282ad86546fb59e91c36e97a595e51789d07)
2013-08-08 10:22:31 -04:00
Tim Abbott 94f8933b8d Rename Humbug-based variables/paths in git plugin.
(imported from commit e153c7a1a68e82dd3fa45251644be74c62770a9d)
2013-08-08 10:22:31 -04:00
Tim Abbott 53a47e8534 Rename Humbug-based variables/paths in Nagios plugin.
(imported from commit fe8e33241215ea880f7351c3c86b0fb546faf8d3)
2013-08-08 10:22:31 -04:00
Tim Abbott 3005792734 Rename Humbug-based variables in Trac plugin.
(imported from commit 5d406cb6c5fe7b1fbd4da706f7ac6bb6e381cadb)
2013-08-08 10:22:31 -04:00
Tim Abbott 6550134b3e Rename humbug_*_config.py to zulip_*_config.py.
(imported from commit a1d4dd22c59f812f0eb4875dc70c89ce96a4b90c)
2013-08-08 10:22:31 -04:00
Tim Abbott 03293b7be9 Rename humbug-send to zulip-send.
(imported from commit 61400841f8fffe4c706d867aaa012059bcba271d)
2013-08-08 10:22:31 -04:00
Tim Abbott 747a9c536f Rename the 'humbug' API module to 'zulip'.
(imported from commit b3a3d7c05459cbb0110cd0fbe2197d779f3a6264)
2013-08-08 10:22:31 -04:00
Tim Abbott 2ea1bb05a5 Rename ~/.humbugrc to ~/.zuliprc.
(imported from commit a0d53dd20097a56971874dc1d84c6f95267e84f2)
2013-08-08 10:22:31 -04:00
Waseem Daher 4060ff3950 Revise landing page to focus more on our unique strengths.
(imported from commit 50d641d3e24ce57c873d0ea5deb077b825c14782)
2013-08-07 22:51:03 -04:00
Scott Feeney 3b8ec3d185 Add a forgot-password link to the API key prompt
(imported from commit a5da4f6a228398b8296e147f327ee8daaced1f1a)
2013-08-07 17:49:27 -04:00
Steve Howell 44057cb31b Add divider between Streams and Settings in the gear menu.
(imported from commit 2ed27a11e8358adead792de5e8c40b10691f142a)
2013-08-07 10:59:44 -04:00
Tim Abbott 1f1af26048 Change Humbug => Zulip in text/comments.
(imported from commit 2f9d73431ae40e1b9e9e11bc2f4f62f566ae758a)
2013-08-07 10:00:07 -04:00
Zev Benjamin 5e1d893509 Revert "Temporarily remove "Share the love" from DOM & JS"
This reverts commit fc7af47400f6c96161913dcc98be128c116d90c5.

(imported from commit 8f58425ec3bd95220e109eeb7be21fa449508427)
2013-08-06 17:18:40 -04:00
Zev Benjamin a67809c327 Move remaining error/warning messages from the top navbar to the right sidebar
(imported from commit e7147cb85caec891c3401da8144b3b07a6037cd6)
2013-08-06 15:21:56 -04:00
Jeff Arnold 8357b193b0 Update name to Zulip, Inc. from Humbug, Inc.
(imported from commit 1705da1f3e10c2dc391d43d5535d795403e2b85c)
2013-08-06 11:06:57 -04:00
Scott Feeney 29b3b42ac7 Temporarily remove "Share the love" from DOM & JS
(imported from commit fc7af47400f6c96161913dcc98be128c116d90c5)
2013-08-06 10:47:42 -04:00
Tim Abbott e111a2f9a5 [manual] Rename Django app from zephyr to zerver.
This needs to be deployed to both staging and prod at the same
off-peak time (and the schema migration run).

At the time it is deployed, we need to make a few changes directly in
the database:

(1) UPDATE django_content_type set app_label='zerver' where app_label='zephyr';
(2) UPDATE south_migrationhistory set app_name='zerver' where app_name='zephyr';

(imported from commit eb3fd719571740189514ef0b884738cb30df1320)
2013-08-06 07:39:36 -04:00
Waseem Daher bd0aa114c3 Randomize the sample email addresses in "share the love".
(imported from commit cccd5b8c47274167d052fe147d7d1da1e83c6562)
2013-08-05 17:14:51 -04:00
Waseem Daher c16651bf23 [schema] Add referral system
For now, we just get emails about referrals that we have to follow up
on manually.

I don't love using the name "referral" in some places and "invite" in
others, but we already use the verb "invite" to mean something else
and "invite" is a canonical noun.

(imported from commit 0814c18395952fcdef234c1584984f71ca1b6f37)
2013-08-05 17:14:51 -04:00
Jessica McKellar 666ce4333e Don't let CUSTOMER4 users change their names through the web interface.
(imported from commit eafd4efa8a9614ffa3bdc7dd22088e091e1c54c3)
2013-08-04 22:03:10 -04:00
Jessica McKellar 118a2075d9 Allow anyone to register for the CUSTOMER3 realm through a special URL.
(imported from commit 8857d0217893f51fdba6585aea2fa79270161beb)
2013-08-04 19:55:00 -04:00
Luke Faraone 25a3deca11 Replace Humbug reference on initial_invite_page.html with 'Zulip'
(imported from commit 429fb32d440171f892648ded039bc7b71afa1b68)
2013-08-04 10:45:48 -07:00
Waseem Daher 1e47be9b25 Tighten up the text on /integrations and /api.
We really bury the lede with all of this "how to make a bot"
stuff above the fold.

(imported from commit 61d17d6f580ca6a707073672d4a88101967e4d3d)
2013-08-02 16:39:21 -04:00
Waseem Daher 0bb304a516 Request Gravatars at 2x the size we need.
This is a bit wasteful on most systems, but will result in their
looking pretty sharp on Retina displays.

(I also go and actually fix up the size we request for a bunch of
these so that they actually match the size of the gravatar in the
document -- previously we were requesting a size 30 gravatar when we
were displaying it in a size 25 space, which leads to unnecessary
ugliness upon resize.)

(imported from commit 9152e6e128e0ac38d97d893cb8243e3b9185351b)
2013-08-02 15:58:55 -04:00
Waseem Daher d7da9d8bad Switch to using Font Awesome everywhere.
(imported from commit 406ac9e8e24066e45833a71adcdd95b26b5cfb9b)
2013-08-02 14:49:28 -04:00
Scott Feeney 5971dce594 Use bare domain for API binding link
The link is broken on www.

The reason it links to www is a holdover from issue #1400 six weeks ago.
At the time, https://humbughq.com used TLS SNI and downloading via wget
gave a certificate error, so we changed it to www as a workaround.
However, https://zulip.com does not use SNI so it's safe to revert this
workaround.

(imported from commit c87a6eb3ceab92c377edb976216be615625fafce)
2013-08-02 13:02:50 -04:00
Scott Feeney 106c2d6a87 Remove unused Droid Sans CSS link from header
(imported from commit bf45482d34970447db3c21212cba81ad8d2ee51f)
2013-08-01 15:46:59 -04:00
Steve Howell 945562fbe1 [bugfix] Fix the recent gear hovering regression.
It's a long story, but we need to set the actual-dropdown-menu
class for the gear, since it messes with bootstrap's notion of
active.

(imported from commit 94f2d9ee65014bc954e088e6c913d9682b7322f6)
2013-07-26 18:12:06 -04:00
Zev Benjamin 603f0d7ace Speed up subscription table rendering
Previously, we'd render all the rows of the table except the first
(which is for creating new subscriptions) and append them all to the
table.  This ends up being really slow.  We now instead render the
entire tbody element and replace the existing tbody element.

When profiling on my laptop, this reduces the rendering time for a
few thousand streams from ~62 seconds to ~2 seconds.

(imported from commit 83a48e0e1f776f7663343662157298e89165ece3)
2013-07-26 16:01:13 -04:00
Tim Abbott 0d077e7f41 [manual] Use api.zulip.com to access the Humbug API.
This needs to be deployed after the nginx configuration is deployed.

(imported from commit 167a3d9d27595d40883bb400ebcc44c4ad9b6a2f)
2013-07-25 17:27:46 -04:00
Tim Abbott 44f9aa4c4c Use zulip.com domains for apt and www file distributions.
These domains aren't working quite yet.

(imported from commit 4f2ad2500d0b419bc25f5aa9bcf7e5c79a69b7ec)
2013-07-25 17:27:45 -04:00
Tim Abbott 34267b37b4 Use zulip.com for various links to the app and static content.
(imported from commit c40c994e98e767bb2714b4db655ac73fe92dfcd7)
2013-07-25 17:27:45 -04:00
Waseem Daher c0c63d3506 Some /integrations language tweaks.
(imported from commit 3f647dd6d5f72301036da7e1f75756fd19b8b8cb)
2013-07-24 17:47:56 -04:00
Kevin Mehall eb6bc91c22 New Relic integration
(imported from commit a108f4c6e90d857263453036f6d5f09279302b7e)
2013-07-24 17:19:36 -04:00
Luke Faraone f800e6cebb Document message and subject length requirements
LENGTH LIMIT RULES
    This limit is non-refundable unless issued at a fully refundable fare.
    Some fares may not allow changes. If allowed, any change to your
    itinerary may require payment of a change fee and increased fare.
    Failure to appear for any personal message without notice to Zulip will
    result in cancellation of your remaining reservation.

(imported from commit 75d5843677ce959d60d4015779efa9c2cf8f9a1c)
2013-07-24 16:38:17 -04:00
Waseem Daher 6cd0b0468d Document Trello integration.
(imported from commit ac28965d1bd0de49a9902c4650e4f5d7835f65cc)
2013-07-23 11:50:31 -04:00
Zev Benjamin 2a1678a1d3 Fix some wording in our Zephyr mirroring instructions
(imported from commit e513b42afbc5f7e43f62d914feb2472fe0f6d0e5)
2013-07-22 14:26:25 -04:00
Steve Howell c12521be35 Use ? as icon for Keyboard shortcuts, to match ? as the hotkey.
(Before it was info (i), which is the hotkey for another menu, so it
was confusing.)

(imported from commit 44eb25fc5c90e3510456d6cb9dbca7fe13e56b37)
2013-07-17 16:46:27 -04:00
Steve Howell 5439687b70 Swap Up and Down in keyboard help
(imported from commit 2da5e29cf36d81a046da8f8a028a73aaf986d9d1)
2013-07-17 14:13:43 -04:00
Steve Howell 15c9209af6 s/Respond/Reply/ and emphasize Reply help in Keyboard shortcuts help
Reply help is higher, because it's more common to reply to messages
than to compose new messages.

(imported from commit 74439e8f36796e638bb99e2c7786470cced666f1)
2013-07-17 14:13:43 -04:00
Steve Howell 35466e2857 Put help for / higher in Keyboard shortcuts help.
Two reasons:
   1. It helps group the up/down keys together.
   2. It's the least guessable hotkey of the group, so it's worth emphasizing.

(imported from commit b9b29b8dcf37ce29526aa7e55871acb05d1ef4bc)
2013-07-17 14:13:43 -04:00
Steve Howell 68574c1b12 Tweek menus section of keyboard help
(imported from commit 0d77d173cd76cbdffeab39611cc4970c1d51563c)
2013-07-17 12:31:00 -04:00
Jessica McKellar dac5a46fa4 Rename user-visible uses of "subject" to "topic".
(imported from commit 19e08a13624686da8703fcb8b5eefe2e29edf64b)
2013-07-17 12:04:45 -04:00
Steve Howell d61ebc2385 Support J/K as hotkeys for page_down/page_up
(imported from commit f4d092e3a3ccd5fad5e39fb6e6c454fbfeddfa50)
2013-07-17 11:48:47 -04:00
Tim Abbott 84a97f5c41 Document how our desktop notifications work.
(imported from commit 991d7541283d7d8d17836f5322abb0da780eba25)
2013-07-16 13:16:24 -04:00
Allen Rabinovich 4e043feeb1 Add proper Zulip wordmark to the top left - just retina version for now
(imported from commit 6160b85d742b374adca3299e2e5f48ae24b985d2)
2013-07-15 21:21:49 -04:00
Waseem Daher fc4a8af707 Update /apps screenshot for Windows and Mac.
(imported from commit 2886ffabb0fc7cea4ed30ffda4aba9ee8f5de03b)
2013-07-15 18:05:27 -04:00
Jessica McKellar f95662bd75 Switch to @zulip.com or the neutral @example.com in example uses of e-mail addresses.
(imported from commit 5d5c291d6d0d0d7c44eb092dddb4406cd278a0e3)
2013-07-15 17:49:00 -04:00
Jessica McKellar 4d19c784d8 Switch from the @humbughq.com to @zulip.com addresses users can contact.
In particular support@ and jobs@.

(imported from commit 8051ae5628b7378cde49b160d26b704e7e14bb24)
2013-07-15 17:49:00 -04:00
Jessica McKellar cc121490fe account creation and password resets: Switch from Humbug to Zulip in user-visible text.
(imported from commit 5a145938dd0509385e553ab41e0eafb98825006d)
2013-07-15 17:49:00 -04:00
Jessica McKellar 0a2e9b1507 integrations: Switch from Humbug to Zulip in user-visible text.
(imported from commit e22f20b9bf07c36f08c2fa3cc76b9131277ddee8)
2013-07-15 17:49:00 -04:00
Jessica McKellar 7576942dbe Terms of service and privacy: Switch from Humbug to Zulip in user-visible text.
(imported from commit 7d6d0412a5da167d12789abee1bca4c70909112a)
2013-07-15 17:48:56 -04:00
Jessica McKellar 3f3b229578 HTML templates: Switch from Humbug to Zulip in user-visible text.
(imported from commit 07b4e92c270d3b7b0967ea5b6cf5821bf95d166a)
2013-07-15 17:41:52 -04:00
Jeff Arnold 4535690dc4 Correct last modified date and add mailto link
(imported from commit 394ff66cac3f18ac4b23840a762e0fdc81d310e3)
2013-07-15 13:19:42 -04:00
Jeff Arnold 5a22c533c4 Update the ToS in response to feedback from user1@customer33.invalid
(imported from commit 8608255a9e1558df32fa396d7fbb764c4f579975)
2013-07-15 13:07:13 -04:00
Waseem Daher 547d405489 [manual] Partially rebrand Humbug -> Zulip on our apps page.
Tagged [manual] because we need the Zulip-latest.dmg,
zulip-latest.exe, and Linux updates to actually exist on prod.

(imported from commit 67a514a3f8844b939163ca330144ae80cf028132)
2013-07-15 11:44:20 -04:00
Waseem Daher 8e5d9a4daf Try to intelligently go to the right tab for your OS.
This sort of browser-based OS detection isn't perfect, and can be
really fragile, but in this case it's not a big deal if we don't get
it exactly right; the user can always pick a different one.

(imported from commit 70fdaf8f82252b17a3ffc347e239db5963363fbd)
2013-07-15 11:44:20 -04:00
acrefoot 114eeab026 Revised message actions and message info popovers
Since f8fbf70c8502 had troubles in FF and people did not like the
message-info-on-hover, this commit hopefully will work better. Tables
are likely the culprit with using dropdowns in FF, so when we stop having
the messagelist be at table, we can switch back to dropdowns which are relatively
positioned rather than absolutely on the page.

(imported from commit c49a5cd45f3439d089146771e2aa0cee6431125a)
2013-07-15 11:29:59 -04:00
Leo Franchi 92fc542872 Show a on-hover cog for going directly to stream settings page
(imported from commit 9ba04d88daacd475d9b85ce7c8bd925840290535)
2013-07-12 18:34:13 -04:00
Leo Franchi 550aea8c64 Show a light STREAMS title in the streams list
(imported from commit 675ebca52ba10b8075bb788adf70d293b4d58fde)
2013-07-12 18:34:13 -04:00
Leo Franchi 90e8281acc Fix bulk invite page to use new minifier
(imported from commit 5e965da26107f925eb6d04548059689a6f9542cf)
2013-07-12 13:42:26 -04:00
Scott Feeney 7859f8cfab Remove (Chrome only) text from Desktop notifications option
(imported from commit 2020c34e96f518e8e75e5818ee46af52f1333e6f)
2013-07-12 13:33:26 -04:00
Scott Feeney 27f120e01f Fix use of old JS compression tag in login template
Instead of `compressed_js` in the `compress` library, we now use
`minified_js` from the `minified_js` library. (CSS is not affected by
the change.)

(imported from commit 07aea9efbc83d30b354a7e044070563e93f7525a)
2013-07-12 13:33:13 -04:00
Leo Franchi e5b855d883 Add a bulk invite page for the first user in a realm
(imported from commit cf85c9d475209da4591e2f06f142008fb19ac9d5)
2013-07-12 13:07:02 -04:00
Scott Feeney 2c33320746 Reuse minified JS from previous deploys
This is a big change affecting lots of areas:

* Pipeline no longer deals with JS (though it still minifies CSS)
* A new script, tools/minify-js (called from update-prod-static),
  minifies JavaScripts
* A command-line argument --prev-deploy, if passed to minify-js or
  update-prod-static, is used to copy minified JS from a previous
  deploy (i.e., a previous git checkout), if the source files have
  not changed
* update-deployment passes --prev-deploy
* Scripts are now included with the minified_js template tag, rather
  than Pipeline's compressed_js

Also, as a side benefit of this commit, our Handlebars templates will
no longer be copied into prod-static/ and accessible in production.

Unminification is probably broken, but, per Zev and Trac ticket #1377,
it wasn't working perfectly before this change either.

(Based on code review, this commit has been revised to:
 * Warn if git returns an error in minify-js
 * Add missing output redirects in update-prod-static
 * Use DEPLOY_ROOT instead of manually constructing that directory
 * Use old style formatting)

(imported from commit e67722ea252756db8519d5c0bd6a421d59374185)
2013-07-12 11:59:04 -04:00
Waseem Daher 0adf687bfd Formatting help: Make the bulleted list a little more explicit.
(imported from commit 5a9c68949d285d12f6a44982722cf42f26cab285)
2013-07-11 14:35:50 -04:00
Waseem Daher 17013e950b Formatting help: Update @-mentions.
(imported from commit 08ec8b83afbdc46f2d693c0ee4d60b989b85b62e)
2013-07-11 14:35:50 -04:00
Waseem Daher d1780825bb Reverse order in formatting help.
This is how Reddit does it, and in a way I actually find
it more intuitive -- it's more x => y.

(imported from commit 79e06f8d85d07eea417b9e1ff2d792c3af3f6acc)
2013-07-11 14:35:50 -04:00
Steve Howell 97994ea7a9 Shorten private operator (private-message -> private).
(imported from commit f938bd56de05cc8fc0da18348d4dec8a18c96bb9)
2013-07-10 16:58:17 -04:00
Steve Howell 43602b589f Shorten mentioned operator (mentioned-message -> mentioned).
(imported from commit 5104f75a7ed19f533ab5bca466d3e017c72bd1b8)
2013-07-10 16:58:16 -04:00
Steve Howell f87b27a9c3 Bold @-mentions link when you click on it.
This fix also cleans up the search operators so that @-mentions
and Private messages have a more similar naming convention.

(imported from commit fb1a2119aab5aa9e179c6e321a8d2ef2e90290cf)
2013-07-08 22:04:28 -04:00
Luke Faraone e5031e5a0f Perform JS validation of the login form.
This reduces roundtrips hopefully and will provide a friendlier error
message than what would otherwise be produced by Django.

(imported from commit 034aeef00043e3bf059583770f6c08c4f73ceeb5)
2013-07-08 14:00:19 -04:00
Luke Faraone c646d95b7a Display specific error messages on the login screen.
This allows us to inform users that the reason they are unable to log in
is because their account has been deactivated. This message (generated by
Django) is only shown when the correct credentials are used and is_active
is False.

(imported from commit 754a4c9af6ec05e8f18cf183bc08b67bacdeb3e0)
2013-07-08 14:00:19 -04:00
Steve Howell 433f5daef5 Change bots table to a list.
(imported from commit 6e1163d8cab42dafa958a4d1c95f60ef927ef2c3)
2013-07-06 09:49:21 -04:00
Waseem Daher fc85cda8a3 Fix Linux installation instructions.
(imported from commit 9489df62846cbda462a8e86a698e78b4120824ef)
2013-07-05 18:04:17 -04:00
Leo Franchi e09016c1e2 Mention our new apps on our /apps page
(imported from commit e1b1f467c72a90a84b54d867c7e31c6721439af0)
2013-07-05 17:56:14 -04:00
Waseem Daher 51f9ace595 Revert "Chevron icon on each message now causes a dropdown menu; hover on message for info"
This reverts commit f8fbf70c8502370a78159e24f3cf9589fb9d384f, since
we're waiting on some Firefox and no-hover fixes.

(imported from commit 6b13f5bb9d907303ab311afd7da584bc06538c91)
2013-07-03 17:44:35 -04:00
Steve Howell 009d7b8174 Shrink avatars to 35px in the Your bots table.
I tried 30px at first, but I think a slightly bigger avatar helps
fill out the table a bit.  It should be easier to tweek these in
CSS now, although Allen agrees with me that the tabular display
may be short lived when we add edit/delete features.

(imported from commit b4d69cddf63fa122374e20731a5755e7dec86304)
2013-07-03 11:49:04 -04:00
Steve Howell 32a1d4dc13 Remove colon after Add new bot
(imported from commit 918b3f4ec2e20423ba596134dcce3a5372b90a14)
2013-07-03 11:49:04 -04:00
Steve Howell 0db3afd70a Remove (optional) in Your Bots table
(imported from commit 146aab0dc5e09f32dba31926671ee15869180057)
2013-07-03 11:49:04 -04:00
Jessica McKellar 14e27e7583 Add the new tutorial steps.
(imported from commit 9269acbcf58332002b1d45c0134ccb2db980f05c)
2013-07-02 18:26:17 -04:00
Jessica McKellar fcf3b262d0 Add some screen divs to be used to box spotlighted content in the tutorial.
(imported from commit 2fcb357b9d812287fcb7070e16d91f5da19ffb96)
2013-07-02 18:26:17 -04:00
Luke Faraone cf81c46c77 Omit fonts.css on QtWebKit clients
QTBUG-3467 prevents non-normal-face @font-face fonts from being used when
defined as such in CSS. To work around this, the desktop applications now
ship the Humbug font themselves, and this commit causes the server to no
longer send the problematic CSS rules to those clients.

We have some duplication insofar as we now have two minified CSS files, but
this is better than conditionally applying the CSS at page runtime.

(imported from commit 9a887f9fb8002d44171d366d1249ebbf21cc9c77)
2013-07-01 14:37:58 -04:00
Steve Howell 1e246ba32d Use our own buttons and text field for uploading bot avatars.
(The file-input widgets that come with browsers are ugly and
nonstandard across browsers, so it is a common technique to
have your own button that controls the file upload, and it
delegates to a hidden copy of the browser file-input widget.
We also allow you to clear the file.)

(imported from commit b55ef655e75746330dc3cc396cb908670e5019cc)
2013-07-01 11:27:37 -04:00
Steve Howell b04bd4a1ad Change text field hints for adding new bots.
(imported from commit 184888130b2c72f72266d32ced83ed1f23479c12)
2013-07-01 11:27:37 -04:00
Steve Howell 56ac727840 Style errors for bot avatar file uploads.
(imported from commit 2d16a860bc54b07117ce724dbdcf109233ac43e9)
2013-07-01 11:27:37 -04:00
Steve Howell 4af6345cf7 Align labels and fields in Add-new-bot form.
(imported from commit 238144dea105937776e0bd643d4a696492856b2f)
2013-07-01 11:27:36 -04:00
Steve Howell b06f34b55b Use portrait alignment for adding-bots form.
The add-bots form used to have a landscape alignment, as it was
integrated into the same HTML table that showed your existing bots.
This became unwieldy once we allowed users to upload avatars.

(imported from commit 246a35be77ce1679d595271e6911dc339a6813ab)
2013-07-01 11:27:36 -04:00
Steve Howell 2d888dbb23 Allow user to upload an image for their bot's avatar (front end).
(imported from commit e1de0df38fc06fabab8a715ba7bbee71d8bde7b9)
2013-07-01 11:27:36 -04:00
Tim Abbott ea8a80603a [manual] Change API URLs to be based on api.humbughq.com/api.
This must be deployed after we update our running nginx configuration
to serve api.humbughq.com.

(imported from commit b5c34ebdd595f55eecd6dca6a18a37f105107bd5)
2013-06-28 15:57:27 -04:00
acrefoot bea702dd17 Chevron icon on each message now causes a dropdown menu; hover on message for info
As does the hotkey "i". It's somewhat less appropriate because it's all actions,
but it's where our "info" menu used to be, and we can workshop a better one. "a"
feels weird to me, but maybe it's just me.

You can also hover on the .message_content to see a popover with extra message details

This is for Trac #1334.

(imported from commit f8fbf70c8502370a78159e24f3cf9589fb9d384f)
2013-06-28 12:24:03 -04:00
Allen Rabinovich fa28f7ff5c Change a number of CSS properties to address various bugs.
This mostly applies to the previous two commits. In principle,
this could be teased out and merged into them, but the hassle
here doesn't totally seem to be worth it.

(imported from commit ee2469ca3762c50c6db49b93eec02b32589eafe3)
2013-06-28 10:52:05 -04:00
Allen Rabinovich 50943ba6d0 Rework recipient bar template to have color block and label column.
(imported from commit 423a5becc0f81ee816e38983720b2002777913b0)
2013-06-28 10:52:05 -04:00
Waseem Daher 343023d2de Add "Invite coworkers" link at the bottom of the buddylist.
(imported from commit b4a3dc298df6c6870425b95ea40c7dbf80b66b95)
2013-06-25 21:35:44 -04:00
Waseem Daher 60e2d0e44c Replace "Invite users to Humbug" with "Invite coworkers."
The hope being that this is clearer that it's about inviting your
coworkers to your instance of the app, rather than about spreading the
love and telling your friends how great Humbug is.

(imported from commit 888576618cdb5469cbfa8964f2b53c7b5120627f)
2013-06-25 17:06:35 -04:00
Scott Feeney 72a3112317 Use www.humbughq.com for API download link
wget users report certificate errors on the API download, apparently
due to wget's lack of support for TLS SNI until recently. Adding www
to the download link should work around this problem. (Trac #1400)

(imported from commit 517375eb22532304a774d66549c50691504ecc93)
2013-06-24 13:19:37 -04:00
Waseem Daher 0c01274989 Revert "Slight cleanup of registration page."
This reverts commit 91b4577c20afaf3ee9f5bed7f4e3451020960cf5.
Upon discussing with acrefoot, my new conclusion is that
the page should only look this way if you're going through
the workflow outlined in Trac #1391 -- otherwise it should
remain the way it is.

(imported from commit 57a1989d73526a357b47a4ac68dc911e8f2531cf)
2013-06-21 14:31:40 -04:00
Waseem Daher 316d4e9220 Slight cleanup of registration page.
(In anticipation of the implementation of Trac #1391.)

(imported from commit 91b4577c20afaf3ee9f5bed7f4e3451020960cf5)
2013-06-21 11:57:48 -04:00
acrefoot a37b08db58 In-Browser Notifications
Some browsers don't support desktop notifications. Some people haven't allowed permissions
for humbug to have desktop notifications. This is a poor man's attempt at desktop notifications.

We are adding the bootstrap-notify package (http://nijikokun.github.io/bootstrap-notify/)

Resolves Trac #1336.

(imported from commit 6a54f7d1875e765dabd32d94ada8ebe4474a3d71)
2013-06-21 11:44:25 -04:00
Jessica McKellar e0b109c6ae Remove the bankruptcy button on the Settings page.
(imported from commit 3f67422df3e96b0902b315c8d055c607e07bc533)
2013-06-21 11:00:43 -04:00
Jessica McKellar 30ab99d765 Offer to bankrupt a user if they are way behind.
(imported from commit 5483bb548a55e6cbf788b71a8885b3c990b94b77)
2013-06-21 11:00:43 -04:00
Waseem Daher fd2f41cc5e Slightly cleaner hotkey help for "New X message" buttons.
The "hotkey='x'" syntax was a bit too programmery for my tastes.

(imported from commit 3b4c6f500301b4a4efc2834190f1e86e7f825c3a)
2013-06-20 18:43:19 -04:00
Allen Rabinovich e0c05ea7a9 Prevent buttons from stacking in a narrow window by removing their text labels
(imported from commit ab1526e12d7fea0dd791ae02f419ab65d7430e30)
2013-06-20 09:24:40 -07:00
Zev Benjamin 86b450ca06 Remove trailing whitespace
(imported from commit 1770beb3936b3f3290e3fde3a2548c7ea60cd503)
2013-06-20 12:21:42 -04:00
Zev Benjamin 0754430c86 Make portico pages structurally valid HTML
There were a few things the W3C validator complained about that I
didn't bother fixing (like img tags without alt attributes and
obsolete tags).  There also a few pages that were slightly more
annoying to get my local instance to render (like the 404 and 500
error pages), so I checked those by eye.

This does not cover the actual app at all.

(imported from commit 1cbe1ec11067e96718814ec23eaf5a8b4b68ef19)
2013-06-20 12:21:42 -04:00
Zev Benjamin 552347ac52 Grammar nit
(imported from commit cbb20cb7114c8fe4bc2a5021f35be55dc12ac4dd)
2013-06-20 12:21:42 -04:00
Zev Benjamin 0e330e7d7e Add mixpanel badge to the front page
Displaying the badge gets us a bunch of free mixpanel data points/month.

We only display the badge on the login page (which `/` redirects to)
and not on other portico pages.

(imported from commit 75871173a10ae888fdb7c92fe8e20586ce60c6bf)
2013-06-20 12:21:42 -04:00
Zev Benjamin d8f1413bc4 Rework bottom navbar styling
This just makes the markup on each list item more consistent.

(imported from commit d12f6ef503b6da10c39aaaadcf2c6d359e9d0d47)
2013-06-20 12:21:42 -04:00
Zev Benjamin 8921621621 Make our portico bottom copyright and navigation stick to the bottom of the page
We use the technique described here:
http://ryanfait.com/resources/footer-stick-to-bottom-of-page/

(imported from commit 108f3c9cc4ce9dbf483ff76d6f9a6a014077da56)
2013-06-20 12:21:42 -04:00
Allen Rabinovich adaf5e502a A dark header with a more compact search field and no message composition buttons in responsive view
Removing dead CSS code, loading a bigger gravatar for Retina displays

(imported from commit 0feb79b46b0c275d4a220a4dec733584e0204023)
2013-06-19 15:23:52 -07:00
Waseem Daher 5863b0e965 integrations: Typo fix.
(imported from commit 340e26bda84c4109f3cae0d92b2c82d612d3dc59)
2013-06-18 17:22:22 -04:00
Zev Benjamin dd939ed7fe Disable the collection of metrics when not deployed
We were using up a lot of events in our dev environments.

(imported from commit 8413ecfa835cce0a231bdf437f37ad8cf12a9133)
2013-06-18 17:07:36 -04:00
Zev Benjamin aff42f0c73 Revert "Add a bunch of debugging support for mixpanel"
This reverts commit c5050f66d985eb76e38117b2668594fedfc10702.

(imported from commit ea1c92f73e8fd4ce2816e7af94b5d3a55edc8a7e)
2013-06-18 17:07:36 -04:00
Zev Benjamin eb62a31bb8 Use a different error message for get_events and get_old_messages
(imported from commit 191f46b482d0bf4adf60967cdfebb0d7dbcf82f8)
2013-06-18 16:36:02 -04:00
Waseem Daher 67ac671b74 Remove composebox help text.
Right now, the text can sort of visually collide with new messages.
Also, the text is really only of benefit to total novices; you
learn it once and then those 15px are ~forever useless to you.

(imported from commit 93915fc854c1b801de0fb6654f014b6c7f2edc08)
2013-06-18 15:44:03 -04:00
Steve Howell 438e412772 Hide more things when you "close" the compose box.
This change backs off from the always-open-compose-box paradigm,
so that when a user "closes" the compose box, they can no longer
type text, attach files, etc., and instead, they have buttons
to reopen the compose box.

(This change does not affect the feature that when you're in reply
mode, the compose box stays open.)

(imported from commit 32305d5b35f457a83f126a2265defdd98e885a2b)
2013-06-17 10:21:49 -04:00
Kevin Mehall 0cd90cbe4a Add a close button to the compose dialog (since users may not know to use Esc)
(imported from commit 47dca0b2c76449be1d885b74c1cf6b036aa459c7)
2013-06-14 13:47:57 -04:00
Waseem Daher fda6bfdd4e Make skinny navbar gravatar more consistent with our visual styling.
(imported from commit b9a84dd490bddbdfea85668ad1fcf3c29da2c837)
2013-06-12 16:35:35 -04:00
Waseem Daher 9d62c49c83 Make left sidebar gravatar more consistent with our visual styling.
(imported from commit 0a859184d89fbcfb3ab4e7311f3b86a2f9d89d88)
2013-06-12 16:34:59 -04:00
Allen Rabinovich b7694e5109 Widen the message feed.
(imported from commit 76816ff7b43748d4a16c4b7a5def5ec68262dec3)
2013-06-12 16:34:18 -04:00
Allen Rabinovich d729cb49ce Replace some of the skinny navbar glyphicons with vector icons.
(imported from commit c94a7fa3e0cd303933b2a3824e9f9526b891fa5d)
2013-06-12 16:34:17 -04:00
Steve Howell d740d7c082 Show user-uploaded avatars on the website.
Show user-uploaded avatars on the website for users who have
UserProfile.avatar_source == 'U'.  (Continue to show gravatars
for other users.)  This includes the home page, the visible-phone
div, and the settings page.

This fix does NOT address a few things:
* There is no GUI to actually upload user images yet on the website.
* The !gravatar syntax in bugdown will continue to show gravatar images
  only.
* We are not changing identicon behavior.

(imported from commit 9f5ac0bbe21ba56528048233aab2430e4dd431aa)
2013-06-12 15:34:51 -04:00