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

7754 Commits

Author SHA1 Message Date
Tim Abbott feaf6843de Only document email integration if it is enabled. 
(imported from commit d1f13ff30c56f7a2156e8c00621b6b955302ccf0)
 2013-12-04 16:35:38 -05:00
Tim Abbott 97dd4b0cb3 Fix the whitespace in the Zulip Nagios config. 
(imported from commit 5fcdac241ba075c919ecc7dbfaaa811d0089bf5c)
 2013-12-04 16:30:58 -05:00
Tim Abbott 5d454afb74 api: Add support for setting site in mercurial integration. 
(imported from commit 697f4697af27be6f4eddd6ddbf7affbc8739cffe)
 2013-12-04 16:30:57 -05:00
Tim Abbott 9f016ed827 Update Asana/SVN integration documentation to show config files. 
(imported from commit ba918f996c61294b6b7967e133ad715a8b928b79)
 2013-12-04 16:30:57 -05:00
Tim Abbott d7c7913a11 Document Zulip SITE option in most integrations. 
(imported from commit d7266df1fa23a5fef5d5e7cce8d108da47f36da5)
 2013-12-04 16:30:57 -05:00
Tim Abbott 44386b3615 api: Document options required for use with Zulip Enterprise. 
(imported from commit 59f136cf0f1a5d9509bec054b060ab44695b77e0)
 2013-12-04 16:30:51 -05:00
Tim Abbott 4e52ecce0f api: Update documentation on ZULIP_SITE option. 
(imported from commit 82109dc08847240440f90524343c0f9562e4a0bf)
 2013-12-04 15:14:15 -05:00
Tim Abbott a33eb6f61f Update API documentation to use proper URLs for enterprise. 
(imported from commit cbf9fba4b8281e8ce7a6dd2964c921d2ef906559)
 2013-12-04 15:10:54 -05:00
Tim Abbott e5be713103 Clean up EXTERNAL_API_HOST usage and defaults. 
We now have 2 variablse:
EXTERNAL_API_PATH: e.g. staging.zulip.com/api
EXTERNAL_API_URI: e.g. https://staging.zulip.com/api

The former is primarily needed for certain integrations.

(imported from commit 3878b99a4d835c5fcc2a2c6001bc7eeeaf4c9363)
 2013-12-04 15:10:54 -05:00
Tim Abbott 02304ca4a0 Remove api/examples/curl-examples. 
It's out of date and we've never distributed it anyway.

(imported from commit 884e302ea4f55f9b3f986694a786cc5c17128e71)
 2013-12-04 15:10:54 -05:00
Waseem Daher 010475d49f Enable experimental background color for staging. 
(imported from commit 833b25ae48e44bc7749463b7dd26418d6e25703a)
 2013-12-04 14:15:23 -05:00
Steve Howell 87814572c9 Create tools/get-handlebar-vars utility. 
This basically prints out a template JSON data structure to
be used with a handlebar template that you specify on the command
line.  (You can actually supply multiple files, too.)

Example usage:

    $ ./tools/get-handlebar-vars static/templates/tab_bar.handlebars
    === static/templates/tab_bar.handlebars
    {
        "tabs": [
            {
                "hash": "",
                "title": "",
                "active": "",
                "icon": true,
                "data": "",
                "cls": ""
            }
        ]
    }

(imported from commit d7239fcae7d94038fa0e4b34c8b1208a1070ecbb)
 2013-12-04 13:58:04 -05:00
Tim Abbott 55047280c9 Include a newline at the end of our JSON responses. 
Otherwise, it's super annoying to work with these using curl.

(imported from commit 0047f07786dc07d7ac5cb671492f8ca40986d8cf)
 2013-12-04 13:47:48 -05:00
Tim Abbott 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
Allen Rabinovich 9f226e4cd2 Add a background switcher function. 
(imported from commit a9bd0403637c5da04d93c0ff5e1dd0272238f0a6)
 2013-12-04 11:07:12 -07:00
acrefoot 1a21db1170 Fix problem with presence list popovers persisting 
This addresses Trac #2090

(imported from commit e98a3dae8e946ec7fdb027d3619ae2b0ddbdbf51)
 2013-12-04 11:32:59 -05:00
Tim Abbott b8a151ca4e Revert "[puppet] Add cron job to restart our workers daily." 
This reverts commit 0b0180b0751f6c618d877b9c9ffc2b8287254e4d.

(imported from commit a81c552100345d369ffcaf69f28a86dea0893128)
 2013-12-04 10:27:45 -05:00
Tim Abbott f7ac58bab5 Revert "Add user_activity_test worker that does nothing." 
Now that we've debugged the memory leak, I don't think we need this
anymore.

This reverts commit 1bdc7ee2f72bdebb1cdc94601247834a434614d6.

Conflicts:

	puppet/zulip/files/cron.d/rabbitmq-numconsumers
	puppet/zulip/files/supervisor/conf.d/zulip.conf

(imported from commit ff87f2aebcbc71013fa7a05aedb24e2dcad82ae6)
 2013-12-04 10:27:45 -05:00
Tim Abbott 606d8a4f9b Add Nagios check for queue worker memory usage. 
This is detect future memory leaks.

(imported from commit 75fd4c2ad41ea71e87a53fb33e2106c5773909d5)
 2013-12-04 10:27:44 -05:00
Steve Howell a4c92093a0 Move #users_presence span.arrow click handler in file. 
This is purely cosmetic, to keep similar click handlers near
each other.

(imported from commit 6238905462c7a2edae879cad3ee8822f9a854a1d)
 2013-12-03 18:39:44 -05:00
Steve Howell d5b0093d0f Remove unused last_sidebar_elem vars. 
(imported from commit ec54c62dd0db68956184ec2ed6f07594e023ef64)
 2013-12-03 18:39:44 -05:00
Steve Howell 51fe87fcd6 Kill off dead code: show_user_sidebar_popover(). 
This code isn't really so much dead; it was never even born. :)

(imported from commit 0351b611dae7c0868cc5c3e2c76c010601c1e8ba)
 2013-12-03 18:39:44 -05:00
Jeff Arnold ec56e946a7 Only manually update fading if the compose box is staying open 
(compose.start() and compose.cancel() both update the fading themselves)

(imported from commit 63ce2f54106c8cce2306b0c1f3ce56e06f24235f)
 2013-12-03 16:58:50 -05:00
Jeff Arnold 2cd7c35875 Make c/C compose to a new destination instead of being identical to r/R 
R means "I want to send a PM, you can guess the destination"
r means "I want send a stream message, you can guess the destination"
C means "I want to send a PM and specify the destination"
c means "I want to send a stream message and specify the destination"

(imported from commit 4c93cc3029892c21accadd9624da70ee818dec68)
 2013-12-03 16:58:50 -05:00
Allen Rabinovich da3f1704ed A different kind of selection fix. 
(imported from commit 377b1571cced9f1ed9e404bbc3f70abb16b7e819)
 2013-12-03 14:12:48 -07:00
Tim Abbott 850eae3e8e puppet: Disable proxy_next_upstream feature in nginx config. 
(imported from commit 84cad76701f9ee40fa9601ae06b3f804948b96d4)
 2013-12-03 15:20:45 -05:00
Waseem Daher 30eaae72e4 Revert "Disallow user selection on body, but allow on individual elements" 
This reverts commit b3f8f8f79952c34cdf4087683210bab6e4e46a27.

This seems to break some of our copy-and-pasting code.

(imported from commit 052296a0f4bdb47342708a5e520be260863ccafd)
 2013-12-03 14:42:47 -05:00
Leo Franchi 1e7a22f14e Replace other non-zerver uses of iPhone client 
(imported from commit 0988e2c9bd0499a0711daed97f89aa672776f085)
 2013-12-03 14:35:24 -05:00
Tim Abbott 6808b5b5fe Disable scrollTop blueslip error for now. 
I think we've got plenty of data of user agent strings for when this
warning triggers at this point.

(imported from commit 8bf6601a325b8e35f5127914a447bd522439c531)
 2013-12-03 14:32:44 -05:00
Tim Abbott 5007d4d87a [puppet] Update set_real_ip_from to use lb0's internal IP address. 
This is something we forgot to do in the VPC migration, so our IPs
have all been the lb0 IP in our logs :(.

(imported from commit 9d3fc69cf72a84f7bd7c54e50fb1e776a67d971f)
 2013-12-03 14:29:34 -05:00
Leo Franchi 1b53a77f1b Expect an ios client instead of iphone 
(imported from commit d5d3cd129d7005fd9294096d3899df86155cd366)
 2013-12-03 14:27:51 -05:00
Allen Rabinovich 5d79796465 Disallow user selection on body, but allow on individual elements 
(imported from commit b3f8f8f79952c34cdf4087683210bab6e4e46a27)
 2013-12-03 11:22:44 -07:00
Tim Abbott 878e07a5d8 Fix doubled query count logging when DEBUG=True. 
(imported from commit 32dfc4c4e366ca80e659ca3d6ab4959b0235e861)
 2013-12-03 12:21:06 -05:00
Tim Abbott f86de8c7a0 Augment update_pointer logs with new pointer value. 
(imported from commit bbe9835c2ef089dd85b7515f02ad1297026061e9)
 2013-12-03 12:21:06 -05:00
Tim Abbott f765c88ac9 The iPhone app now handles unread counts properly. 
(imported from commit 4afe4d082d9d575142087e12088a1d563e43096e)
 2013-12-03 12:21:06 -05:00
Tim Abbott abded5f886 Upgrade event flag collapsing to support all flag changes. 
(imported from commit a2ca74b779d67148aee41e92e4a4cb716620e566)
 2013-12-03 12:21:04 -05:00
Tim Abbott d2486670a8 event: Add deduplication of server restart events. 
(imported from commit e464aa8b68958fb9f9fe8c199b9e73df510d22bc)
 2013-12-03 12:20:36 -05:00
Tim Abbott 0156e72352 Add tests for our event queues data structure. 
(imported from commit 5c00251998d25cf2283737173e5af0b26ccbdad4)
 2013-12-03 12:20:28 -05:00
Tim Abbott 54b06d046b events: Add support for not storing redundant events. 
This should dramatically improve the speed of the dump/load part of
our restart process, especially with large long-lived event queues.

(imported from commit ae4ae20ba2ca4433e25a5e7beeb4fa4882c53972)
 2013-12-03 12:19:42 -05:00
Tim Abbott ad9659ea54 events: Fix zulip_finish to not make assumptions about how queues work. 
Previously, we had an issue with the ACKing protocol, where if a
virtualizable event (like a "read" flag) was dispatched to a queue
client immediately, we would not properly ACK the change because it
had been made a virtual event.

(imported from commit ea09812f8a5ba1d5aad65f536022e3dbc77b0f9e)
 2013-12-03 12:19:42 -05:00
Luke Faraone dc5c410257 Remove django-jstemplate, unused per trac #1973 
(imported from commit 97b2e75766e3576f17b7dab0f1a4a00c34a5c2e5)
 2013-12-03 11:36:18 -05:00
Steve Howell 80ec6ff8bc Remove transitional show_huddles flag. 
(imported from commit 37f6cdb4f62076faa1e977ec9b0a53cc461f0d11)
 2013-12-03 10:45:01 -05:00
Steve Howell fa5681d93b Turn on clicking_notification_causes_narrow for CUSTOMER4. 
(imported from commit edf7a341fb66a3783fe933424eeb8dea65cf2954)
 2013-12-03 10:45:01 -05:00
Steve Howell 36a7944d2a Give topic zooming to CUSTOMER4. 
(imported from commit 7f509f3d32b61708c64bfe2d5982485d8488a44e)
 2013-12-03 10:45:00 -05:00
Waseem Daher 2223d2e465 Un-blue the (more topics) link. 
(imported from commit 91f06b1d213b3ea4e7db9fcedf7f4f41437c060d)
 2013-12-02 22:33:40 -05:00
Steve Howell b09884e589 Re-style the "(more topics)" link. 
For some reason "font-style: italic" causes the "(more topics)" link
to be invisible for a while.

(imported from commit e75610e4b1f1263a48dac76ab8d01bb4a29c3d47)
 2013-12-02 21:42:31 -05:00
Jessica McKellar c46e5fd0f1 Feature flag the digest emails setting to staging. 
(imported from commit 1239ce31281850dccf8f65d0c7156bd2c86ca3a7)
 2013-12-02 18:58:04 -05:00
Jessica McKellar 11d5f8bbc5 Add a test for unsubscribing from digest emails. 
(imported from commit 145c25ae99cf66b9a447b2e3a44a3b7344dc9f59)
 2013-12-02 18:58:04 -05:00
Jessica McKellar e15cc972ec digest: refactor sending the emails into a function for easier testing. 
(imported from commit 2f3c8fb8e812c04ab838b1034ae0811309186625)
 2013-12-02 18:58:03 -05:00
Jessica McKellar c1058355f6 Add a digest emails checkbox to your settings page. 
(imported from commit cf1dbae6ca30d2489a77e822c34941a986b93bbd)
 2013-12-02 18:58:03 -05:00