Commit Graph

1013 Commits

Author SHA1 Message Date
Tim Abbott 7725c62892 Use VERBOSE_SUPPORT_OFFERS in day1 emails. 2016-07-19 15:28:41 -07:00
Tim Abbott 3ea4cbb5c3 settings: Extract settings.VERBOSE_SUPPORT_OFFERS. 2016-07-19 15:28:41 -07:00
Tim Abbott 543311848d templates: Replace not_voyager check with dropboxAppKey check.
Also remove useless/confusing value of DROPBOX_APP_KEY in
DEFAULT_SETTINGS (it's overridden by the get_secret call anyway).
2016-07-19 15:28:41 -07:00
Tim Abbott 82f78621dd settings: Extract CUSTOM_LOGO_URL. 2016-07-19 15:28:41 -07:00
Tim Abbott de679a23c9 settings: Extract settings.REGISTER_LINK_DISABLED. 2016-07-19 15:28:41 -07:00
Tim Abbott c25b077224 settings: Extract settings.SHOW_OSS_ANNOUNCEMENT. 2016-07-19 15:28:41 -07:00
Tim Abbott c7819ed177 Fix broken link to old FoundationDB integration. 2016-07-13 21:00:38 -07:00
Tomasz Kolek f689fbfa4d Replace old Trello integration with a webhook integration.
Fixes: #709.

[With tweaks on the documentation by tabbott]
2016-07-13 21:00:27 -07:00
Tim Abbott f8a83fcb11 integrations: Fix top-of-page instructions appearing on every page. 2016-07-13 20:59:38 -07:00
Tim Abbott 564d41644d deactivated: Fix whitespace around before the . end of sentence. 2016-07-12 20:38:49 -07:00
Tim Abbott 0b7788be6b Fix indentation in compose.html. 2016-07-12 18:36:02 -07:00
Tim Abbott d424813687 Fix indentation in deactivated.html. 2016-07-12 18:34:17 -07:00
Eklavya Sharma e28b038f1d Use assert_in_response by fixing line-wrapping in templates. 2016-07-12 17:52:47 -07:00
Tomasz Kolek d0066c37ff Add bitbucket2 integration.
Bitbucket changed the format of their API.  The old format is still
useful for BitBucket enterprise, but for the main cloud verison of
Bitbucket, we need a new BitBucket integration supporting the new API.
2016-07-12 17:34:34 -07:00
Steve Howell 52af46a74b Fix whitespace in keyboard_shortcuts.html 2016-07-12 14:08:17 -07:00
Umair Khan 043ae8ad65 Upgrade to Django-Pipeline==1.6.8. 2016-07-09 07:09:55 -07:00
Steve Howell 704c57a141 Fix end tag issues in api.html
(This fixes a minor style issue with the API keys/bots section,
but the change is mostly to make the HTML have balanced tags.)
2016-07-08 16:30:49 -07:00
Tim Abbott cccf748244 index.html: Fix webpack URL.
This was accidentally changed in
a78c1b9750.
2016-06-30 15:48:02 -07:00
Tim Abbott a78c1b9750 Fix casper tests hanging while development server is running.
This works around a nasty problem with Webpack that you can't run two
copies of the Webpack development server on the same project at the
same time (even if on different ports).  The second copy doesn't fail,
it just hangs waiting for some lock, which is confusing; but even if
that were to be solved, we don't actually need the webpack development
server running to run the Casper tests; we just need bundle.js built.
So the easy solution is to just run webpack manually and be sure to
include bundle.js in the JS_SPECS entry.

As a follow-up to this change, we should clean up how test_settings.py
is implemented to not require duplicating code from settings.py.

Fixes #878.
2016-06-30 14:18:50 -07:00
Rishi Gupta 17b6d136d5 Add Semaphore webhook integration. 2016-06-29 16:36:19 -07:00
Tim Abbott e72f41cdec Remove old prototype data import/export tool.
This prototype from Dropbox Hack Week turned out to be too inefficient
to be used for realms with any significant amount of history, so we're
removing it.

It will be replaced by https://github.com/zulip/zulip/pull/673.
2016-06-27 13:47:08 -07:00
Vishnu Ks 8350b89798 Add support for custom error message in realm-creation-failed template. 2016-06-24 17:47:56 -07:00
Michael Cordover a51ec44005 Search streams from left sidebar (resolves #565).
Assigns hotkey 'w' to search streams.
Only show search box when active. Activate with hotkey or by clicking
STREAMS.
Filter matches at the beginning of words in stream name.
Behaviour is otherwise almost identical to user search.
Casper tests.
2016-06-23 17:21:57 -07:00
Vishnu Ks 574a304b12 Mention invite emails are printed in console in dev.
This is part 2 of #1046.
2016-06-23 17:07:11 -07:00
Tim Abbott 2080038e7c Fix Jinja2 conversion bug in placeholder email value.
The `email` parameter to this template is only set if the user is
redirected to the login form after attempting to register for a new
account with an email address that already has an account.
2016-06-22 17:07:02 -07:00
akashnimare 42ebf6acb7 Update Zulip /hello page to match zulip.org.
[with rebasing tweaks by tabbott].
2016-06-21 14:54:46 -07:00
Vishnu Ks ff66ce780a Mention emails are printed in run-dev.py console.
Fixes: #1046
2016-06-20 11:07:20 -07:00
Vishnu Ks ad1c3894d9 Add interface for creating new realms.
This is controlled by settings.OPEN_REALM_CREATION; if that setting is
off, this feature doesn't do anything.
2016-06-17 16:15:28 -07:00
Tomasz Kolek 76cbe89613 Add IFTTT integration. 2016-06-16 15:30:45 -07:00
Tomasz Kolek 4e51a86ea4 Add updownio integration. 2016-06-14 12:14:07 -07:00
Tomasz Kolek 14d69348d3 Add Airbrake integration. 2016-06-13 20:36:40 -07:00
Umair Khan c8d139b2b1 Fix emoji urls interaction with i18n.
When accessing emojis with relative urls we should start the urls with
a slash so that language code doesn't become part of these urls.

Fixes #1014.
2016-06-13 09:10:11 -07:00
Umair Khan 6fb0baaa25 Mark strings translatable.
Following strings are marked translatable:
- All strings which are passed to `button.text` or which affect the
    text of buttons.
- All strings passed to `placeholder`.
- All strings passed to `compose_error`.

Fixes #969
2016-06-13 09:03:56 -07:00
Tim Abbott 110d278b86 Fix api/endpoints.html template.
This was apparently broken in the Jinja2 migration.
2016-06-10 15:14:50 -07:00
Caroline Liu 60e5140406 Add warning for @all / @everyone.
* The warning contains a count of the number of people in the stream.
* An error appears if the warning is ignored and the user tries to
  send the message anyway.
* The message cannot be sent until the warning is acknowledged or @all
  / @everyone is removed.
* This only applies to stream messages and not private messages.

Fixes #853.
2016-06-09 14:38:58 -07:00
Tomasz Kolek 8411b2e574 Add Crashlytics integration. 2016-06-04 15:18:42 -07:00
Tomasz Kolek 093e5a96d4 Add Transifex integration.
Fixes: #810.
2016-06-04 14:52:57 -07:00
Rachel Kelly df36216914 Change instances of 'coworkers' to 'users'.
In order to genericize use of Zulip outside companies,
    all instances of coworkers have been changed to users.
    NOTABLE EXCEPTION: When the Zulip instance is domain-
    locked, the reference to coworkers remains.  The reason
    for this is twofold: first, the majority of Zulip instances
    which require a particular domain will be locked to a
    company, and second, the template variable for the domain
    necessary should be added to the alert so it is clear
    to the user what the domain needs to be for access.

Fixes: #861.
2016-06-02 16:05:27 -07:00
Eklavya Sharma 94e4b39112 Replace python2.7 by python everywhere. 2016-05-29 05:03:08 -07:00
Umair Khan 82b5d9304b [third] Integrate i18next with Handlebars 2016-05-19 22:58:25 -07:00
Kartik Maji 3d77aa49db Add subscribe button in narrowed view when stream has no messages.
A temporary message appears on successful subscription, with a button
offering to unsubscribe in case the user subscribed by accident.
2016-05-18 20:06:30 -07:00
Umair Khan 99b73c2728 digest emails: Fix typo in remaining_unread_pms_count.
This error likely caused this feature to never trigger.
2016-05-12 13:09:37 -07:00
Umair Khan dfc58b0ed0 Upgrade digest email templates to Jinja2.
Fixes: #780
2016-05-13 01:01:28 +05:00
Tomasz Kolek eeeb4d0c92 Add CircleCI integration.
Fixes: #617.
2016-05-11 21:17:37 -07:00
Sumana Harihareswara c270b94b21 Fix formatting, grammar, and style in Yo integration docs. 2016-05-10 21:34:05 -07:00
Sumana Harihareswara 4c529cdf37
Update Getting Started With Hubot doc link. 2016-05-10 20:54:28 -04:00
Umair Khan 5359e6b0d4 Convert Zulip to use Jinja2 templates.
This results in a substantial performance improvement for all of
Zulip's backend templates.

Changes in templates:
- Change `block.super` to `super()`.
- Remove `load` tag because Jinja2 doesn't support it.
- Use `minified_js()|safe` instead of `{% minified_js %}`.
- Use `compressed_css()|safe` instead of `{% compressed_css %}`.
- `forloop.first` -> `loop.first`.
- Use `{{ csrf_input }}` instead of `{% csrf_token %}`.
- Use `{# ... #}` instead of `{% comment %}`.
- Use `url()` instead of `{% url %}`.
- Use `_()` instead of `{% trans %}` because in Jinja `trans` is a block tag.
- Use `{% trans %}` instead of `{% blocktrans %}`.
- Use `{% raw %}` instead of `{% verbatim %}`.

Changes in tools:
- Check for `trans` block in `check-templates` instead of `blocktrans`

Changes in backend:
- Create custom `render_to_response` function which takes `request` objects
  instead of `RequestContext` object. There are two reasons to do this:
    1. `RequestContext` is not compatible with Jinja2
    2. `RequestContext` in `render_to_response` is deprecated.
- Add Jinja2 related support files in zproject/jinja2 directory. It
  includes a custom backend and a template renderer, compressors for js
  and css and Jinja2 environment handler.
- Enable `slugify` and `pluralize` filters in Jinja2 environment.

Fixes #620.
2016-05-09 09:55:18 -07:00
Umair Khan f20b907f96 base.html: Add check for undefined user_profile.
The previous code that neglected this check worked with the Django
templating engine but will not work with Jinja2.
2016-05-09 09:48:37 -07:00
Tim Abbott f06c8c7cc2 Update *.readthedocs.org => *.readthedocs.io.
ReadTheDocs has moved their hosting of user project websites to the
new readthedocs.io domain.
2016-04-29 16:00:08 -07:00
Antek Grzanka 646ea3214a Add Taiga integration. 2016-04-28 13:44:53 -07:00
Tomasz Kolek 5fbda3a9c1 Add codeship integration. 2016-04-26 09:54:01 -07:00
David Payne 8c62a27769 Add teamcity webhook integration.
This integration relies on the Teamcity "tcWebHooks" plugin which is
available at
https://netwolfuk.wordpress.com/category/teamcity/tcplugins/tcwebhooks/

It posts build fail and success notifications to a stream specified in
the webhook URL.

It uses the name of the build configuration as the topic.

For personal builds, it tries to map the Teamcity username to a Zulip
username, and sends a private message to that person.
2016-04-26 09:45:26 -07:00
Tim Abbott 0669262ccb /integrations: Document how to contribute integrations. 2016-04-19 16:21:33 -07:00
Kumar 4eced69228 Make subscriptions page error bar visible even when scrolled down.
Previously, the Zulip subscriptions page's error bar would always be
at the very top of the scrollable view, and thus would likely be out
of view when an error happened.  This fixes it by having the error bar
always placed below the search box (and thus visible regardless of
where in the scrollable streams view we are).

Fixes: #515.

[commit message and comments expanded by tabbott]
2016-04-08 21:04:43 -07:00
Tim Abbott 64e527ff34 Fix ordering of documentation blocks in /integrations.html. 2016-04-08 20:29:45 -07:00
Anindya Chakravarti efb7c902de Correct alphabetical order of integrations page. 2016-04-08 20:26:47 -07:00
Tim Abbott ba30713078 Fix whitespace linting errors in html files. 2016-04-08 11:52:11 -07:00
Anindya Chakravarti f3d03d89b4 Add integration for Yo App.
[includes some small tweaks by tabbott]
2016-04-08 11:02:10 -07:00
Tomasz Kolek 44ed9da7f0 Add pingdom integration. 2016-04-08 10:36:29 -07:00
Vishnu Ks fe77559164 Fix broken link to Google Play store badge. 2016-04-08 08:37:17 -07:00
Luke Faraone 5c28b0340a Don't show Zulip.com terms on other sites
While we already don't link to /terms anywhere on the site, they can still be
accessed if you navigate to /terms directly. Now, those routes will only be
exported on the Zulip.com service.

We should ideally provide a mechanism for deployments to specify their own
terms without modifying source code; in the interim, sites that have already
customised the provided Zulip.com terms can simply carry a patch reverting this
commit.
2016-03-21 05:46:28 +00:00
Tim Abbott 49b55af9cd Fix trello-to-zulip URL.
The original author had deleted his repository.
2016-03-20 17:53:43 -07:00
Vladislav Manchev 7aab17d0c0 Add several major Hubot integrations to integration docs.
Related to #335.
2016-03-20 11:50:21 -07:00
Tim Abbott 50bc32dc95 integrations: Document server-side setup for twitter integration. 2016-01-23 11:44:53 -08:00
Tim Abbott 529d7a2877 Release API version 0.2.5. 2016-01-23 11:38:47 -08:00
Josh Mandel 9ebd80ddba Add "apple-mobile-web-app-capable" meta to HTML.
This allows full-screen mode when launching from a saved app link
(mobile browser -> save link to home screen).  This works on Android,
too, despite the "apple-" prefix.
2016-01-07 23:08:52 -08:00
Allie Jones 1bd1291f3c Replace json/send_message endpoint usage with json/message. 2015-12-12 18:14:08 -08:00
Josh Mandel 716e2d9184 Add integration for Travis CI. 2015-11-30 20:41:33 -08:00
Josh Mandel 15dae10383 Only show "Sign up with google" when enabled 2015-11-24 06:13:09 +00:00
Tim Abbott 9b4c440e0d apps: Fix linking to SSO versions of desktop app.
The SSO build of the desktop app is intended only for those users who
who have settings.SSO_ONLY set, i.e. the only way to login is via the
site's SSO REMOTE_USER authentication.  We were incorrectly linking to
it on all production installations :(.
2015-11-06 09:51:25 -08:00
Allie Jones 85809e6140 Add webpack build process. 2015-11-06 09:13:25 -08:00
Ahmed Shibani 4f29cfee9e Mark strings for translation in templates/zerver
In order to enable internationalization support in Zulip, and to use
Django internationalization tools, all strings in Zulip frontend needs
to be marked for translation.
2015-11-03 23:06:31 -08:00
Steven Oud d5435fad1d Consistently use /usr/bin/env python2.7 in shebangs and commands. 2015-10-21 22:58:21 +00:00
Nicholas Bergson-Shilcock 89a2765553 Turn off desktop notifications by default for new users.
New users will no longer get desktop and audible notifications for all streams
by default.

This also updates the `day1` follow-up email to let users know they can
customize how and when Zulip notifies them of new messages.

Lastly, this adds a `changelog.md` file, following the conventions from
keepachangelog.com, to track changes for new releases.
2015-10-15 12:25:32 -04:00
Jason Michalski 7352f31c4b Add documentation for the pagerduty integrations
Add pagerduty to the list of supported integrations and walks users
through the setup process.

Fixes #36
2015-09-30 09:24:00 -07:00
Tim Abbott bda9d78092 Use settings.ZULIP_ADMINISTRATOR as contact list for deactivated users. 2015-09-29 17:59:47 -07:00
Waseem Daher 6bb9b129f7 Update Zulip support email to zulip-devel@googlegroups.com.
Ideally some of these templates should really point to the
local installation's support email address, but this is a
good start.

Exceptions:
* Where to report security incidents
* MIT Zephyr-related pages
* zulip.com terms and conditions
2015-09-29 17:59:47 -07:00
Josh Nichols 6888826d5b Link to settings page with absolute path, rather than explicitly zulip.com 2015-09-25 22:59:35 -04:00
Allen Rabinovich d6a41b4fe3 Add announcement of open sourcing to certain zulip.com pages. 2015-09-25 12:07:55 -07:00
Tim Abbott 78a9b301d0 Make clear the meaning of the colors in Zulip Dev Login.
(imported from commit 1b7d1de2bbf9d9e0c30873a1f65df16f6ecde225)
2015-09-22 21:21:43 -07:00
Tim Abbott 21ac93ae9c Remove the send_to_prod hack.
(imported from commit ba2a4d5e7d83769add979cc05996dbd8b014e8a2)
2015-09-19 21:54:51 -07:00
Neeraj Wahi 9f0a6272fa Removed dbx_branding flag and Dropbox corner logo
(imported from commit d205898671643985e2de7c0d6d300bdca32cae21)
2015-09-19 15:16:42 -07:00
Reid Barton 0a3bdc20e9 Only autofocus email/username fields when they are present
(imported from commit e5fa2e19a6e2ffaeeccf32b82e993188144e48ba)
2015-08-28 16:18:12 -07:00
Tim Abbott 51841d5bcb Fix terms of service and Dropbox logo on website.
(imported from commit 29c838fbd3aa495bb85b730b134b31f544de7a8b)
2015-08-22 14:33:15 -07:00
Tim Abbott 1d2efb46c1 Remove stray reference to our signup form.
(imported from commit d6e48d198c2e44387d4f2cd2f9cbcddd535a32db)
2015-08-22 14:24:02 -07:00
David Roe 3f7cb34b00 enterprise => voyager
(imported from commit 04be792bb480d5e5db1c91d296d1000cf1682571)
2015-08-21 10:33:35 -07:00
David Roe f79adf830f deployed => production
(imported from commit 2d7b0a7a73b0c84b32634a88af1e0d666139d4ff)
2015-08-21 10:33:35 -07:00
Anders Kaseorg bded0d9d54 Remove corporate beta signup form
(imported from commit 1b3a0cd8a59a124905fa4cbd3121a78d23aeb3a2)
2015-08-20 18:40:34 -07:00
Anders Kaseorg 3043859700 Remove CUSTOMER3 advertisements
(imported from commit c48b478cbb7b682f1c76af027b487af73893c2be)
2015-08-20 11:10:39 -07:00
David Roe dedc83e5dd Switch links on login page to the register page in Dev VM.
(imported from commit 16e285b2d8f3c5124eaef0b20aa1097d4a1934d0)
2015-08-19 22:24:53 -07:00
David Roe 472898cfc6 Allow adding users to realms more easily in Dev VM.
Include new field on Realm to control whether e-mail invitations are required
separately from whether the e-mail domain must match.
Allow control of these fields from admin panel.
Update logic in registration page to use these fields.

(imported from commit edc7f0a4c43b57361d9349e258ad4f217b426f88)
2015-08-19 22:24:53 -07:00
David Roe 32783ebbfb Admin users in red, at beginning, in dev login view
(imported from commit 530f0a5d26d5c2b637834281e45adb399852ae0a)
2015-08-19 22:24:53 -07:00
Jonathan Dahan 6f77e68622 Add GET /export endpoint, which dumps important tables in json.
Meant to be used in tandem with the manage.py import command.
The following sensitive data is scrubbed:

  * user api keys
  * user password hashes
  * stream email keys
  * invite-only streams
  * messages from invite-only streams
  * messages from users from other domains

(imported from commit 8e58dcdcb80ef1c7127d3ab15accf40c6187633f)
2015-08-19 15:31:08 -07:00
David Roe 46e224997e Add a new dev login page for logging in without a password on the dev VM.
(imported from commit ac8f2504771c9907b7e92dc91cec5f7220ce951b)
2015-08-18 20:17:47 -07:00
David Roe 81d0f7c172 Switch copyright clause on signup page to link to /hello.
(imported from commit 77b711acf017a3b17da8fe4e167f2f9263e6cf19)
2015-08-18 10:52:28 -07:00
David Roe 147304c676 Remove +Dropbox from login logo
(imported from commit f4f811ae33122d5fd2f226ec45f2ca7bd759a148)
2015-08-18 10:52:09 -07:00
Zev Benjamin 466a678c2c Remove "More messages below" indicator
It's been very buggy for a while, has limited usefulness compared with
unread counts, and profiling over the weekend indicates that it's very
slow.

(imported from commit 716fe47f2bbec1bd8a6e4d265ded5c64efe2ad5c)
2015-03-30 15:44:36 -07:00
Leo Franchi 2bb268476e Rename Streams to Manage Streams, remove hr
(imported from commit aa0dccbb35d1e10b8c7b4bbad777e176e838b965)
2015-02-10 07:23:00 +00:00
Zev Benjamin 2c760ae735 Remove mixpanel
(imported from commit 9b6cc58ee9be483db8bf2d2eaaaecabc14f821e4)
2015-02-06 13:59:30 -08:00
Jason Michalski a3de75bf8b Update redirect to stage copy
(imported from commit 995a147de57752aa5e8321ea0c580975147d15d1)
2015-02-06 01:09:16 -05:00
Jason Michalski bb9ced6e57 Redirect users on the dropbox realm from stage to prod
This commit should only be pushed to stage after c290b630e has been
pushed to prod otherwise it will create a redirect loop.

(imported from commit 408407b845ded596705b1abd8ad13c0aedf6d732)
2015-02-06 00:07:06 -05:00
Jason Michalski 439b86fe3b Migrate the google SSO from openid to oauth2
(imported from commit 6938c1cc5d245cc5642043279470365ff04df903)
2015-02-05 21:54:28 -05:00
Jason Michalski 693857a1f8 Flip the prod to stage redirect for the armooo@dropbox.com
This change will redirect armooo@dropbox.com from stage to prod. It also
removes the prod to stage redirect for all users. This will be rolled
out in two commits to prevent a redirect loop.

(imported from commit c290b630e746f757429b8bbdadbe7768367a5e33)
2015-02-05 17:19:14 -05:00
Jason Michalski 23ef278d29 Allow replying to missed PM emails on the zulip.com realm
* Fixes a few bugs with missed message address for PMs and huddles.
* Uses missed message address for all missed message reply-to headers on
  the zulip.com realm.

(imported from commit 61dd09386e1bbdf9a5096e2400984d31e73a5b74)
2014-10-06 15:27:54 -07:00
Waseem Daher 752ff34f8f Whitelist Zulipers that can use the dropbox.com realm on prod.
And make this impossible to do in the Desktop app.

(imported from commit 2caa1b05256a3a55fe1b98d44e7dea5ed2dac86f)
2014-07-29 21:46:35 -07:00
Waseem Daher c90b76444d More whitelabeling stragglers.
Most notably:
* Tutorial
* Some Handlebars templates
* Some modals

(imported from commit b9fb92fa2f0f78d1efbd8f7fcd280fa5652059a8)
2014-07-29 21:46:33 -07:00
Waseem Daher 307d367346 Initial support for white-labeling Zulip as "Dropbox Chat" or otherwise.
Known issues:
* No support for whitelabeling in the email
* No whitelabeling for any externally-visible branding

(imported from commit 9eab7b0744e56a87007b8621a8bb18bbb1080256)
2014-07-29 21:46:33 -07:00
Waseem Daher 203c04fdb8 More forcefully redirect Zulip users to staging.
(imported from commit e9ed69008c198da6f5af74a85e0af73f3f49bb6f)
2014-07-08 22:29:24 -07:00
Jason Michalski 8c72eddb72 Add a warning when in the zulip.com realm on production
Display a red warning box to get users to direct users to staging for
the zulip.com (dropbox) realm.

(imported from commit 01ad4209d9247406bc82f5dedaf21371101a1d84)
2014-05-21 13:13:27 -07:00
Allen Rabinovich 0b44b7eb4c Switch to a Zulip+Dropbox logo in the header
(imported from commit bbd36b362f4480c83455981fce1c05faca5acabe)
2014-04-16 22:24:35 -07:00
Zev Benjamin 2cfeef606c register.html: Don't try to focus the full_name field if it doesn't exist
(imported from commit f420d9075e5129582522e79f706c448f6c82f6aa)
2014-04-04 16:51:32 -07:00
Waseem Daher 202ac0fe10 Restyle /hello to be more consistent with current app style.
(imported from commit 7e1df8cb885908f40569692283e98ac851ca3d2e)
2014-03-14 20:48:51 -04:00
acrefoot 3d7c3a6de3 Bring the Github integration setup page up to date
We're no longer called 'Humbug', and we have more configuration options.

(imported from commit 56c1c4a25e601def35de102fba86960444ddf513)
2014-03-11 13:06:18 -04:00
Waseem Daher 96f6939284 Fix a few more unstyled 'cancel' buttons.
(imported from commit 1d8145fe1576af62b73be0badad9de1b75da816a)
2014-03-06 21:59:53 -05:00
Waseem Daher d8108f944c Restyle bankruptcy "no" button.
(imported from commit 86520ec9e0067316d2f737175e59315745be62b7)
2014-03-06 21:59:53 -05:00
Waseem Daher 095c82ecc4 Actually switch to Bootstrap3-esque buttons.
(imported from commit ddcecb8c5a63324a666ffe170e2d5a76171776c9)
2014-03-05 16:24:54 -05:00
Steve Howell 58c44fee3e Document negated topic searches.
We don't have room in the dialog to show every variation of
the negated search syntax.  If we start by documenting negated
topic searches, we may get some discovery on the negated search
features without cluttering out the way more common search
options.

(imported from commit 3b2c2672d125788dc71a5eeb2b6f1e551380c62e)
2014-03-05 10:54:02 -05:00
Jessica McKellar 87635b9e32 Convert settings from static HTML to a template.
This will make life much easier for handling update events.

(imported from commit 66b101eb5fae89b4eec6fc797fee8be26ac99bfb)
2014-03-03 16:08:32 -05:00
Jessica McKellar 88c8472a31 Clarify the cases in which you receive notifications.
(imported from commit 7b41b8a1f4baedbc744a6b222fa0ff3127e7a228)
2014-03-03 16:08:32 -05:00
Jessica McKellar 07bb7b2fee Give users the option to propagate global stream changes.
This helps the common case of not liking our default of having audible
and desktop notifications enabled, and not making users adjust the
settings on every existing stream to fix it.

(imported from commit be75edb2c1385d1bd9a289416e2dffd8007f5e0a)
2014-03-03 16:08:32 -05:00
Jessica McKellar e0bd15669a Don't post checkbox data directly to /json/notify_settings/change.
They have weird properties like not sending anything for unchecked
boxes, which makes it hard to wrap a client-agnostic API around.

(imported from commit fef73a57a55b218b55dab6be3453dd6eac73c789)
2014-03-03 16:08:32 -05:00
Jessica McKellar d89696291f Remove Notification (?) explanation popover.
(imported from commit f261f87c9571a76b8b0e2538ccb3bb4826ef449e)
2014-03-03 16:08:31 -05:00
Jessica McKellar c673b3b0b1 Pass global stream notification settings between frontend and backend.
(imported from commit 28ec021e8e5166d3b270c81c5a4ad543d2185aa5)
2014-03-03 16:08:30 -05:00
Leo Franchi 3450d05858 Open link to boto project in new window
(imported from commit 7c36d4cd2bb8bff6c02261a2a5894965eb88e429)
2014-02-28 17:48:00 -05:00
Allen Rabinovich ba0d3605ae Fix stream list scrollbar visibility
(imported from commit ef1f860ecd7f3ae908a69ac7c35a45d959505966)
2014-02-28 16:27:13 -05:00
Steve Howell 5d0abd6f3f Add whitespace to django template tags.
(imported from commit 595328eab56d018319749234134e6b4e7ea0849f)
2014-02-27 20:25:40 -05:00
Luke Faraone 409bc7b657 Ship NOTICE for emoji and link to them from the web interface
(imported from commit d0020a3a0115f16540a256061078025fa1ae6526)
2014-02-27 20:25:32 -05:00
Steve Howell 09958cbf66 s/Restore last draft?/Restore draft/ in compose box.
(imported from commit 6f15b35e4ced62628709ec039e477a8a3a16738e)
2014-02-27 20:25:29 -05:00
Allen Rabinovich 1686d27633 Tweaks and changes to adjust for new message block markup
(imported from commit 78210c2b98976243ee1b516bd9400a3071dd8cd9)
2014-02-27 20:25:25 -05:00
Luke Faraone 8075c6e5a8 Allow cycling between streams with shift+{A,D}
Closes trac #2273.

(imported from commit 858ffd47aa6dbb372d426fe94b860dfe1c1cce34)
2014-02-20 13:27:43 -05:00
Steve Howell da874f8ec6 Add is:alerted to search help.
(imported from commit 0c545fb35af0040047fcf53c560941feee2da9ad)
2014-02-19 13:16:00 -05:00
Allen Rabinovich b00ebd1bdf Miscellaneous fixes to message pane redesign
(imported from commit 8cedb21cb3a520dd9a28c943e047e8f73f410cae)
2014-02-18 12:50:32 -07:00
Allen Rabinovich 56f1c023ab Redesign elements in left sidebar
(imported from commit 37ae516325a4bd4db7a9e45e7862af6fee3af46e)
2014-02-18 12:50:32 -07:00
Allen Rabinovich 01a04c3169 Add offsets to fixed elements based on the width of the browser scrollbar.
(imported from commit 2026725165dead381d0b99181ef84a67a5bd6626)
2014-02-18 12:50:31 -07:00
Allen Rabinovich 4c4cd1ed8e Fix top notification display to appear above the floating recipient bar
(imported from commit 0a5915af3589db09ee2bc294afced0a21352fde2)
2014-02-18 12:50:31 -07:00
Allen Rabinovich 2c56e692a2 Fix floating recepient bar hiding when switching to settings pages
(imported from commit 9a643075197a53e84df196c3dcc1ce04766d3d4e)
2014-02-18 12:50:30 -07:00
Allen Rabinovich dbdc0a9721 Switch message pane headers to new design
(imported from commit f640641553779450f9d9d15e5586ef38e068367b)
2014-02-18 12:50:29 -07:00
Allen Rabinovich e7e2f3a79c Modify crumbbar style to look like an arrowbar
Also:
  * Change fixed element positioning and fix bugs
  * Move settings dropdown back to the right and add left padding to left sidebar

(imported from commit fcf903b59617687f94618a01ce7544b69f408130)
2014-02-18 12:50:29 -07:00
Allen Rabinovich 29250a6692 Move crumbbar to header and change visual appearance
(imported from commit 435e3b46b615f6c496be10b7d170ed3e4201787d)
2014-02-18 12:50:29 -07:00
Steve Howell 14281de262 Fix brittle layout for "Keyboard shortcuts" help.
Adding one row to the Navigation table made the
Keyboard shortcuts dialog look ridiculous, and it
was caused by a design based around float-left-ing
that broke down when the size of the "Navigation" box
was bigger than the "Composing messages" box.

Now we use a div to enclose the top two boxes in
the modal.

(imported from commit 90288ec288d4cf3d50ed7f5bcb48c8bb3d033f19)
2014-02-18 13:04:36 -05:00
Steve Howell 2c6d7e8e18 Support q hotkey to Search people.
(imported from commit eafaf5900461e2df52de9ddbdc49823bf6d9e403)
2014-02-18 13:04:36 -05:00
Tim Abbott d7e4429bb7 Revert "Add adjustments for browsers with fixed scrollbar"
This reverts commit 462a3eb5e6b83f9d8091b83e3f8dc458236938ed.

We're reverting this to see if it is the cause of our recent CSS
performance issues.

(imported from commit 6a0b041cfcb6770bbfda0d354444bad2d64459ab)
2014-02-13 16:41:03 -05:00
Allen Rabinovich addfcbfc30 Add adjustments for browsers with fixed scrollbar
(imported from commit 462a3eb5e6b83f9d8091b83e3f8dc458236938ed)
2014-02-12 10:47:54 -05:00
Jessica McKellar 9252b3f336 Refine initial invite page language.
(imported from commit e7d4fcb065af8bfd9496471958f671552efa9a60)
2014-02-04 15:51:53 -05:00
Jessica McKellar da757b7195 Update copyright to 2014.
(imported from commit 733baed61e26be0c07a7e7a605618087df6b0866)
2014-02-04 15:51:53 -05:00
Steve Howell 259f6123e6 Move "Customize avatar" button below "Save changes" on settings page.
The old layout was misleading, because users would make the perfectly
reasonable assumption that their avatar change wouldn't be made until
they hit the Save button.  Moving the avatar stuff below the Save button
makes the UI clear and also unclutters the form for updating name and
password.

(imported from commit 9154ba69a2d61844701c88c2afdf399532ccddd9)
2014-02-03 13:29:28 -05:00
Waseem Daher 1016686397 Typo fix in day2 email.
(imported from commit bf36702c84ba545a64bf5c6531ce30fc23ef6ac7)
2014-01-30 07:57:52 -08:00
Jessica McKellar 7085dca1ce Fix the Admin page not working for newly-knighted users.
Previously, while you'd get the event saying you'd been knighted,
which would make the Administration tab visible, clicking on the tab
would error out because the admin page HTML was never sent over on
page load (since you weren't an admin at that point).

(imported from commit 90ad351533515bebece630d67baf4b142d320754)
2014-01-29 12:41:22 -05:00
Jessica McKellar 3d234e1b84 Update admin page language on deleting streams.
(imported from commit 3670c65e3fe9e79855b1c0ffaa08f48368de9856)
2014-01-29 12:41:21 -05:00
Jessica McKellar 20f2baa614 admin: Show a lock icon next to private streams.
(imported from commit 26829016cf219b55aef0ef45187667b0a9bd86fd)
2014-01-29 12:41:21 -05:00
Jessica McKellar ebd6408ec7 Make the tutorial shorter, and visually highlight important concepts.
(imported from commit 543d0ff838edbc2148df4b8d08331c793c7af4f6)
2014-01-23 17:06:27 -05:00
Steve Howell 887c2059b1 Make the Administration menu item be show/hide-driven.
Always render the Administration menu item from the back end, but
make it be hidden by default until the page is loaded.  Then, the
client can un-hide it as needed.

(imported from commit 66e607eec430d7179b4d5ac3f5416f5be8ac26c9)
2014-01-22 14:43:29 -05:00
Jason Michalski 4c90392261 [schema] Add an per-user option to disable notification on new streams
Added a default_desktop_notifications boolean to userprofile with a UI
in Zulip Labs. This flag is used to default the notification flag on new
subscriptions.

(imported from commit a25223cc5ecf09980cf877991e25034bb3fd4046)
2014-01-16 20:13:34 -05:00
Steve Howell fafb6f3bb5 Say "Search people" in user search box.
(imported from commit 901dc984dc19d8f21baff41ce700d0cbcd6fbdbb)
2014-01-15 16:05:52 -05:00
Jason Michalski d14e200ecd Add missing colon after Assignee
(imported from commit 18dd6d1fd80012b2e3337cdbfa893028d241326f)
2014-01-15 16:05:51 -05:00
Tim Abbott c943ca6b0d Fix compose_invite_users alert bar being being visible on page load.
(imported from commit 6b233f4a05d5d76b7ca7bb9d499ed284c6384b8a)
2014-01-14 12:09:14 -05:00
Jason Michalski 42d561546b Add integration documentation for Zendesk
(imported from commit fb719144cc4fce7c8a794da1abb747595e2c239c)
2014-01-14 12:01:54 -05:00
Steve Howell cb6438234a Add search filter for user list.
Whatever text is entered into the search box under users is used
to filter users by their full names.  You can use commas to search
for multiple users. Search terms must be at the start of names, so
"st,fr" would match "Steve Howell" and "Leo Franchi" but not
"jesstess."  Names are case insensitive.

(imported from commit 822b72883928d3c941d38e9798774d71b0689f30)
2014-01-13 16:16:05 -05:00
Jessica McKellar e9dc149340 Make custom-alert-bar-content customizable.
(imported from commit 9947b15596fc818fcf3106606d1e638073a415f8)
2014-01-13 10:36:48 -05:00
Luke Faraone a9faaecb97 API release 0.2.4
(imported from commit 42145c829f5bd2282b72c2658f19766cf2346a2b)
2014-01-11 15:52:21 -05:00
Waseem Daher accbe1c16d Link to Markdown table syntax docs.
(imported from commit d8d1c2f335530443b0c42b9a4cd9a6b61159a943)
2014-01-10 21:39:05 -05:00
Leo Franchi 45d3bb4f04 Update our pivotal integration to handle v5 of their API
(imported from commit 2deba4ed2f72c7d7ccedafbb8fc4370b2faa5490)
2014-01-10 21:39:00 -05:00
Jessica McKellar 32549ec135 Show new users an error page when they try to sign up for a deactivated realm.
(imported from commit 1696a6a5d26ec92b881cd3fda43e6b262e2fbfa5)
2014-01-07 20:24:21 -05:00
Luke Faraone 7f72b7ce34 Switch to new app links on Google Play.
These may not work at time of writing due to propegation delays, but I
promise they'll be active soonish.

(imported from commit 4ed9e85f282fb868a75fa427f897bad8469d9e03)
2014-01-07 13:43:52 -05:00
Steve Howell 12b921c9a3 [verify after deploy] Fix API endpoint docs.
After deploying to both staging and prod, double check the docs
are correct here.  This fixes the API docs on prod, which had
"POST /api/v1/messages", despite "/api" not being part of the
prod path.  Prod docs are here:

https://zulip.com/api/endpoints/

(imported from commit a2c4d316128f88171f4a76074314be64d9bc9728)
2014-01-03 19:10:01 -05:00
Steve Howell 4900ac4b20 Split out method var in api_endpoints.html
(imported from commit 3d49f6755cca73a0a969486e80cb558561d3f222)
2014-01-03 19:10:00 -05:00
Jessica McKellar aa36b7fb5f Document our RSS integration.
(imported from commit 61e956705b526b4bbeb3a0908d00ebd92d216395)
2014-01-02 13:39:32 -05:00
Waseem Daher 3ceb43dccd integrations: Update Jenkins integration documentation.
(imported from commit e17bf74f35baa560e0e2537177c38988d63643df)
2014-01-01 22:17:53 -05:00
Waseem Daher 4a7a5d5d10 Document Kensho's puppet integration.
(imported from commit 0beccd70ad5f60471e0b131cbfe05226e40a9a69)
2013-12-29 19:38:33 -05:00
Jessica McKellar d7acc94a0b Update the GitHub integration docs for the revised GitHub layout.
(imported from commit 0604931e96c1e523785a58a1641fe945bc39abc3)
2013-12-23 11:02:26 -05:00
Jessica McKellar f58a3ca1fa Switch subject => topic in integration docs.
(imported from commit 05429fba047c2d023d6ebd294df9b554435cc8bd)
2013-12-23 11:02:26 -05:00
acrefoot 0d08acaa1b Transition from tables to divs for the message list.
This breaks our casperjs tests.

(imported from commit c63181c73a24eed4a80bfa56966d1f0871c5edb2)
2013-12-19 18:28:11 -05:00
Waseem Daher fc7b8b1254 Offer a "reload" hyperlink when we have no CSS.
(imported from commit 237a544c135ad2ad29bd9d1a2b21be2335d2fcd5)
2013-12-18 17:49:34 -05:00
Waseem Daher 45dd03bfc7 apps: Properly name Linux repo key.
Tiny remove-newline fix as well.

(imported from commit 5c68635973366b9ff68a96fdca3bf3196583d690)
2013-12-18 14:22:11 -05:00
acrefoot c30f2bbe3e slightly stricter linting of html templates
(imported from commit 5bd0aa3c49d6ff95559a73bd5f134cc50ae98ce9)
2013-12-17 12:05:23 -05:00
Tim Abbott 150ca939b1 Disable some buttons in embedded widget.
(imported from commit 7d6d4725b139ea71c579dfd7d19c38d7bb11ee44)
2013-12-16 17:46:02 -05:00
Waseem Daher 9b58aef815 Reindent settings page.
When examined with 'git diff -w', this should basically be a no-op.

(imported from commit 99bdaca61eae84772b4d5deb12adc2af73233e97)
2013-12-16 10:43:49 -05:00
Waseem Daher fa17fb0da1 Place "autoscroll" option in a "Zulip Labs" section.
(imported from commit 31e8d0b5c1454932398cf732c0c4ad0702e5274b)
2013-12-16 10:43:49 -05:00
Jessica McKellar 129d01e139 Remove stray typo in plaintext digest email template.
(imported from commit ccef927bd2e0fa5810a539c569785d4bdb640819)
2013-12-13 16:38:10 -05:00
Jessica McKellar 35c2804c13 Use PM coloring for PMs in missed message emails.
Previously it used a blue header and white background for everything.

(imported from commit 03b8b0f8fb33a581d67a249f0496cc27aab30ef3)
2013-12-13 16:38:09 -05:00
acrefoot 07501cd12c only show 'auto-scroll forever' setting for zulip.com and customer28.invalid
(imported from commit 329ea6a4f715a093a1ab56777964ca751300ac0c)
2013-12-13 11:50:11 -05:00
acrefoot 1bd420f12c Show auto-scroll forever setting in /#settings
(imported from commit fa66cbe52836f230e551f25c47bd755b705387d2)
2013-12-13 11:50:11 -05:00
Tim Abbott 218321deb6 Improve documentation of the events array.
(imported from commit d53f561cbf1e802ed34fe8030aa7759ef9b15631)
2013-12-12 17:36:41 -05:00
Tim Abbott 858d67e769 Clarify use of JSON for the event_types list.
(imported from commit 1822508eea5c56cf8cdd48e54f86622f4ef7a858)
2013-12-11 16:45:29 -05:00
Tim Abbott 5e9ff76d26 Fix API documentation method for register endpoint.
(imported from commit 8b6e722cec269dbb35d85ce4f421f4feb5eb5a42)
2013-12-11 16:45:29 -05:00
Steve Howell aea01d54ac Make app less shocking when CSS fails to load.
We now have a stand-in message that says "Loading CSS...", which
only gets hidden once the CSS loads.  This is a better user
experience than seeing completely unformatted Zulip HTML on the
page.  The message is set to fill the whole page, and it's cleared
once zulip.css gets loaded.

(imported from commit 613fe3d6a39197aabfeb63823b7fad75834bb9eb)
2013-12-11 11:58:10 -05:00
Tim Abbott 17a4d6654f Add @-all and ``` quote to our markdown documentation.
Also compactify and reorder it a bit to ensure that emoji and
@-mentions are near the top, since they are compact and important to
all users.

(imported from commit 7a3e6c915d1ef1461a43302c71bda74852566ffc)
2013-12-11 11:32:25 -05:00
Luke Faraone 490af28958 Update URL for user APT key.
We're moving to S3, so apt.z.c no longer serves SSL.

(imported from commit a2d376337ddaf2f5fd4ddf193a1ff0732f89c78a)
2013-12-11 10:54:30 -05:00
Waseem Daher 0a8afbeff6 Clean up password reset pages.
(imported from commit b02088e2606b404e050e5b68a9b186de432e59d0)
2013-12-06 18:00:42 -05:00
Waseem Daher da81bcae0e customer3: EVENT2 -> conference
Keith is going to try to use Zulip again during the next conference;
CoNEXT, so we need to rebrand. We use generic language here so that
we don't need to do this every time.

(imported from commit c97f7d4bb84f2dfd4c6db265884ba17be0fd5677)
2013-12-06 13:09:04 -05:00
Luke Faraone 54d9a733c2 Documentation for the Perforce integration
(imported from commit 0b2eaed618a226d64dcff395467607f4f7d01579)
2013-12-06 11:54:38 -05:00
Steve Howell 5e4e8af0c4 Document sender:me syntax.
(imported from commit 7c32ddc70528f110ba7d2f64637da0cc8eb0a0a6)
2013-12-05 12:10:43 -05:00
Steve Howell ce57cbf22a Rename search-operators help to "Search help".
(imported from commit 29facc2965d975ae907d8d7f816f31e22ebd682b)
2013-12-05 12:08:16 -05:00
Steve Howell b612d0a53f Make search help more explicit for is:{mentioned,private,starred}.
(imported from commit 736228d483372a571e5e07b0764da521febcc970)
2013-12-05 11:52:15 -05:00
Steve Howell 424994ec9b Put sender: adjacent to pm-with in search help.
(imported from commit 580079ba941252df8e19165f613a30ee9597e4c1)
2013-12-05 11:47:28 -05:00
Tim Abbott bd68884607 Fix documentation for email gateway on Zulip Enterprise.
(imported from commit 82e706b4e8e82df3044e5fc3df70e46b2183bc56)
2013-12-04 16:39:39 -05:00
Tim Abbott feaf6843de Only document email integration if it is enabled.
(imported from commit d1f13ff30c56f7a2156e8c00621b6b955302ccf0)
2013-12-04 16:35:38 -05:00
Tim Abbott 97dd4b0cb3 Fix the whitespace in the Zulip Nagios config.
(imported from commit 5fcdac241ba075c919ecc7dbfaaa811d0089bf5c)
2013-12-04 16:30:58 -05:00
Tim Abbott 5d454afb74 api: Add support for setting site in mercurial integration.
(imported from commit 697f4697af27be6f4eddd6ddbf7affbc8739cffe)
2013-12-04 16:30:57 -05:00
Tim Abbott 9f016ed827 Update Asana/SVN integration documentation to show config files.
(imported from commit ba918f996c61294b6b7967e133ad715a8b928b79)
2013-12-04 16:30:57 -05:00
Tim Abbott d7c7913a11 Document Zulip SITE option in most integrations.
(imported from commit d7266df1fa23a5fef5d5e7cce8d108da47f36da5)
2013-12-04 16:30:57 -05:00
Tim Abbott a33eb6f61f Update API documentation to use proper URLs for enterprise.
(imported from commit cbf9fba4b8281e8ce7a6dd2964c921d2ef906559)
2013-12-04 15:10:54 -05:00
Tim Abbott 56e5bce173 Fix bugs in our API endpoint documentation.
* The "message" event type was incorrectly listed as "messages".
* The curl docs incorrectly used GET for the register API call.
* Fix missing \ in GET events documentation.
* We didn't have proper JSON format for the "message" argument.

(imported from commit f00e2f187375d24f8be4b8075b7cd7a38584fe01)
2013-12-04 13:47:48 -05:00
Jessica McKellar c46e5fd0f1 Feature flag the digest emails setting to staging.
(imported from commit 1239ce31281850dccf8f65d0c7156bd2c86ca3a7)
2013-12-02 18:58:04 -05:00
Jessica McKellar c1058355f6 Add a digest emails checkbox to your settings page.
(imported from commit cf1dbae6ca30d2489a77e822c34941a986b93bbd)
2013-12-02 18:58:03 -05:00
Jessica McKellar 207cfc449d Add unsubscribe links to digest e-mails.
(imported from commit 4e2a324decf4bc694752cc24b9085361338a08a5)
2013-12-02 18:58:03 -05:00
Tim Abbott d57404683f Add documentation on search operators.
(imported from commit 9ed5692685b52d6e4d4f1a59c1b4cc0fde252ff2)
2013-12-02 17:15:24 -05:00
Waseem Daher 89844c6ced Revise day1/day2 emails.
(imported from commit dc5e78cccb22b024be46b3066d44f09ea1b53345)
2013-12-02 11:15:13 -05:00
Waseem Daher ebfcdfd35e Disable user-visible UI for editing messages, for MIT.
This doesn't actually prevent a user from making the API call into our
servers to actually go and edit a message, so this isn't a bulletproof
solution for realms where messages ABSOLUTELY MUST NOT be edited.

(imported from commit 5bf043a201e2952189b45f93b8c5ca7648f6aee7)
2013-11-30 18:32:14 -05:00
Jessica McKellar 7479ba8c8e Remove TOPICS on zoom.
Because the first thing under it is a stream and not a topic, this
could be confusing for new users, and experienced users probably don't
need the reminder.

(imported from commit 479521d96963ed4011ff2c8300f4e5027a482a41)
2013-11-27 18:34:22 -05:00
Jessica McKellar 39288d78d8 Style 'All streams' like other global filters for consistency.
(imported from commit dd4e739a3013c95e38288f1fdd5a618e47785bd1)
2013-11-27 18:34:22 -05:00
Jessica McKellar 3459962e69 API release 0.2.3.
(imported from commit 80591f61785b492b2ec8897bb2a2e5eff8e089fc)
2013-11-27 13:15:21 -05:00
Jessica McKellar 8e72084fcb Add one-click unsubscribe links to day 1 and day 2 emails.
(imported from commit 9396f96365430baf894c708f9eaea642fc648435)
2013-11-27 09:29:59 -05:00
Steve Howell eb9f7a04b7 Rewrite topic zoom to fix bugs and make cleaner.
In the first cut at topic zoom, I was re-rendering the
streams list, but this created glitches with orphaned
list items.  The reproducible bug was that unread counts
on unshown streams weren't updating.

In the new approach, I keep the elements more permanent, and
I just hide and show them as needed, either through jQuery
show/hide or permanent CSS selectors.

I got rid of toggle_zoom(), so that we just explicitly zoom
in and zoom out in all situations.  In particular, when we
narrow, it's more clear now that only stay zoomed in when
we're narrowing to the same stream as before (including topic
narrows within that stream).

When you zoom in, the number of topics is no longer limited
to 30, since that was kind of arbitrary anyway.  (In practice,
the number of topics is usually well under 30, anyway, due to
the way we track them on the client.)

(imported from commit 5b6c143dee9ba9fe557d8cc36335ff28efb4b0de)
2013-11-26 18:19:49 -05:00
Leo Franchi afa2cc25d1 Remove OS X Snow Leopard note, 0.4.0 supports 10.6 as well
(imported from commit 9471823ff1c4e03f633b382c1b5803f781ece898)
2013-11-26 17:41:26 -05:00
Waseem Daher 24978224a3 Use ``` instead of ~~~ in our Markdown documentation.
(imported from commit 7e5045ea9b809973ba5c47bf41139ec0ce66695e)
2013-11-26 14:06:32 -05:00
Steve Howell 41eded47d2 Add link to show all streams when you are zoomed in.
When your left sidebar is zoomed to show just one stream,
there is a link to to show all streams again.

(imported from commit 92f39b042168c443cbb9f524bf892557ef492551)
2013-11-26 10:34:09 -05:00
Steve Howell 44f575c812 Add topic-zooming hooks.
This commit doesn't actually add the final UI to zoom/unzoom
topics, because I want to keep those in separate commits, in
case we change how to enable the feature.  But this commit
adds a toggle_zoom() function that zooms/unzooms topics.

Zooming is minimally invasive, because we don't really introduce
many extra elements to the UI; instead, we just make the list of
streams be a list of length one (i.e. the active stream).  This
gives us a lot of stuff for free, basically, like unread counts, etc.

(imported from commit 814c1361b6210d1591b4174bed1d6e0c98a3f255)
2013-11-26 10:34:08 -05:00
Tim Abbott 9cd2dca9a5 Remove some fields from the footer for Zulip Enterprise.
(imported from commit 30b41eb1bb09ad0fb8d0ae6ab5b08c63b99f5524)
2013-11-25 20:29:27 -05:00
Jessica McKellar dbc1b4b501 Add a one-click unsubscribe link to missed message e-mails.
(imported from commit 719eb61c9b7722eb1b0996b4d5f2f8f5929ad701)
2013-11-25 15:18:40 -05:00
Tim Abbott 0748c0070b Document i-then-enter for editing a message you sent.
(imported from commit c66a484a05bed37c50d0541b8cbf685862ac3738)
2013-11-25 14:00:28 -05:00
Allen Rabinovich 1d4a92ec0e Layout fixes for settings page
(imported from commit 5bb99ee33b22625ad4101daf08ae36118d190b8f)
2013-11-22 14:54:24 -08:00
acrefoot 4cd1d69ea0 Add the ability to unsubscribe all users from a stream
This resolves Trac #2022

(imported from commit 23d5129a6bec40c33eaf71953cd41ec387646a39)
2013-11-22 17:12:51 -05:00
Luke Faraone dff03fafda Use LDAP-provided information if available for real names
If authoritative data is available from say the LDAP database, we now
ignore the POSTed user name, and don't offer it as a form field.

We fall back to giving the user a text field if they aren't in LDAP.

If users do not have any form fields to fill out, we simply bring them
to the app without the registration page, logging them in using a dummy
backend.

(imported from commit 6bee87430ba46ff753ea3408251e8a80c45c713f)
2013-11-22 16:51:26 -05:00
Luke Faraone e711b8160a Tweak wording on password help to be method-agnostic.
(imported from commit 1037df705ce599f6f62345a6f6619b2e428912ff)
2013-11-22 16:51:26 -05:00
acrefoot 9f3ab73fa4 register, login-sso, or signup depending on deploy type
(imported from commit 28fac6b626b7d3dda6f3ce0bd4ed748e0a6a7761)
2013-11-22 13:50:24 -05:00
acrefoot 3a982c7c06 Modify /hello to go to register instead of signup on Enterprise
Also move the urls.py lines to the right place

(imported from commit f9d9805fe599ceffb6cdd1ed572d8656cb0d6d95)
2013-11-22 13:50:24 -05:00
acrefoot fd4565dd67 modify day1 emails to point to new /hello location
(imported from commit e22936378eb1a8c541c4af274e6e6491cca8d313)
2013-11-22 13:50:24 -05:00
acrefoot f943d3c351 Move /features, /hello from corporate to zerver
This makes these pages available on Enterprise installs too

(imported from commit 4eaca13dfa0de8a05829ac5d642cbdb1e581add9)
2013-11-22 13:50:24 -05:00
acrefoot 8c402109b9 Remove mobile apps from /apps in Enterprise
(imported from commit 70045c21e71454642ec6950934d3e736c5fa3410)
2013-11-22 13:50:24 -05:00
acrefoot 5973f20b69 fix use of EXTERNAL_URL to EXTERNAL_HOST, and some typos
(imported from commit 3e6e0f337671b289202bc86c6224854b6ee623c5)
2013-11-20 17:39:07 -05:00
Waseem Daher d78511c933 Convert customer3 page to be about EVENT2.
(imported from commit 6ff4dafb84710fe3a4bb927ed3b8bc0f9ad9fb83)
2013-11-19 18:09:52 -05:00
Allen Rabinovich a4f3577832 Clean up the appearance of different narrow alert
(imported from commit 24882274b2e0e1b28734d594acfe5ca3cd3eb953)
2013-11-19 12:51:32 -08:00
Jessica McKellar d1619b3f3c Use a more accurate "is admin?" check.
UserProfile.show_admin was intended to be a check for users that have
administrative rights in other realms, which we've harmlessly but
erroneously been using to check if they are an admin in their realm.

Use the more straightforward check instead, with a more intuitive
name.

(imported from commit d81050c7dbbb19e59c5e31750be303a4630e1456)
2013-11-19 14:31:02 -05:00
Jessica McKellar 0355f444af Document our Asana integration.
(imported from commit 1ffa39325331631423cc99ed0fbb09d4e509eec7)
2013-11-19 13:30:35 -05:00
Leo Franchi 9ca8288918 Do not use display: none on file inputs, as some browsers will not let you trigger clicks on them
(imported from commit f05b18f7ad3f4235d33a1142db7e662f97eff308)
2013-11-19 12:35:11 -05:00
Steve Howell 1c91d1a5bc Clean up back end HTML templates.
The check-handlebars-templates script now looks at most of our
back end templates to try and find imbalanced tags.  This commit
fixes a bunch of the existing templates.

(imported from commit fad4a5d85d68160370dd588b41d6f125f64d198f)
2013-11-19 10:43:56 -05:00
acrefoot e2c388c49c Attempt 2: Notifications in the composebox
This moves the notify-not-in-view notifications into the composebox area.
It also tries to be a bit smarter about what action it links and what it displays.

(imported from commit 1c79bd0d9ef972059a006b17501a09b72e961ee3)
2013-11-18 16:09:34 -05:00
Leo Franchi 818ef42d05 Show zulip-desktop-sso package for local server installs
(imported from commit d0a05bfb2e7a15c02c0e61d6b95ef841a44340b3)
2013-11-18 12:04:43 -05:00
Waseem Daher 35dd1153ea Don't use a spinner in the "Create bot" form.
Just disabling the button with a status message is probably
sufficient.

(imported from commit dd46e5ac3d2224d84dc32d057469c434007001fa)
2013-11-16 13:03:56 -06:00
Waseem Daher dd6f1c981f Properly align "create bot" button on settings form.
Also move the "Adding bot..." spinner a little.

(imported from commit 65aa869e71a33a23f77d8bb054bbd0fe8e6a7de2)
2013-11-16 12:53:39 -06:00
Waseem Daher 5327e41156 Reindent settings page bot form.
There are no changes here, just whitespace changes.

(imported from commit 2681e22ac6a3d256ffbed0a747d1eda57e7fd149)
2013-11-16 12:43:14 -06:00
Waseem Daher 6b0584742f Remove stray <hr> in password reset form.
(imported from commit 3d233bfaba94514411ace4f638fb34e2b35aae30)
2013-11-16 12:39:26 -06:00
Tim Abbott 9e8346f6d7 Display owners for bots on the admin page.
(imported from commit d1a80ab8f784ab7e7249cc020b1980bd45434abd)
2013-11-16 11:35:26 -05:00
Tim Abbott b55e406f93 Display deactivated users at the bottom of the admin users page.
(imported from commit 1a5d5d64fffc9ed7633d468b975dd56c28f85ccf)
2013-11-16 11:35:26 -05:00
Tim Abbott c1ddc0908f Admin: Put bots in a separate table.
(imported from commit 21330e28b486e10aff6af5f48280ea675cbd5697)
2013-11-16 11:35:26 -05:00
acrefoot 5d14105d1f /hello is sacred, even on Zulip Enterprise
I broke Zulip Enterprise because I tried to make the /hello link in our day1 email
point to the local server (EXTERNAL_HOST).

(imported from commit 70262b34474ae292ecf9cfe59bebc3c7de904926)
2013-11-15 22:34:24 -05:00
acrefoot bafb6f8dc3 fixup day1/day2 email templates
(imported from commit 30846fc298d04ac763025e82a60731d158840462)
2013-11-15 21:51:37 -05:00
acrefoot daffe049ad Don't use hardcoded noreply@zulip.com, zulip@zulip.com, or https://zulip.com
(imported from commit 1132553b63ae23ebcca746f0f65205b97bfee7dc)
2013-11-15 21:31:37 -05:00
Jeff Arnold d0622e796c Simplify the UI by removing the user's own name and avatar
(imported from commit 60d6ff1d677e3efe31e68df2c4387ddd2bd8084d)
2013-11-15 18:48:51 -05:00
Jeff Arnold a9a4b018d0 Simplify the UI by removing the word narrow from the search bar
(imported from commit 46890e4bfded5ce67adc3f2cd0c68820a052c6d0)
2013-11-15 18:41:02 -05:00
Kevin Mehall 53c76aa657 Move enterprise-registration to zilencer/ from zerver/
(imported from commit d8a58913040376dbdbc9dcee13ab8a7910733da7)
2013-11-15 11:21:52 -05:00
Leo Franchi 8511538c46 Change wording of license agreement link
(imported from commit a6d5ad8375232f8b43092383b75e5c195229a741)
2013-11-14 14:27:34 -05:00
Jessica McKellar ff4f5e3b71 Add enterprise terms fields for CUSTOMER13 to the registration page.
(imported from commit f411277196c621265d645538b89a69468a1e3f77)
2013-11-14 14:21:27 -05:00
Kevin Mehall bb0d18bc73 Spell Zulip correctly on enterprise form
(imported from commit a1146320c2992428c51f6ec8d25fc97746e02d27)
2013-11-14 13:38:58 -05:00
Leo Franchi ea648d19a1 Rename template vars in zilencer's use of login.html for clarify
(imported from commit ffd5aa569054fb3949775a7f3e2e02634b814c06)
2013-11-14 10:56:29 -05:00
Leo Franchi 5fd97e48c3 Show a SSO login page for SSO users that just has a login button
(imported from commit 0004bf8710491f4e2d967b4367b37d57833845ee)
2013-11-14 10:56:07 -05:00
Tim Abbott 90c011e632 Fix rebase issues in the not_enterprise transition.
(imported from commit f0a8169825de303c60e5dba5cd95eef96cd7de7e)
2013-11-13 21:04:43 -05:00
acrefoot 34582d8e0a enterprise: disable feedback button in gear menu
(imported from commit 78d50979366b20ad4cfe708dd5b360746b09c861)
2013-11-13 20:40:39 -05:00
Tim Abbott e64472cd32 Rename enterprise template variable to not_enterprise.
The problem here is that some error-related templates render without
the context managers that we specify, and so we want the handling of
"the context was not set" to default to the enterprise case (because
the enterprise version will work basically fine on !enterprise, but
the opposite is not true because the enterprise distribution doesn't
even have the templates for certain !enterprise pages that may be
linked to).

(imported from commit 7547311d87e048d33221587f44b82fe0ba320ca1)
2013-11-13 20:10:33 -05:00
Jeff Arnold 11d05c1689 Our docs should not try to hire our customers' employees
(imported from commit aae1e6fb236b44eabcf3cf7c4e48534bea6cd731)
2013-11-13 19:57:50 -05:00
Leo Franchi 372984b56d Serve sso app builds to enterprise users
(imported from commit a9741833c514c364c5e67fdbb31d191e1ab0f1df)
2013-11-13 18:11:49 -05:00
Allen Rabinovich ca4e6a0ff8 Updates to stream list
(imported from commit 426a8035e9661598f9bbfa6ae83883ca3ac6106e)
2013-11-13 14:59:07 -08:00
Luke Faraone 4b8a770825 Don't prompt for a password if password auth is disabled
(imported from commit d696c9f6de2008c177fa3282383257de15aaeb29)
2013-11-13 17:57:33 -05:00
Luke Faraone d19ffd67a7 Don't make enterprise users agree to the ToS
(imported from commit 2d01de949210a14edb5bef949d59a8495136ecac)
2013-11-13 17:57:32 -05:00
Kevin Mehall 53520b85e6 Change our login links to go to the SSO login page on SSO sites.
(imported from commit 2bccde3846dafd3373db89f507cf63f394d6d7cf)
2013-11-13 17:54:43 -05:00
Jessica McKellar 76e1c80ac5 Add an enterprise registration page.
(imported from commit 5888f588ad219ba25b235477a7137853e5954bb5)
2013-11-13 16:20:42 -05:00
Leo Franchi 6274c33f86 Allow disabling of feedback system in UI
(imported from commit ce16b2916784e9cf10a230cb47515ffc65888778)
2013-11-13 11:18:02 -05:00
Jeff Arnold cf33d1c512 /terms-enterprise update: We prefer Massachusetts.
(imported from commit a3c889293566865b6d06844b84e97d9376596f2b)
2013-11-13 10:51:51 -05:00
Waseem Daher eaec0e0774 Better, retina-ready phone screenshots for /apps (though still not great).
(imported from commit 7a4a1fc0a203713eb83f75324f26abf8f890a37b)
2013-11-12 21:58:32 -05:00
Luke Faraone fafa14db9a Patch out references to zilencer so the app runs without it on ENTERPRISE
(imported from commit bd4fe1ff47e1b4dc9038f800ee8aa2980bd00fdf)
2013-11-12 18:43:06 -05:00
Jessica McKellar cf96cc478f freshdesk: use their authentication fields intead of auth in the URL.
(imported from commit 7413db16cd9c5e76e287c32950ab97e8a4503efa)
2013-11-12 17:17:16 -05:00
Tim Abbott 5293cdebe8 Rename LOCAL_SERVER to ENTERPRISE.
(imported from commit 7edf353eefe6c9e7aac74b7bbc37b923cac1b913)
2013-11-12 15:57:01 -05:00
Jeff Arnold d877ec0e7f Add enterprise terms
(imported from commit e8e9600797bea6e5c2f6fcd06dccebe69721034e)
2013-11-12 10:49:29 -05:00
Kevin Mehall 4a6b7cb20b Disable password change when SSO is the only login option
(imported from commit fd1a14237e2d6ea574331ed178bfc0db5beb18c6)
2013-11-12 10:37:33 -05:00
Jessica McKellar ab874ddc84 Document our Freshdesk integration.
(imported from commit 1a098c410ca9c7fcca60f6293f3868e6bbae97f2)
2013-11-12 10:24:26 -05:00
Steve Howell bd25224948 s/RECENT GROUP PMs/GROUP PMs/
(imported from commit 500ef9f360149f5362c278bbfe33c408ff813ba1)
2013-11-09 10:15:51 -05:00
Leo Franchi d13500ac0d Add a email-only sso login page that redirects to a deployment-specific domai
(imported from commit 7134ad71f01b3c22c61c6c0e65f7196efaf92237)
2013-11-08 14:33:12 -05:00
Steve Howell 52ec258122 [staging only] Show Recent Group PMs in right sidebar.
Show up to 10 of your recent group PM conversations in the right
sidebar.  Clicking on the links narrows to the huddle and opens the
compose box for the huddle.  The green circles have opacity
proportional to the number of users present in the huddle.

This is feature flagged to staging only.

Some of this code was written by Allen before commits were squashed.

Known issue: unread counts disappear on certain refresh events.

(imported from commit 3b44665150ba20594d8b0295cb30df03601c1d52)
2013-11-07 16:54:13 -05:00
Waseem Daher 50ca7c4731 day2 email: Try to make clear that this is the last one.
(imported from commit 953d491a7c5b6717178c85aed4a96e08a8e61e61)
2013-11-07 13:23:41 -05:00
Waseem Daher 9c28bf34e8 Remove full names from our day1 and day2 emails.
The weird formality of using your complete name I think feels even
spammier than saying nothing.

(imported from commit b2326de91866fa3c13c2023723f64d1beadf435e)
2013-11-07 13:20:58 -05:00
Waseem Daher 17921a92d3 More fun password-reset page.
(imported from commit b02e123c86004416b4238790a9146817ee35bdcc)
2013-11-06 13:22:00 -05:00
Waseem Daher 66a0119929 settings: Make password reset more discoverable.
You need your password to log into the mobile apps, and it's kind
of hard to find where to reset it if you don't remember it (but
logged in via SSO)

(imported from commit fd902bcd0c21d7cb308535722e6789fb4a6114cd)
2013-11-06 13:22:00 -05:00
Steve Howell c3d176a480 Move marketing pages to corporate app.
(imported from commit 70528b544ceb4be12fb02be32889e1b9ca8caeb4)
2013-11-06 12:07:32 -05:00
Steve Howell 6193f60d45 Move static MIT-related pages to corporate app.
(imported from commit e2c5f72d3f3e4d8f8fa888326b2ba455beb9156c)
2013-11-06 12:07:31 -05:00
Steve Howell a827d727cc Create non-localserver "corporate" app with jobs pages.
The corporate "app" is not a full-fledged Django app, but it has
a urls.py and a templates directory.  This commit creates the app
and moves the jobs pages into it.  Localserver deployments will
not see any of the corporate code.

(imported from commit 35889c3cf92329258c30741fdfa564769a4fac1a)
2013-11-06 12:07:31 -05:00
Luke Faraone 00e72cd97d Switch url parameter to full_name from service-specific gafyd_name
(imported from commit 21541da29d2846cfd912d19b73e239e96606f9e5)
2013-11-05 16:17:06 -05:00
Steve Howell 83c8f25ac6 Move activity report templates to zilencer.
(imported from commit b546ae89d8ab0ba679672fc3f6b7ef09d0e86d1b)
2013-11-05 15:41:03 -05:00
Leo Franchi 7794373db6 Include 10.7+ info in mac app page, as well as link to 10.6-compatible version
(imported from commit 7af1f3709188baf2e388548783210ff1cab594be)
2013-11-05 11:29:31 -05:00
Steve Howell d0722b6962 Remove dead code related to /activity.
(imported from commit ebec4ddb8727c16dc04ebd32829389e5594d49f5)
2013-11-05 11:00:59 -05:00
Steve Howell c2f2987222 Link to newer realm report from /activity.
(imported from commit a52dab0532748b46d21157c49d758c389cafef86)
2013-11-05 10:46:42 -05:00
Steve Howell bd84d1305e Clean up titles in activity reports.
(imported from commit e516bbfaff7b3615059b4aafb3304e31db85edcc)
2013-11-05 08:13:00 -05:00
Zev Benjamin 2b24fbf523 Use a template comment instead of an HTML comment
We don't really want this kind of comment leaking out to our users.

(imported from commit 96249197d971d7cafc5cc663974a107116b44c8b)
2013-11-04 11:49:37 -05:00
Jeff Arnold 055b0ede04 Add an <li> to prevent opening the compose box from taking >500ms
(imported from commit 7c57051ab847cf4153a20c5eb07482ed9f6b594b)
2013-11-04 11:47:45 -05:00
Steve Howell a2deddbac4 Show number of rows in report tables.
(imported from commit 4f6dce7fc2ee377467a0353e97adcfb7c79b36d0)
2013-11-02 17:58:34 -04:00
acrefoot 434b7ac120 Give Feedback in non-obvious cases for sent messages
Displays a notification above the composebox in cases where the message
is not visible (further down), or where it's outside the current narrow or search.

It also offers a link to the appropriate narrow when it makes sense, and offers
timetravel when appropriate. There is currently a bug with timetravel (and you can
see this when using the popover menu) that makes "narrow to messages around this time"
not work for muted messages.

This resolves Trac #1518.

(imported from commit 391ca0b9c07d91496f6585a4fd8e15723d1170e2)
2013-11-01 12:34:39 -04:00
Jessica McKellar 6dad607aa6 Remove 'Messages' gear menu item: take 2.
The tab needs to exist, just don't show it.

(imported from commit 87531bb8e00498e2edac5838e47b85704789080a)
2013-10-31 17:34:28 -04:00
Luke Faraone 3be10e50ef API 0.2.2 release.
(imported from commit 891ab7549e96c30dceb70bb18add1cd533fafd36)
2013-10-31 16:23:03 -04:00
Luke Faraone 81fafb5b6a Document Python bindings on API page.
(imported from commit 660e6c22b2d6ecb47e99f01aa04f0d69bd108714)
2013-10-31 16:23:03 -04:00
Tim Abbott 21663601b4 Remove obsolete zulip.com/what-is-humbug page.
(imported from commit 0e2f317cf0bf262eb113caa7daab7d71ce564e9e)
2013-10-31 15:29:49 -04:00
Kevin Mehall 858b1f1bcd Fix login page ?next= parameter.
request.get_full_path became the empty string and was ignored.

(imported from commit 6cced5969e74514e0a88c1dec2445a7e4cdf9806)
2013-10-31 14:36:35 -04:00
Jessica McKellar c969c81fab Revert "Remove 'Messages' gear menu item."
This reverts commit 01448ec2f28b88c3b1674b6a9e02d56f47a23fdf.

(imported from commit d109035f83a94aa48b0e57d5a5fa25ea781f566e)
2013-10-31 13:37:41 -04:00
Jessica McKellar f1e90086f5 Remove the onboarding checklist.
Looking at the historical data, fewer than 50% of active users have
completed the checklist, which means that it is just persistent
clutter. We also have other better ways of encouraging people to send
traffic and get the apps now.

This commit removes both the frontend UI and backend work but leaves
the db row for now for the historical data.

(imported from commit e8f5780be37bbc75f794fb118e4dd41d8811f2bf)
2013-10-31 11:34:15 -04:00
Jessica McKellar 90457104a6 Remove 'Messages' gear menu item.
To help reduce visual clutter.

From our observations this is almost never used, and there are many
more intuitive ways to get back to your messages.

(imported from commit 01448ec2f28b88c3b1674b6a9e02d56f47a23fdf)
2013-10-31 11:34:15 -04:00
Jessica McKellar 69481a0843 Remove 'All messages' sidebar link.
Nobody uses it, and it causes confusion. (How is it different from 'Home'?)

For now, leave in the ability to get to the narrow, although we may
ultimately want to do away with it as well.

(imported from commit 35b3f27e39c4de3391bc5571b32f7242a29f4cfa)
2013-10-31 10:38:49 -04:00
Waseem Daher f964613d28 Integrations page wording tweak.
(imported from commit 0c42c615050110ea23d1ae7fdf6a9906cd93546d)
2013-10-29 19:11:56 -04:00
Leo Franchi 8e05f76511 Only enable analytics and dropbox on non-LOCAL_SERVER
(imported from commit 1ba877550b3afde51bec6f344762ea998800c5b6)
2013-10-29 17:33:36 -04:00
Allen Rabinovich e91932976b New integrations page
(imported from commit 73afc130f9e2871e24e67c28f3ba4fa0839b11be)
2013-10-29 11:11:45 -07:00
Steve Howell 7cf66b5bb8 Allow users to upload avatars on the Settings page.
We were using Gravatar for user avatars, but now users can
upload their avatars directly to Zulip, and we will store
their avatar for them.  This removes the old Gravatar-related
interface and polling code.

This commit does not attempt to update the avatars in
messages that have already been loaded, either for the user
making the change or other users.

(imported from commit 301dc48f96f83de0136c93de57055638c79e0961)
2013-10-29 10:59:41 -04:00
Steve Howell af6de2053e Give Notifications settings its own alert area.
(imported from commit 1d17b85f383862d1f37b5750af40aa8d9a1d8bf2)
2013-10-29 10:59:41 -04:00
Steve Howell 68942a8f3a Properly split up "Your Account" and "Notifications".
The "Your Account" and "Notifications" boxes on the Settings
page each had their own border and their own "Save changes"
button, but they were within the same form and sending to the
same back end point.

This commit creates a separate form and endpoint for each
of the two boxes.

(imported from commit 04d4d16938f20749a18d2c6887da3ed3cf21ef74)
2013-10-29 10:59:41 -04:00
Steve Howell 3494ce6ebc Start to clean up settings.html.
Check that settings.html has at least balanced tags, and
automate the checking of those tags.

(imported from commit 35e9be269caa211803d64f2b54cb0287e13707b3)
2013-10-29 10:59:41 -04:00
Jessica McKellar 06d9eb78d4 integrations: document the Mercurial integration.
(imported from commit a9bf36f242bfc20283d3487471e537d885e38e04)
2013-10-29 09:58:05 -04:00
Jessica McKellar 2be6c541cf digest emails: use a template filter to format new users, streams, etc.
(imported from commit e61a3dd6753db82da1b30c50e5bbf6273f302645)
2013-10-25 19:11:41 -04:00
Jessica McKellar a29fc6ab16 digest: Add HTML and plaintext templates for digest emails.
(imported from commit 6c4dbdce1544b720fa45506a9175e8ace93bafe3)
2013-10-25 19:08:46 -04:00
Waseem Daher d97b09e164 local_server: Don't try to hire away our customers.
(imported from commit 968df69fc863598550a554c739f4b5cde1f93eab)
2013-10-25 18:34:10 -04:00
Waseem Daher e4db25a501 Remove link to our postcard when we're local server.
(imported from commit 67af411eeb545790ce0b85e1031ceaa99f6a72b9)
2013-10-25 18:34:10 -04:00
Waseem Daher 0f978b7c5d compare: Properly update title text for emojis.
(Reviewed by Allen.)

(imported from commit ec0a5c9feb6c90d5d3a158523e934c74c8cd8634)
2013-10-24 16:30:09 -04:00
Waseem Daher 94c0b2fe70 Comparison page.
(imported from commit 4e2ce843bd066fd20e5840b2fd5cd2d991be02e7)
2013-10-24 16:22:00 -04:00
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
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