Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,165 Commits 28 Branches 143 Tags 614 MiB
Commit Graph

186 Commits

Author SHA1 Message Date
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