Commit Graph

822 Commits

Author SHA1 Message Date
Zev Benjamin 2a1678a1d3 Fix some wording in our Zephyr mirroring instructions
(imported from commit e513b42afbc5f7e43f62d914feb2472fe0f6d0e5)
2013-07-22 14:26:25 -04:00
Steve Howell c12521be35 Use ? as icon for Keyboard shortcuts, to match ? as the hotkey.
(Before it was info (i), which is the hotkey for another menu, so it
was confusing.)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

(imported from commit b55ef655e75746330dc3cc396cb908670e5019cc)
2013-07-01 11:27:37 -04:00
Steve Howell b04bd4a1ad Change text field hints for adding new bots.
(imported from commit 184888130b2c72f72266d32ced83ed1f23479c12)
2013-07-01 11:27:37 -04:00
Steve Howell 56ac727840 Style errors for bot avatar file uploads.
(imported from commit 2d16a860bc54b07117ce724dbdcf109233ac43e9)
2013-07-01 11:27:37 -04:00