Commit Graph

28375 Commits

Author SHA1 Message Date
Vishnu Ks daf3b46262 billing: Move billing related templates from zilencer to corporate. 2018-10-01 15:43:39 -07:00
Vishnu Ks 6914ee126c billing: Move billing-related views and urls to corporate. 2018-10-01 15:43:21 -07:00
Rishi Gupta 0c7be02b99 user docs: Update stream guidelines link in stream subscriptions modal. 2018-10-01 12:45:59 -07:00
Rishi Gupta 8c0bfb925d integration docs: Change location of bot_types.png.
Fixes broken test in 53a2f71.
2018-10-01 12:42:29 -07:00
Rishi Gupta 53a2f71c3f integration docs: Add back bot_types.png.
This was removed accidentally in 8c6424a.
2018-10-01 10:30:13 -07:00
Rishi Gupta 6880af6c2e user docs: Update search-for-messages. 2018-09-29 12:37:45 -07:00
Rishi Gupta 47fb9c0900 user docs: Update getting-started-with-zulip. 2018-09-29 10:58:11 -07:00
Rishi Gupta f875b33a23 user docs: Update getting-your-organization-started-with-zulip. 2018-09-29 10:57:52 -07:00
Rishi Gupta b43bf6d511 portico: Soften intro to why-zulip. 2018-09-28 22:10:47 -07:00
Rishi Gupta 82d8613842 portico: Update /history.
I didn't remove zulip_version from context_processors since it seems likely
that we'll want to put that information somewhere on portico at some point.
2018-09-28 21:28:43 -07:00
Akash Nimare 85a002ba9a login-email: Update the content of new email login message.
This PR adds the reset password link in the new login email since
users may want to reset their password in case of some unusual
account activity.
2018-09-28 14:34:04 -07:00
Tim Abbott 00821d67bb travis: Remove no-longer-present packages from apt-mark hold list.
Apparently, Travis removed the Heroku bundle of packages from their
servers, which made the build start failing when trying to configure
apt to hold their versions (sigh).  This commit removes the
problematic packages.
2018-09-28 14:20:04 -07:00
Tim Abbott 510afd0c93 migrations: Disable atomic for delivery_email migration.
I'm not sure theoretically why this should be required only for some
installations, but these articles all suggest the root problem is
doing these two migrations together atomically (creating the field and
setting a value for it), so the right answer is to declare the
migration as not atomic:

https://stackoverflow.com/questions/12838111/django-db-migrations-cannot-alter-table-because-it-has-pending-trigger-events
https://confluence.atlassian.com/confkb/upgrade-failed-with-the-error-message-error-cannot-alter-table-content-because-it-has-pending-trigger-events-747606853.html
2018-09-28 14:14:20 -07:00
Steve Howell c91b804683 bug fix: Handle "Subscribe" button in empty views.
I don't know how long this has been broken, but it seems
some re-design of our message feed moved the Subscribe
button out #zfilt, so we use a different parent selector
now to turn on the click handler.

Hopefully this was a pretty obscure bug.  To reproduce
it go to "Manage Streams" and then select a stream you're
not subscribed to (from "All Streams"), and don't actually
subscribe, but then hit "View stream".

The user experience here is still a bit confusing, but
this is just a quick fix.
2018-09-28 14:08:37 -07:00
Rishi Gupta 0d1907fb71 user docs: Add test-mobile-notifications. 2018-09-28 12:09:33 -07:00
Rishi Gupta 660fb032cb docs: Fix broken user docs links in new feature tutorial.
Surprisingly hard to find a good base example of a user doc. This one should
at least give the basic pointer to sidebar_index.md and where the new file
goes.
2018-09-28 12:09:33 -07:00
Rishi Gupta 6324af849d user docs: Update about-streams-and-topics. 2018-09-28 12:09:33 -07:00
Akash Nimare f426d2cb22 desktop: Update desktop app link to v2.3.8. 2018-09-28 00:20:45 -07:00
Tim Abbott 5064d9dd8a import: Remove documentation of --import-into-nonempty.
This is now the default behavior.
2018-09-27 14:14:51 -07:00
Tim Abbott 41b18c7067 docs: Clean up LDAP docs a bit more.
In particular, this improves:
* The explanation of how data is mapped into Zulip
* The explanation of what is printed out by `manage.py query_ldap`
* Makes sure users create their first account with EmailAuthBackend.
2018-09-27 13:38:14 -07:00
Tim Abbott a943e55863 docs: Move LDAP documentation out of plug-and-play section.
Also update the links to this section.
2018-09-27 13:38:14 -07:00
Tim Abbott 923ecb1851 docs: Clean up documentation for fakeldap testing in development. 2018-09-27 13:38:14 -07:00
Greg Price a612049ac4 docs: Expand on LDAP config; try to clarify "username" concept.
The term "username" confusingly refers both to the Django concept of
"username" (meaning "the name the user types into the login form") and
a concept the admin presumably already has in their existing
environment; which may or may not be the same thing, and in fact this
is where we document the admin's choice of whether and how they should
correspond.  The Django concept in particular isn't obvious, and is
counterintuitive when it means something like an email address.

Explicitly explain the Django "username" concept, under the name of
"Zulip username" to take responsibility for our choice of how it's
exposed in the settings interface.  Then use an explicit qualifier,
like "LDAP username", whenever referring to some other notion of
username.  And make a pass over this whole side of the instructions,
in particular for consistent handling of these concepts.
2018-09-27 13:20:10 -07:00
Greg Price 6f23d2f691 docs: Make a pass over LDAP config/setup docs.
Expand on a few things that tend to confuse people (especially the
`%(user)s` thing); move the `LDAPSearchUnion` example out to docs;
adjust the instructions to fit a bit better in their new docs/ home.
2018-09-27 13:20:10 -07:00
Greg Price e7737c6342 docs: Move prose LDAP instructions out of settings template.
This makes it easier to iterate on these, and to expand supplemental
information (like troubleshooting, or unusual configurations) without
further straining the already-dauntingly-long settings.py.

It also makes it easier to consult the instructions while editing the
secrets file, or testing things, etc. -- most admins will find it more
natural to keep a browser open somewhere than a second terminal.
2018-09-27 13:20:10 -07:00
Akash Nimare a9c32b535f settings: Properly align preview profile button. 2018-09-27 13:17:03 -07:00
Akash Nimare 9a63685338 team: Decrease the margin in profile description.
Also removed unnecessary margins.
2018-09-27 13:09:05 -07:00
Akash Nimare 0e7e19355a team: Minor design fixes.
Decrease the font-size of profile description.
Add a maring to "Last updated" text and fix the
font-size for the same.
2018-09-27 13:09:05 -07:00
Eeshan Garg 8e6fba7f22 webhooks/trello: Fix indentation and numbering. 2018-09-27 10:04:40 -07:00
Rishi Gupta 5774300364 right sidebar: Change media cut-off for where we hide the buddy list.
This was last changed in 88951d6 from 975 to 1025, but I think that wasn't
quite aggressive enough.
2018-09-27 07:29:32 -04:00
Rishi Gupta 7f16d27015 api docs: Update api-keys. 2018-09-25 21:02:58 -07:00
Rishi Gupta 78f8fac106 api docs: Make minor copyediting changes. 2018-09-25 20:48:12 -07:00
Shubham Dhama 8c6424a4bd user docs: Split and update add-a-bot-or-integration.md. 2018-09-25 20:48:12 -07:00
Eeshan Garg c9765da47d pypi: Upgrade to release 0.5.5. 2018-09-25 18:24:36 -07:00
Shubham Dhama 4126089679 settings: Fix real-time update of `full_name` property in page_params.
Previously, if someone updated his/her name from accounts page and closed
the modal and then reopen the modal, the page still had the old name as
we use `page_params.full_name` in `accounts-settings.handlebars`. This
commit fixes this bug.

Fixes: #10529.
2018-09-25 13:34:22 -07:00
Greg Price 9dbb5561b1 docs: Use `sudo -s` to get a root shell without changing directory.
The `-i` is for "initial", creating a login shell -- which means
cd'ing to root's homedir.  That defeats the line after this one.
2018-09-25 13:15:06 -07:00
Greg Price 3b646c5d28 push-to-pull-request: Update local tracking ref, if any.
The companion tool `tools/reset-to-pull-request` has a handy feature
to maintain a local ref tracking the PR: e.g., pr/1234 for PR 1234.
If this were a normal remote-tracking branch maintained by `git fetch`,
it'd get updated on `git push`.  Do the same thing here.

This helps keep a view like `gitk --all @` a bit tidier, by causing
merged PRs to stop pointing at side branches of the main history.
2018-09-25 13:15:02 -07:00
Akash Nimare bcb16da1e7 forgot-password: Update the text of reset password button.
Updated the text to "Send reset link" since it's more
appropriate. Also, updated the docs for the same.
2018-09-25 12:51:52 -07:00
Vishnu Ks 5a6b2ebb1f billing: Add ability for users to change their card. 2018-09-24 19:25:26 -07:00
Anders Kaseorg 5e88b3013a zanitizer_config.pm.sample: keep_file → scrub_filename
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-09-23 20:42:27 -07:00
Rishi Gupta cb116be60c integrations: Update trello doc.
The main setup text for an integration should always be targeted at
non-technical users.
2018-09-21 19:20:23 -07:00
Harshit Bansal 400bb6ca48 emoji: Fix caching for text emojiset.
This commit removes an early exit that was causing spritesheets to
not get cached for fallback emojiset in case of text emojiset.
2018-09-21 18:34:12 -07:00
Harshit Bansal 20aee7b116 emoji: Change fallback emojiset for text emojiset.
Now that we have added back support for `google-blob` emojiset,
changing the fallback emojiset for `text` emojiset to `google-blob`
make sense.
2018-09-21 18:34:12 -07:00
Adam Birds 18a4239d7e integration: Add AppVeyor webhook. 2018-09-21 17:51:34 -07:00
Pragati Agrawal 6adabd20f5 settings: Remove dependency of message_content_in_email_notifications.
Since now we have email notifications for streams messages too, so
there is no direct dependency of
`message_content_in_email_notifications`checkbox on
`enable_offline_email_notifications` setting and neither we can say it's
dependent on `enable_stream_email_notifications` as well because we may
have email notifications set for individual streams. So removing this
checkbox dependency is the best solution here.
2018-09-21 12:46:02 -07:00
Yashashvi Dave a80d01f6dc zephyr page: Add style to zephyr page. 2018-09-21 12:42:05 -07:00
Akash Nimare e00480bccd dev-login: Remove unused link id from dev page. 2018-09-21 12:37:02 -07:00
Akash Nimare 17c541fedf help: Add a bottom border in section headings.
This commit adds a bottom border to all the section
headings.
2018-09-21 12:32:24 -07:00
Akash Nimare 4e176b97b2 help: Align down arrow to the right.
This commit changes the position of the down arrow
from left to right since it more intuitive to have
the arrow in the right side.
2018-09-21 12:32:24 -07:00
Akash Nimare ccdddf3a71 help: Rename the header of help docs.
Renamed the header to Home since it makes more sense,
previously it was Index.
2018-09-21 12:32:24 -07:00