Commit Graph

6976 Commits

Author SHA1 Message Date
Steve Howell d7d1888ce0 Add TestWorker queue processor.
TestWorker is for troubleshooting, and it simply appends lines to a file
in /tmp.

(imported from commit 96b646a193a5474f3222b41725742e359b5301ec)
2013-10-30 16:47:16 -04:00
Zev Benjamin d5b7cfd21a Fix whitespace
(imported from commit 095ea8640a18560aae7bd5e045c4f68c96f96f73)
2013-10-30 15:52:35 -04:00
Zev Benjamin eb7fd1ba51 Add some front-end debugging changes
(imported from commit 21684b09100bc0a24372948a9417c973709c1be2)
2013-10-30 15:52:35 -04:00
Zev Benjamin 2e6b3131b5 blueslip: Add `debug()` method that logs to the in-memory log but not the console
(imported from commit 7ca312d89ad3ec26c955b846e98c94b2b84a397e)
2013-10-30 15:52:35 -04:00
Zev Benjamin dd678465ae [manual] Move puppet modules to the top level
The new puppet.conf file has to be moved into place manually.

(imported from commit 253d9a95386dae8c803a998ce2dc7e8be40c880a)
2013-10-30 15:42:26 -04:00
Zev Benjamin 8ca76ba13f Split our puppet configuration in two
The 'zulip' module contains the general setup for any server that
will run our app.  The 'zulip-internal' module contains configuration
that is internal to Zulip the company.

(imported from commit 23c99dd889577c2917ddbf76892cf8f6cc66a13e)
2013-10-30 15:42:25 -04:00
Zev Benjamin 57bef07832 [manual] Move /etc/humbug-* files into /etc/zulip
The moved files are:
humbug-server
humbug-local
humbug-machinetype

Their new names are their old names with 'humbug-' removed.

zulip-puppet-apply must be run before this commit is deployed

(imported from commit f4eb523244d3409b5809c279301225d3fdf0c230)
2013-10-30 15:42:25 -04:00
Zev Benjamin 09acf1c22d Remove old, unused update-server script
(imported from commit 45e6923859bd008d66f555eaea286425a6578562)
2013-10-30 15:42:25 -04:00
Allen Rabinovich 381ec4a7e0 Fix for integrations jumpiness
(imported from commit 106ca972d27e46cfacbd7b321dbbe5d69af463df)
2013-10-30 11:47:02 -07:00
Waseem Daher db1f5065a7 Add tooltip for, e.g. !gravatar(wdaher@zulip.com) output.
(imported from commit eff24a2fc7da77edc26449074acf75832d368a17)
2013-10-30 13:29:37 -04:00
Luke Faraone 5991d19013 Require and set an API/web URL when creating a deployment
(imported from commit b60eecd6a425f052fa0f73c5d9414fb0d817987e)
2013-10-30 12:00:13 -04:00
Luke Faraone 6d3f3d0d67 Include the deployment's ID in the command output.
(imported from commit e5fe9f31a4c9336a8b6cb449938d935705639e71)
2013-10-30 12:00:13 -04:00
Luke Faraone ab9b1be82c Rework management commands to handle deployment assignment
We now ensure `create_realm` adds you to a default deployment and that
`create_deployment` removes the old deployment association when
performed.

(imported from commit 5b94fb07b8e11332765b057dc640a5ed873ec99e)
2013-10-30 12:00:13 -04:00
Jessica McKellar 3551b211f2 tests: add missing stash fixture.
(imported from commit 696e789bcab872d570275a64630317af784abb25)
2013-10-29 23:07:07 -04:00
Jessica McKellar 9bf282386d tests: add a Stash test based on the sample JSON.
(imported from commit 8761e4742167197f472c78e6546e8934fdd5ae33)
2013-10-29 22:45:50 -04:00
Jessica McKellar 54977707cf tests: remove redundant http_auth method.
(imported from commit 7fc425ce0e61e68c2fc033c02997ec0786e118fb)
2013-10-29 22:45:29 -04:00
Jessica McKellar 8e838f4db3 Add a first pass at Stash integration via their webhook mechanism.
(imported from commit 6173379f72aeef318550b35e51d4aa1fd69997ed)
2013-10-29 22:40:42 -04:00
Waseem Daher f964613d28 Integrations page wording tweak.
(imported from commit 0c42c615050110ea23d1ae7fdf6a9906cd93546d)
2013-10-29 19:11:56 -04:00
Steve Howell e6295e53cd Fix missing close quote in nagios config.
(imported from commit 927723356a856477f093cfc3d69a7e702a0a72da)
2013-10-29 18:18:19 -04:00
Steve Howell c6754ef86a Make nagios script path work on staging/prod.
(imported from commit 33986c1de9c1a2a94579291713213aea61988df4)
2013-10-29 18:09:00 -04:00
Tim Abbott 5b33c44f64 Add tool to build local server tarballs.
We need to maintain this by labeling the files that we don't want to
ship with our local server tarballs in the .gitattributes file.

(imported from commit e29f38c477a4cdfd80fbb8e4e95c611b34f3b212)
2013-10-29 17:55:07 -04:00
Leo Franchi 9be1333c6b Log send_message times through our new socket infrastructure as well
(imported from commit 215be8f7e3d2498ed34e9fcc421498a7cfca4fbc)
2013-10-29 17:49:27 -04:00
Steve Howell ede3252f8d [puppet] Add nagios script to look for queue error files.
You should do the puppet apply on the nagios box.

(imported from commit 7cf3a11ede69ed6bd7ba2a4384d83c89cfcc65c0)
2013-10-29 17:45:32 -04:00
Steve Howell 884e602185 [puppet] Handle exceptions from queue workers.
Subclasses of QueueProcessingWorker that don't override start() will
have their consume() functions wrapped by consume_wrapper(), which
will catch exceptions and log data from troublesome events to a log
file.

We need to do a puppet apply to create /var/log/zulip/queue_error.

(imported from commit 3bd7751da5fdef449eeec3f7dd29977df11e2b9c)
2013-10-29 17:45:31 -04:00
Leo Franchi 8e05f76511 Only enable analytics and dropbox on non-LOCAL_SERVER
(imported from commit 1ba877550b3afde51bec6f344762ea998800c5b6)
2013-10-29 17:33:36 -04:00
Tim Abbott b7c1686501 Initial IRC mirror prototype.
(imported from commit fb1c482aaebc317b8b071346cb3bf54d4c7d2c8d)
2013-10-29 16:49:42 -04:00
Tim Abbott 1292c5dbfe Add backend support for Jabber mirroring.
(imported from commit 12f5c708a6961aded4f4e166af84e87720be4ddc)
2013-10-29 16:49:42 -04:00
Kevin Mehall 06590f4332 Upload to local filesystem on local server.
(imported from commit 6c38a8cae721b2e7a0863470692cc56425006ecb)
2013-10-29 16:19:04 -04:00
Kevin Mehall 209ff75af8 Remove duplicate MANDRILL_API_KEY setting
(imported from commit c71928b5bfd71e9fcda1f5d57e9c7b99361ce070)
2013-10-29 15:47:13 -04:00
Allen Rabinovich e91932976b New integrations page
(imported from commit 73afc130f9e2871e24e67c28f3ba4fa0839b11be)
2013-10-29 11:11:45 -07:00
Kevin Mehall f9af7ad1cf Resize uploaded avatar images
(imported from commit 47ff86fcd47871916631baa34f99bbddb67f87d0)
2013-10-29 11:42:33 -04:00
Kevin Mehall c65d3d5127 [manual] Add dependency on PIL (python-imaging)
Locally, use:
  apt-get install python-imaging
or
  pip install pil

(imported from commit fb1f897cf4098d777c645a5780f937a3e54b6dcf)
2013-10-29 11:42:33 -04:00
Steve Howell 0b335a7b73 Simplify DigestWorker.
The DigestWorker isn't do any batching of events, so it can
be implemented with a simple consume() handler.

(imported from commit 0560eaf1a6e510adf97448fbe8933d9903d30016)
2013-10-29 11:39:45 -04:00
Steve Howell 6725771c1b Make avatar circular on Settings page.
(imported from commit 4a4f109e04e237dda9c1c5fbfa940ed63a1eec58)
2013-10-29 11:16:07 -04:00
Steve Howell 8449a74fdf Remove obsolete comments.
(imported from commit d360efebd5201129becd22cb547c6c1fd24ed918)
2013-10-29 10:59:42 -04:00
Steve Howell 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
Steve Howell af6de2053e Give Notifications settings its own alert area.
(imported from commit 1d17b85f383862d1f37b5750af40aa8d9a1d8bf2)
2013-10-29 10:59:41 -04:00
Steve Howell 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
Steve Howell 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
Jessica McKellar 06d9eb78d4 integrations: document the Mercurial integration.
(imported from commit a9bf36f242bfc20283d3487471e537d885e38e04)
2013-10-29 09:58:05 -04:00
Jessica McKellar b7fa44bed3 Add a first pass at Mercurial changegroup (hg push) integration.
(imported from commit 94c91aed6282a2fffcd7753a06dc68a298b7bdc7)
2013-10-29 09:58:04 -04:00
Tim Abbott ebb34fe891 nagios: Add lb0 to our host configuration.
(imported from commit 64310941fa6e0de3d98ace9bb8319a2df8155ff1)
2013-10-28 17:15:12 -04:00
Tim Abbott ce551df1bb trac: Update default query.
(imported from commit 77f9bd66e85d64e6f86edcf44312888676c48f8d)
2013-10-28 17:15:12 -04:00
Zev Benjamin 90d92814ca socket: Throttle reconnection attempts
Previously, if the user held down the enter button while the socket
was disconnected, the client would try to connect in a very tight
loop.  Now we throttle reconnection attempts to 1 per second.

(imported from commit 7b18260b992d5a34f3ea7925cf72b383f84bbabd)
2013-10-28 16:42:16 -04:00
Leo Franchi a33640c7dd Sleep digest queue worker for 1min between attempts to drain queue
(imported from commit e272dcd33bc89e6813abb0b4dc2c882a8048245e)
2013-10-28 15:47:04 -04:00
Tim Abbott bdd1d8e4a4 zmirror: Configure zmirror server to not use neskaya.
Per request from Camilla Fox.

(imported from commit e9754236cf886ec09ce57dc0f125d6a70f24e3f3)
2013-10-28 15:44:38 -04:00
Tim Abbott 7faceb2d2d zmirror: Add some more non-world-readable Zephyr classes.
These are from a list that Camilla Fox sent me of all
non-world-readable Zephyr classes currently configured.

(imported from commit 6246a981402b47056b28cd14be688e15224aacd1)
2013-10-28 15:44:34 -04:00
Tim Abbott 901a5c342c Use os.path directly rather than sometimes importing it separately.
(imported from commit 48486c4ea64d02a15faeebb0f490d31e9b113d62)
2013-10-28 15:44:13 -04:00
Jeff Arnold 4b9981c333 Make clicking to the left or right of the compose box close it
Addresses #1819

(imported from commit 6d06283cb8a39107151ffc5ce5a85c1455e332f2)
2013-10-28 15:33:11 -04:00
Zev Benjamin 807116e955 Delay connecting to RabbitMQ until it's necessary
Previously we were connecting at import-time.

(imported from commit 9a638f0d238f3b6b00feb4aa524098a64953cb92)
2013-10-28 15:27:25 -04:00