fafb6f3bb5
Say "Search people" in user search box.
...
(imported from commit 901dc984dc19d8f21baff41ce700d0cbcd6fbdbb)
2014-01-15 16:05:52 -05:00
d14e200ecd
Add missing colon after Assignee
...
(imported from commit 18dd6d1fd80012b2e3337cdbfa893028d241326f)
2014-01-15 16:05:51 -05:00
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
42d561546b
Add integration documentation for Zendesk
...
(imported from commit fb719144cc4fce7c8a794da1abb747595e2c239c)
2014-01-14 12:01:54 -05:00
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
e9dc149340
Make custom-alert-bar-content customizable.
...
(imported from commit 9947b15596fc818fcf3106606d1e638073a415f8)
2014-01-13 10:36:48 -05:00
a9faaecb97
API release 0.2.4
...
(imported from commit 42145c829f5bd2282b72c2658f19766cf2346a2b)
2014-01-11 15:52:21 -05:00
accbe1c16d
Link to Markdown table syntax docs.
...
(imported from commit d8d1c2f335530443b0c42b9a4cd9a6b61159a943)
2014-01-10 21:39:05 -05:00
45d3bb4f04
Update our pivotal integration to handle v5 of their API
...
(imported from commit 2deba4ed2f72c7d7ccedafbb8fc4370b2faa5490)
2014-01-10 21:39:00 -05:00
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
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
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
4900ac4b20
Split out method var in api_endpoints.html
...
(imported from commit 3d49f6755cca73a0a969486e80cb558561d3f222)
2014-01-03 19:10:00 -05:00
aa36b7fb5f
Document our RSS integration.
...
(imported from commit 61e956705b526b4bbeb3a0908d00ebd92d216395)
2014-01-02 13:39:32 -05:00
3ceb43dccd
integrations: Update Jenkins integration documentation.
...
(imported from commit e17bf74f35baa560e0e2537177c38988d63643df)
2014-01-01 22:17:53 -05:00
4a7a5d5d10
Document Kensho's puppet integration.
...
(imported from commit 0beccd70ad5f60471e0b131cbfe05226e40a9a69)
2013-12-29 19:38:33 -05:00
d7acc94a0b
Update the GitHub integration docs for the revised GitHub layout.
...
(imported from commit 0604931e96c1e523785a58a1641fe945bc39abc3)
2013-12-23 11:02:26 -05:00
f58a3ca1fa
Switch subject => topic in integration docs.
...
(imported from commit 05429fba047c2d023d6ebd294df9b554435cc8bd)
2013-12-23 11:02:26 -05:00
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
fc7b8b1254
Offer a "reload" hyperlink when we have no CSS.
...
(imported from commit 237a544c135ad2ad29bd9d1a2b21be2335d2fcd5)
2013-12-18 17:49:34 -05:00
304da1d01b
Set apart "Messages sent" on /activity.
...
(imported from commit 37faff198396dcf66bb8d99c49030ca5065ab36c)
2013-12-18 17:30:47 -05:00
5d85bfbf6b
Improve "Messages sent" formatting on /activity.
...
(imported from commit 891760c116d5a3290b49fb2d75eae0f0b227540d)
2013-12-18 16:34:03 -05:00
7cded2a956
Show realm history on the main activity page.
...
This shows the number of messages sent by humans for the last
eight 24-hour periods, for each realm. "Messages sent" isn't a
perfect metric of activity, but it's easier to query with our
current data model than certain other statistics.
(imported from commit 9de3c479640a0b9dbc017b245dda21d951f4efa4)
2013-12-18 16:01:44 -05:00
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
0c1f57815c
Add grahite to link to /realm_activity.
...
(imported from commit 6d2a23ffcca23a65e5aadb2ed8499645e42131e0)
2013-12-18 13:40:07 -05:00
c30f2bbe3e
slightly stricter linting of html templates
...
(imported from commit 5bd0aa3c49d6ff95559a73bd5f134cc50ae98ce9)
2013-12-17 12:05:23 -05:00
150ca939b1
Disable some buttons in embedded widget.
...
(imported from commit 7d6d4725b139ea71c579dfd7d19c38d7bb11ee44)
2013-12-16 17:46:02 -05:00
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
fa17fb0da1
Place "autoscroll" option in a "Zulip Labs" section.
...
(imported from commit 31e8d0b5c1454932398cf732c0c4ad0702e5274b)
2013-12-16 10:43:49 -05:00
129d01e139
Remove stray typo in plaintext digest email template.
...
(imported from commit ccef927bd2e0fa5810a539c569785d4bdb640819)
2013-12-13 16:38:10 -05:00
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
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
1bd420f12c
Show auto-scroll forever setting in /#settings
...
(imported from commit fa66cbe52836f230e551f25c47bd755b705387d2)
2013-12-13 11:50:11 -05:00
218321deb6
Improve documentation of the events array.
...
(imported from commit d53f561cbf1e802ed34fe8030aa7759ef9b15631)
2013-12-12 17:36:41 -05:00
858d67e769
Clarify use of JSON for the event_types list.
...
(imported from commit 1822508eea5c56cf8cdd48e54f86622f4ef7a858)
2013-12-11 16:45:29 -05:00
5e9ff76d26
Fix API documentation method for register endpoint.
...
(imported from commit 8b6e722cec269dbb35d85ce4f421f4feb5eb5a42)
2013-12-11 16:45:29 -05:00
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
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
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
0a8afbeff6
Clean up password reset pages.
...
(imported from commit b02088e2606b404e050e5b68a9b186de432e59d0)
2013-12-06 18:00:42 -05:00
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
54d9a733c2
Documentation for the Perforce integration
...
(imported from commit 0b2eaed618a226d64dcff395467607f4f7d01579)
2013-12-06 11:54:38 -05:00
5e4e8af0c4
Document sender:me syntax.
...
(imported from commit 7c32ddc70528f110ba7d2f64637da0cc8eb0a0a6)
2013-12-05 12:10:43 -05:00
ce57cbf22a
Rename search-operators help to "Search help".
...
(imported from commit 29facc2965d975ae907d8d7f816f31e22ebd682b)
2013-12-05 12:08:16 -05:00
b612d0a53f
Make search help more explicit for is:{mentioned,private,starred}.
...
(imported from commit 736228d483372a571e5e07b0764da521febcc970)
2013-12-05 11:52:15 -05:00
424994ec9b
Put sender: adjacent to pm-with in search help.
...
(imported from commit 580079ba941252df8e19165f613a30ee9597e4c1)
2013-12-05 11:47:28 -05:00
bd68884607
Fix documentation for email gateway on Zulip Enterprise.
...
(imported from commit 82e706b4e8e82df3044e5fc3df70e46b2183bc56)
2013-12-04 16:39:39 -05:00
feaf6843de
Only document email integration if it is enabled.
...
(imported from commit d1f13ff30c56f7a2156e8c00621b6b955302ccf0)
2013-12-04 16:35:38 -05:00
97dd4b0cb3
Fix the whitespace in the Zulip Nagios config.
...
(imported from commit 5fcdac241ba075c919ecc7dbfaaa811d0089bf5c)
2013-12-04 16:30:58 -05:00
5d454afb74
api: Add support for setting site in mercurial integration.
...
(imported from commit 697f4697af27be6f4eddd6ddbf7affbc8739cffe)
2013-12-04 16:30:57 -05:00
9f016ed827
Update Asana/SVN integration documentation to show config files.
...
(imported from commit ba918f996c61294b6b7967e133ad715a8b928b79)
2013-12-04 16:30:57 -05:00
d7c7913a11
Document Zulip SITE option in most integrations.
...
(imported from commit d7266df1fa23a5fef5d5e7cce8d108da47f36da5)
2013-12-04 16:30:57 -05:00
a33eb6f61f
Update API documentation to use proper URLs for enterprise.
...
(imported from commit cbf9fba4b8281e8ce7a6dd2964c921d2ef906559)
2013-12-04 15:10:54 -05:00
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
c46e5fd0f1
Feature flag the digest emails setting to staging.
...
(imported from commit 1239ce31281850dccf8f65d0c7156bd2c86ca3a7)
2013-12-02 18:58:04 -05:00
c1058355f6
Add a digest emails checkbox to your settings page.
...
(imported from commit cf1dbae6ca30d2489a77e822c34941a986b93bbd)
2013-12-02 18:58:03 -05:00
207cfc449d
Add unsubscribe links to digest e-mails.
...
(imported from commit 4e2a324decf4bc694752cc24b9085361338a08a5)
2013-12-02 18:58:03 -05:00
d57404683f
Add documentation on search operators.
...
(imported from commit 9ed5692685b52d6e4d4f1a59c1b4cc0fde252ff2)
2013-12-02 17:15:24 -05:00
89844c6ced
Revise day1/day2 emails.
...
(imported from commit dc5e78cccb22b024be46b3066d44f09ea1b53345)
2013-12-02 11:15:13 -05:00
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
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
39288d78d8
Style 'All streams' like other global filters for consistency.
...
(imported from commit dd4e739a3013c95e38288f1fdd5a618e47785bd1)
2013-11-27 18:34:22 -05:00
3459962e69
API release 0.2.3.
...
(imported from commit 80591f61785b492b2ec8897bb2a2e5eff8e089fc)
2013-11-27 13:15:21 -05:00
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
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
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
24978224a3
Use ``` instead of ~~~ in our Markdown documentation.
...
(imported from commit 7e5045ea9b809973ba5c47bf41139ec0ce66695e)
2013-11-26 14:06:32 -05:00
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
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
9cd2dca9a5
Remove some fields from the footer for Zulip Enterprise.
...
(imported from commit 30b41eb1bb09ad0fb8d0ae6ab5b08c63b99f5524)
2013-11-25 20:29:27 -05:00
dbc1b4b501
Add a one-click unsubscribe link to missed message e-mails.
...
(imported from commit 719eb61c9b7722eb1b0996b4d5f2f8f5929ad701)
2013-11-25 15:18:40 -05:00
0748c0070b
Document i-then-enter for editing a message you sent.
...
(imported from commit c66a484a05bed37c50d0541b8cbf685862ac3738)
2013-11-25 14:00:28 -05:00
1d4a92ec0e
Layout fixes for settings page
...
(imported from commit 5bb99ee33b22625ad4101daf08ae36118d190b8f)
2013-11-22 14:54:24 -08:00
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
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
e711b8160a
Tweak wording on password help to be method-agnostic.
...
(imported from commit 1037df705ce599f6f62345a6f6619b2e428912ff)
2013-11-22 16:51:26 -05:00
9f3ab73fa4
register, login-sso, or signup depending on deploy type
...
(imported from commit 28fac6b626b7d3dda6f3ce0bd4ed748e0a6a7761)
2013-11-22 13:50:24 -05:00
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
fd4565dd67
modify day1 emails to point to new /hello location
...
(imported from commit e22936378eb1a8c541c4af274e6e6491cca8d313)
2013-11-22 13:50:24 -05:00
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
8c402109b9
Remove mobile apps from /apps in Enterprise
...
(imported from commit 70045c21e71454642ec6950934d3e736c5fa3410)
2013-11-22 13:50:24 -05:00
5973f20b69
fix use of EXTERNAL_URL to EXTERNAL_HOST, and some typos
...
(imported from commit 3e6e0f337671b289202bc86c6224854b6ee623c5)
2013-11-20 17:39:07 -05:00
83e2ba1208
Update signup/invite emails to use the support message for enterprise.
...
(imported from commit bdec3cb5f6332fdde704c54dfb02f90492329568)
2013-11-20 11:03:38 -05:00
d78511c933
Convert customer3 page to be about EVENT2.
...
(imported from commit 6ff4dafb84710fe3a4bb927ed3b8bc0f9ad9fb83)
2013-11-19 18:09:52 -05:00
a4f3577832
Clean up the appearance of different narrow alert
...
(imported from commit 24882274b2e0e1b28734d594acfe5ca3cd3eb953)
2013-11-19 12:51:32 -08:00
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
0355f444af
Document our Asana integration.
...
(imported from commit 1ffa39325331631423cc99ed0fbb09d4e509eec7)
2013-11-19 13:30:35 -05:00
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
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
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
dd53b92efc
Add row_class support to /activity tables.
...
(imported from commit 69dcbeccc3b048053b2dcca82c628b0cfccddfbb)
2013-11-18 12:36:24 -05:00
818ef42d05
Show zulip-desktop-sso package for local server installs
...
(imported from commit d0a05bfb2e7a15c02c0e61d6b95ef841a44340b3)
2013-11-18 12:04:43 -05:00
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
Steve Howell
Jason Michalski
Tim Abbott
Jessica McKellar
Luke Faraone
Waseem Daher
Leo Franchi
acrefoot
Allen Rabinovich
Jeff Arnold
Kevin Mehall