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
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
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
6b0584742f
Remove stray <hr> in password reset form.
...
(imported from commit 3d233bfaba94514411ace4f638fb34e2b35aae30)
2013-11-16 12:39:26 -06:00
9e8346f6d7
Display owners for bots on the admin page.
...
(imported from commit d1a80ab8f784ab7e7249cc020b1980bd45434abd)
2013-11-16 11:35:26 -05:00
b55e406f93
Display deactivated users at the bottom of the admin users page.
...
(imported from commit 1a5d5d64fffc9ed7633d468b975dd56c28f85ccf)
2013-11-16 11:35:26 -05:00
c1ddc0908f
Admin: Put bots in a separate table.
...
(imported from commit 21330e28b486e10aff6af5f48280ea675cbd5697)
2013-11-16 11:35:26 -05:00
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
bafb6f8dc3
fixup day1/day2 email templates
...
(imported from commit 30846fc298d04ac763025e82a60731d158840462)
2013-11-15 21:51:37 -05:00
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
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
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
53c76aa657
Move enterprise-registration to zilencer/ from zerver/
...
(imported from commit d8a58913040376dbdbc9dcee13ab8a7910733da7)
2013-11-15 11:21:52 -05:00
8511538c46
Change wording of license agreement link
...
(imported from commit a6d5ad8375232f8b43092383b75e5c195229a741)
2013-11-14 14:27:34 -05:00
ff4f5e3b71
Add enterprise terms fields for CUSTOMER13 to the registration page.
...
(imported from commit f411277196c621265d645538b89a69468a1e3f77)
2013-11-14 14:21:27 -05:00
d4c0334b3b
Show counts of at-risk users on Activity page.
...
(imported from commit 4ce1ecf47259f3a95ddf9cbbc356fa0247044e0f)
2013-11-14 14:07:24 -05:00
bb0d18bc73
Spell Zulip correctly on enterprise form
...
(imported from commit a1146320c2992428c51f6ec8d25fc97746e02d27)
2013-11-14 13:38:58 -05:00
f60fa1b274
Don't linkify "Total" on the main Activity tab.
...
(imported from commit 2098f488f1276a022b4c585b99c25c3a5a66ca06)
2013-11-14 13:28:41 -05:00
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
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
90c011e632
Fix rebase issues in the not_enterprise transition.
...
(imported from commit f0a8169825de303c60e5dba5cd95eef96cd7de7e)
2013-11-13 21:04:43 -05:00
34582d8e0a
enterprise: disable feedback button in gear menu
...
(imported from commit 78d50979366b20ad4cfe708dd5b360746b09c861)
2013-11-13 20:40:39 -05:00
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
11d05c1689
Our docs should not try to hire our customers' employees
...
(imported from commit aae1e6fb236b44eabcf3cf7c4e48534bea6cd731)
2013-11-13 19:57:50 -05:00
372984b56d
Serve sso app builds to enterprise users
...
(imported from commit a9741833c514c364c5e67fdbb31d191e1ab0f1df)
2013-11-13 18:11:49 -05:00
ca4e6a0ff8
Updates to stream list
...
(imported from commit 426a8035e9661598f9bbfa6ae83883ca3ac6106e)
2013-11-13 14:59:07 -08:00
4b8a770825
Don't prompt for a password if password auth is disabled
...
(imported from commit d696c9f6de2008c177fa3282383257de15aaeb29)
2013-11-13 17:57:33 -05:00
d19ffd67a7
Don't make enterprise users agree to the ToS
...
(imported from commit 2d01de949210a14edb5bef949d59a8495136ecac)
2013-11-13 17:57:32 -05:00
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
76e1c80ac5
Add an enterprise registration page.
...
(imported from commit 5888f588ad219ba25b235477a7137853e5954bb5)
2013-11-13 16:20:42 -05:00
6274c33f86
Allow disabling of feedback system in UI
...
(imported from commit ce16b2916784e9cf10a230cb47515ffc65888778)
2013-11-13 11:18:02 -05:00
cf33d1c512
/terms-enterprise update: We prefer Massachusetts.
...
(imported from commit a3c889293566865b6d06844b84e97d9376596f2b)
2013-11-13 10:51:51 -05:00
eaec0e0774
Better, retina-ready phone screenshots for /apps (though still not great).
...
(imported from commit 7a4a1fc0a203713eb83f75324f26abf8f890a37b)
2013-11-12 21:58:32 -05:00
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
cf96cc478f
freshdesk: use their authentication fields intead of auth in the URL.
...
(imported from commit 7413db16cd9c5e76e287c32950ab97e8a4503efa)
2013-11-12 17:17:16 -05:00
5293cdebe8
Rename LOCAL_SERVER to ENTERPRISE.
...
(imported from commit 7edf353eefe6c9e7aac74b7bbc37b923cac1b913)
2013-11-12 15:57:01 -05:00
d877ec0e7f
Add enterprise terms
...
(imported from commit e8e9600797bea6e5c2f6fcd06dccebe69721034e)
2013-11-12 10:49:29 -05:00
4a6b7cb20b
Disable password change when SSO is the only login option
...
(imported from commit fd1a14237e2d6ea574331ed178bfc0db5beb18c6)
2013-11-12 10:37:33 -05:00
ab874ddc84
Document our Freshdesk integration.
...
(imported from commit 1a098c410ca9c7fcca60f6293f3868e6bbae97f2)
2013-11-12 10:24:26 -05:00
bd25224948
s/RECENT GROUP PMs/GROUP PMs/
...
(imported from commit 500ef9f360149f5362c278bbfe33c408ff813ba1)
2013-11-09 10:15:51 -05:00
27eeb95eb4
Fix password reset on Django 1.6.
...
(imported from commit 8a0d106d1380653eeb042787fa7eefca3f416222)
2013-11-08 15:51:49 -05:00
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
59ec080a8d
Simplify analytics/activity.html.
...
For legacy reasons, this template wanted each tab's content as
a one-key dictionary, instead of a string. Each tab already has
a tuple to allow for fields like title, so this wasn't really giving us
any long term flexibility; it was just crufting up the calling
code.
(imported from commit 2a316107ec223a83efa8735f4810a6fa43107541)
2013-11-08 10:44:20 -05:00
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
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
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
17921a92d3
More fun password-reset page.
...
(imported from commit b02e123c86004416b4238790a9146817ee35bdcc)
2013-11-06 13:22:00 -05:00
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
5a1d779450
signup: Make "product" input form slightly bigger.
...
"Carrier pigeon" and "smoke signals" weren't fitting.
(imported from commit b7bb0129333637ffc864c2ee1ea67afb597f1435)
2013-11-06 13:22:00 -05:00
f5bb2409ef
Create "analytics" app with activity reports.
...
(imported from commit 6385935c3d7894fe52bcc265faecc30b07629717)
2013-11-06 12:07:32 -05:00
c3d176a480
Move marketing pages to corporate app.
...
(imported from commit 70528b544ceb4be12fb02be32889e1b9ca8caeb4)
2013-11-06 12:07:32 -05:00
6193f60d45
Move static MIT-related pages to corporate app.
...
(imported from commit e2c5f72d3f3e4d8f8fa888326b2ba455beb9156c)
2013-11-06 12:07:31 -05:00
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
00e72cd97d
Switch url parameter to full_name from service-specific gafyd_name
...
(imported from commit 21541da29d2846cfd912d19b73e239e96606f9e5)
2013-11-05 16:17:06 -05:00
83c8f25ac6
Move activity report templates to zilencer.
...
(imported from commit b546ae89d8ab0ba679672fc3f6b7ef09d0e86d1b)
2013-11-05 15:41:03 -05:00
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
d0722b6962
Remove dead code related to /activity.
...
(imported from commit ebec4ddb8727c16dc04ebd32829389e5594d49f5)
2013-11-05 11:00:59 -05:00
c2f2987222
Link to newer realm report from /activity.
...
(imported from commit a52dab0532748b46d21157c49d758c389cafef86)
2013-11-05 10:46:42 -05:00
bd84d1305e
Clean up titles in activity reports.
...
(imported from commit e516bbfaff7b3615059b4aafb3304e31db85edcc)
2013-11-05 08:13:00 -05:00
6765ec0795
Use a site-specific Zulip Admin email in django error pages
...
(imported from commit 2d5415d7cd81befc3051b5de3835c0cd258b6375)
2013-11-04 16:35:50 -05:00
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
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
a2deddbac4
Show number of rows in report tables.
...
(imported from commit 4f6dce7fc2ee377467a0353e97adcfb7c79b36d0)
2013-11-02 17:58:34 -04:00
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
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
3be10e50ef
API 0.2.2 release.
...
(imported from commit 891ab7549e96c30dceb70bb18add1cd533fafd36)
2013-10-31 16:23:03 -04:00
81fafb5b6a
Document Python bindings on API page.
...
(imported from commit 660e6c22b2d6ecb47e99f01aa04f0d69bd108714)
2013-10-31 16:23:03 -04:00
21663601b4
Remove obsolete zulip.com/what-is-humbug page.
...
(imported from commit 0e2f317cf0bf262eb113caa7daab7d71ce564e9e)
2013-10-31 15:29:49 -04:00
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
c969c81fab
Revert "Remove 'Messages' gear menu item."
...
This reverts commit 01448ec2f28b88c3b1674b6a9e02d56f47a23fdf.
(imported from commit d109035f83a94aa48b0e57d5a5fa25ea781f566e)
2013-10-31 13:37:41 -04:00
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
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
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
f964613d28
Integrations page wording tweak.
...
(imported from commit 0c42c615050110ea23d1ae7fdf6a9906cd93546d)
2013-10-29 19:11:56 -04:00
8e05f76511
Only enable analytics and dropbox on non-LOCAL_SERVER
...
(imported from commit 1ba877550b3afde51bec6f344762ea998800c5b6)
2013-10-29 17:33:36 -04:00
e91932976b
New integrations page
...
(imported from commit 73afc130f9e2871e24e67c28f3ba4fa0839b11be)
2013-10-29 11:11:45 -07:00
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
af6de2053e
Give Notifications settings its own alert area.
...
(imported from commit 1d17b85f383862d1f37b5750af40aa8d9a1d8bf2)
2013-10-29 10:59:41 -04:00
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
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
06d9eb78d4
integrations: document the Mercurial integration.
...
(imported from commit a9bf36f242bfc20283d3487471e537d885e38e04)
2013-10-29 09:58:05 -04:00
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
a29fc6ab16
digest: Add HTML and plaintext templates for digest emails.
...
(imported from commit 6c4dbdce1544b720fa45506a9175e8ace93bafe3)
2013-10-25 19:08:46 -04:00
d97b09e164
local_server: Don't try to hire away our customers.
...
(imported from commit 968df69fc863598550a554c739f4b5cde1f93eab)
2013-10-25 18:34:10 -04:00
e4db25a501
Remove link to our postcard when we're local server.
...
(imported from commit 67af411eeb545790ce0b85e1031ceaa99f6a72b9)
2013-10-25 18:34:10 -04:00
0f978b7c5d
compare: Properly update title text for emojis.
...
(Reviewed by Allen.)
(imported from commit ec0a5c9feb6c90d5d3a158523e934c74c8cd8634)
2013-10-24 16:30:09 -04:00
94c0b2fe70
Comparison page.
...
(imported from commit 4e2ce843bd066fd20e5840b2fd5cd2d991be02e7)
2013-10-24 16:22:00 -04:00
05564ec0e2
[schema] Add a config option for enabling/disabling push notifications
...
(imported from commit 5649188cd5e0e4edb6e71559ec7d7fc5e92efaf8)
2013-10-24 14:54:30 -04:00
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
a32f15aa2f
Add Hubot to /integrations.
...
(imported from commit 1adc564a50ac473a6a117de24283154fc4222cc3)
2013-10-22 13:42:22 -04:00
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
e35e2d62b4
In invitation reminders, take advantage of realm names
...
(imported from commit 68607b015c640529d4d65065ace82a18d57610a3)
2013-10-21 11:33:34 -04:00
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
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
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
cd62c77e08
integrations: add the Twitter search bot.
...
(imported from commit 9afca400889baae3b90b53cbe1efa8ccf7b798a7)
2013-10-16 21:26:01 -04:00
da3b394a64
Specify the email input type for the email login field.
...
(imported from commit 2c2ff574627fd7d933512d9bb0585aa948ea536a)
2013-10-15 17:40:16 -04:00
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
0dddd80b2b
settings: Indicate that bot avatars are optional.
...
(imported from commit 6603ca8b73286587d9cac0f44097129a2c341d1f)
2013-10-14 13:15:11 -04:00
3ca1ef9a0a
Use custom titles for the activity report.
...
(imported from commit ed991108715d043d5d21d8e9f7573eaedb21fec1)
2013-10-11 16:29:26 -04:00
Waseem Daher
Tim Abbott
acrefoot
Jeff Arnold
Kevin Mehall
Leo Franchi
Jessica McKellar
Steve Howell
Allen Rabinovich
Luke Faraone
Zev Benjamin
acrefoot
Jessica McKellar