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

266 Commits

Author SHA1 Message Date
Tim Abbott 3e87c82d56 Reorganize settings.py to put the default values in a sane place. 
(imported from commit 00f09c6c65cb95d29c466e996b17f80a30635acf)
 2015-08-22 13:49:43 -07:00
Yoyo Zhou 50ccbc4230 Refactor database configuration to make ZULIP_COM the special case instead of the default. 
(imported from commit bba7a3a78dc4fd0e442503f8707295eabc581652)
 2015-08-22 13:48:52 -07:00
Yoyo Zhou 8549606eb3 Require ALLOWED_HOSTS to be set in production. 
(imported from commit 581e3d44aa42b5c8e6322b760b8b66a1f0aaf375)
 2015-08-22 13:48:52 -07:00
Tim Abbott da84aa3412 Require REQUIRED_SETTINGS in PRODUCTION. 
(imported from commit 7f43ba4d54021f806481b2e369c5482b0e0f99fe)
 2015-08-22 13:48:47 -07:00
Tim Abbott 6f50a2703e Remove duplicate ZULIP_COM detection from settings.py. 
And fix up some required configuration.

(imported from commit 761758638baa297118848c9f5640638d6b2f4f67)
 2015-08-21 10:48:13 -07:00
Tim Abbott e78361f985 Move STATSD_CONFIGURATION below setting defaults. 
(imported from commit 48d833c672ad96318f738c663c3bea61cd1ec382)
 2015-08-21 10:42:15 -07:00
Tim Abbott 83a653efce Change semantics of ZULIP_COM to include ZULIP_COM_STAGING machines. 
(imported from commit 2e84c756b4ac41c13d619ab6ceb99e347d1f48cb)
 2015-08-21 10:41:14 -07:00
Tim Abbott 16e0f21687 Fix a bunch of Zulip Voyager related comments. 
(imported from commit 176e875cbc310ba00d6137930ddb718bd68f1866)
 2015-08-21 10:40:54 -07:00
David Roe edf7e732a2 ENTERPRISE => VOYAGER. 
(imported from commit 4f8080b9f506a87ca40bef32e39de5218cba916a)
 2015-08-21 10:33:35 -07:00
David Roe f9f1fdc4d7 change deploy_type in zulip.com conf file. 
(imported from commit 6fad28d15f530a619d7359bce0a182ed61b876ab)
 2015-08-21 10:33:35 -07:00
David Roe d702ddb3cf DEPLOYED => PRODUCTION 
(imported from commit a7d365c07916c5103fc721c712db94f9af977640)
 2015-08-21 10:33:35 -07:00
David Roe 63e576b811 STAGING_DEPLOYED => ZULIP_COM_STAGING 
(imported from commit 25419979292218932c53cface59c1e8e2348a7c2)
 2015-08-21 10:33:35 -07:00
David Roe 8778c4726a Add settings.DEVELOPMENT as a complement of settings.DEPLOYED. 
(imported from commit 0437140d9fee7eec7b28abe583cfe8cde3e07c21)
 2015-08-21 10:33:35 -07:00
David Roe 24f6743288 Eliminate TESTING_DEPLOYED. 
(imported from commit 477d8b7a15f703df1e10ae5682e02fea5ce040e4)
 2015-08-21 10:33:35 -07:00
David Roe 59b94a901c Moving ALLOWED_HOSTS to local_settings. 
(imported from commit b89c6983fd87ede42954dd84706f999ed0de740d)
 2015-08-21 10:33:35 -07:00
Tim Abbott 80651c99cd Stop using local_settings.py at all in the Dev VM. 
(imported from commit d067bcfe9d71628d8f671c5bc7bb38f521f9a965)
 2015-08-21 10:33:35 -07:00
Tim Abbott 78277b5ee5 Make ADMIN_DOMAIN and ZULIP_ADMINISTRATOR have sane dev defaults. 
(imported from commit 3d2602166541c7eaa72ea7fad87a2dc86f7c8f15)
 2015-08-21 09:01:58 -07:00
Tim Abbott 3e61714035 Make DEPLOYMENT_ROLE_KEY no longer required. 
(imported from commit 046ce610d847cc987d3f6d584ccc0bc84b55df84)
 2015-08-21 09:01:58 -07:00
Reid Barton ab9539cffe Remove OpenID authentication 
(imported from commit 70a859041a851ed10dc40cfc068330e472d2ed09)
 2015-08-20 23:52:48 -07:00
Reid Barton 15fe02b618 Remove authhack 
In Django 1.8 the username length limit seems to be 254 by default.

(imported from commit cf0027431f5a4fea9e366a49d345b9d09b90d869)
 2015-08-20 23:15:45 -07:00
Reid Barton 0aab583bb1 Django 1.8 compatibility: transactions 
- autocommit is now the default
- commit_on_success is now atomic

(imported from commit b6166ca666ff23d34f2871ca365ce3ec66b0fa86)
 2015-08-20 23:15:45 -07:00
Reid Barton 599742536b Switch from South to native Django migrations 
This commit loses some indexes, unique constraints etc. that were
manually added by the old migrations. I plan to add them to a new
migration in a subsequent commit.

(imported from commit 4bcbf06080a7ad94788ac368385eac34b54623ce)
 2015-08-20 23:01:26 -07:00
Yoyo Zhou 15abf9ed31 Move all remaining calls of get_secret from local_settings.py to settings.py. 
(imported from commit 099a122121f8e06568cef3579f955cb73b20ee50)
 2015-08-20 22:19:26 -07:00
Yoyo Zhou bd5fc484f0 Move GOOGLE_OAUTH2_CLIENT_SECRET to be read in settings.py. 
(imported from commit 814dc32cd6099516486be76fa8baffbafda69596)
 2015-08-20 22:19:17 -07:00
Yoyo Zhou 4b3874988f Move DROPBOX_APP_KEY to be read from get_secrets 
(imported from commit 99acd66c4478a0826b0e0ec7bf26c9a59f7febca)
 2015-08-20 21:58:59 -07:00
Yoyo Zhou ef320c6e95 Remove Redis remote authentication feature. 
We can add it back later but for now we can just stick with localhost
since that's what most people will want.

(imported from commit c5fe524282219dc62a0670f569c0cb6af04be339)
 2015-08-20 21:58:59 -07:00
Yoyo Zhou e41c00107d Move twitter secret keys to use get_secrets in settings.py 
(imported from commit cc21265ae64a49be20bec74386314d60ee822746)
 2015-08-20 21:58:59 -07:00
Yoyo Zhou 32f6d1055d Get s3_key and s3_secret_key from secrets in settings.py. 
(imported from commit 2c2574988486bbb6f0f769250664a5a2a4c9e6c9)
 2015-08-20 21:58:51 -07:00
Yoyo Zhou d34d44e1d4 Read ANDROID_GCM_API_KEY from secrets; move to settings.py 
(imported from commit 0d0d59116065956b9cbbe895eb09f0433b752cf1)
 2015-08-20 21:54:55 -07:00
Yoyo Zhou 2cab113035 Rename getsecret -> get_secret and remove duplicate secret-reading code in settings.py 
(imported from commit 097d6b4fad1fcf8b6f09dc212056fdb313efe5e4)
 2015-08-20 21:52:26 -07:00
Tim Abbott 58e5c654fa Make feedback button option default-off. 
(imported from commit 23b89ab72bd04826016631e01da950af0a5df694)
 2015-08-20 19:47:00 -07:00
David Roe 13f3b448e5 Kill Embed.ly integration. 
(imported from commit dfe42a26e57100108c3c50298041bd520e0d8b1b)
 2015-08-20 19:46:48 -07:00
Anders Kaseorg bded0d9d54 Remove corporate beta signup form 
(imported from commit 1b3a0cd8a59a124905fa4cbd3121a78d23aeb3a2)
 2015-08-20 18:40:34 -07:00
Tim Abbott e79447131f Make build-enterprise-tarball run again. 
(imported from commit e3dd8d75811458d0cee8a2d05a4b47abd6eda7fd)
 2015-08-20 17:33:16 -07:00
acrefoot 0a6bb975c3 Replace settings.OG_ZULIPER_EMAILS with database lookups 
Also renames the OG_ZULIPER_EMAILS to CROSS_REALM_BOT_EMAILS

(imported from commit a9e0ccebbd6b37376e535600670ad493dc8de7e1)
 2015-08-20 17:20:41 -07:00
Cat Miller 0a20f168a7 Auto-generate dev-secrets file. 
Source LOCAL_DATABASE_PASSWORD and INITIAL_PASSWORD_SALT from the secrets file.
Fix the creation of pgpass file.

Tim's note: This will definitely break the original purpose of the
tool but it should be pretty easy to add that back as an option.

(imported from commit 8ab31ea2b7cbc80a4ad2e843a2529313fad8f5cf)
 2015-08-20 00:20:44 -07:00
Tim Abbott 7cffb41e13 Reorganize and document settings.py. 
(imported from commit e2694979d5aee95c22b83b7aa84d80b56ffae1d6)
 2015-08-18 20:57:35 -07:00
Tim Abbott 5b8894cd25 Rename USING_SSO to something more clear. 
(imported from commit 94e8ae84b01419783872a5d09bafe5c2eb933c18)
 2015-08-18 20:48:15 -07:00
Tim Abbott 05b0cbb36a Zulip doesn't use MEDIA_URL. 
(imported from commit ebc370d9c5cf2d7e7d366cbb25fe721c817f212e)
 2015-08-18 20:48:15 -07:00
Tim Abbott dcc3b3fe37 Don't create Zulip employee accounts automatically in Dev VM. 
(imported from commit 378f12d3f2ac4c131919c0efbd049b9eaa961694)
 2015-08-18 20:46:35 -07:00
Tim Abbott 2de3e2ebdd Move several secrets to using the get_secret function in settings.py. 
(imported from commit 08fb828265c4a9e35294a51c0901bd5ad3990344)
 2015-08-18 20:17:48 -07:00
Tim Abbott 8c88746912 Move iOS App IDs to settings.py since it's needed to run the app. 
(imported from commit 891e32ffa82430487fc333fa549ee465f0d018c0)
 2015-08-18 20:17:48 -07:00
Tim Abbott 43c7ff64d1 Remove unused FULL_NAVBAR configuration setting. 
(imported from commit 47c3be669f7ba44426301a46e3f54054f3e2440b)
 2015-08-18 20:17:48 -07:00
Zev Benjamin 466a678c2c Remove "More messages below" indicator 
It's been very buggy for a while, has limited usefulness compared with
unread counts, and profiling over the weekend indicates that it's very
slow.

(imported from commit 716fe47f2bbec1bd8a6e4d265ded5c64efe2ad5c)
 2015-03-30 15:44:36 -07:00
Leo Franchi d865732e0d Maintain two APNS connections and send correct notifications to each 
Now we have 2 different Zulip apps out there, and they are signed with
two certs: Zulip and Dropbox. The Dropbox-signed apps are going to need
to be sent APNS notifications from the appropriate APNS connection

(imported from commit 6db50c5811847db4f08e5c997c7bbb4b46cfc462)
 2015-02-11 06:57:25 +00:00
Jason Michalski 15713964a5 Add the notification-bot to the cross realm PM whitelist 
(imported from commit 92a19f955a99650c79b83c6afb23726caf02e577)
 2015-02-08 21:03:45 -08:00
Jason Michalski a0a537e0ce Add the feedback bot to OG_ZULIPER_EMAILS 
The feedback bot needs to be included in the OG_ZULIPER_EMAILS so users
can send feedback.

(imported from commit b0c3295379d0f062a912f8b6c957419335be1c48)
 2015-02-08 10:08:32 -08:00
Jason Michalski 1eebcb472d Only allow users in the OG zuliper list to send cross realm PMs 
Changes from allowing all of the zulip realms to a whitelist of users.

(imported from commit 5ad2db9a62b430ef2c9d867e4afdf661b11ae96a)
 2015-01-30 23:39:47 -08:00
Zev Benjamin 2c760ae735 Remove mixpanel 
(imported from commit 9b6cc58ee9be483db8bf2d2eaaaecabc14f821e4)
 2015-02-06 13:59:30 -08:00
Zev Benjamin 9738f2fa17 Send feedback to prod 
(imported from commit 52c76dfb6f8b8e49d1a9e799852a1683e85673c6)
 2015-02-05 22:46:30 -08:00
Luke Faraone e241e6e833 [manual] Support chat.dropboxer.net hostname. 
This needs to be deployed on both prod and lb0 to be functional

DEPLOY INSTRUCTIONS: restart carefully

(imported from commit d97a450754608357418c80e5b3c7b3bbcd1d09fb)
 2015-02-05 17:55:29 -08:00
Tim Abbott 7e786d5426 Import default session middleware as start for custom session middleware. 
(imported from commit 76aae367ab6ea5c2a7b0d98368482a3cb312b217)
 2015-01-15 21:09:52 -08:00
Steve Howell e5467d3268 Move ui.js click handlers to click_handlers.js 
(imported from commit adfeb1f152cca473bc4c6ba5ccd142b38947b335)
 2014-03-14 20:48:59 -04:00
Steve Howell 16faed0a83 Create copy_and_paste.js (with code from ui.js). 
(imported from commit 37a06af5489e7da5196e5710f384d1f5a7ee7578)
 2014-03-14 20:48:59 -04:00
Steve Howell c5993c2d2d Create gear_menu.js (with code from ui.js). 
(imported from commit fc4d058d49d5d4aaaa20ef6237ea3e927eac03e3)
 2014-03-14 20:48:58 -04:00
Steve Howell 405c3d7626 Created floating_recipient_bar.js (with code from ui.js). 
(imported from commit 2b6631938b0fc8e39c14aacd92f9f1670b68b199)
 2014-03-14 20:48:58 -04:00
Steve Howell f8b71fa497 Created condense.js (with code taken from ui.js). 
(imported from commit 72b27b48614a7c396170d46936646e52757e2743)
 2014-03-14 20:48:58 -04:00
Steve Howell 84b59d4335 Created scroll_bar.js (with code taken from ui.js). 
(imported from commit 0c4e8538031ceb1a0f50eea9a34e315e23e7d9ff)
 2014-03-14 20:48:56 -04:00
Steve Howell be2a1c2893 Move resizing code to resize.js. 
(imported from commit b6df0007307872751e1a4200af740076e08b5c11)
 2014-03-14 20:48:55 -04:00
Steve Howell 7fce920522 Move favicon-related functions to favicon.js 
util.reset_favicon -> favicon.reset
util.set_favicon -> favicon.set

(imported from commit 250848ec5dc7ac58649197c8cc4b7b4e7b19f25c)
 2014-03-14 20:48:55 -04:00
Steve Howell 91e83731f0 Promote setup.js in the list of JS files. 
I don't think this matters a ton, but there's no reason for
the two muting files to come before setup.js.

(imported from commit c18231b633fba6acccaf5bc180c7605f7591462e)
 2014-03-14 20:48:53 -04:00
Steve Howell 50bc5401a4 Moved loading_indicator functions to loading.js. 
util.make_loading_indicator -> loading.make_indicator
util.destroy_loading_indicator -> loading.destroy_indicator

(imported from commit 8a171622a6096476dd040912d3f1460d53159f20)
 2014-03-14 20:48:52 -04:00
Waseem Daher 095c82ecc4 Actually switch to Bootstrap3-esque buttons. 
(imported from commit ddcecb8c5a63324a666ffe170e2d5a76171776c9)
 2014-03-05 16:24:54 -05:00
Jason Michalski 3f6e53db6e Add bot_data module that updated with events 
(imported from commit b0bd714258132fc81db763d316a15f5a81b1f4ff)
 2014-03-05 14:16:20 -05:00
Allen Rabinovich 1eae686443 Add slim scrollbar to stream list 
(imported from commit 58b64081db68fe9b1d2addcaece10167332d1a1b)
 2014-02-27 20:25:41 -05:00
Leo Franchi 748e5b6da6 Remove disabled summarization code 
This experiment has been disabled for everyone for a while: if we
bring something like this back, it is not likely to be exactly the same,
and will be different enough to require a different implementation.

As it is, the summarization code was making a few code paths (rendering
especially) more complex, and is worth removing for simplicity's sake.

(imported from commit 6ac8cdc9f7077a5a1da01ab4268aba3db0bc43f8)
 2014-02-27 20:25:23 -05:00
Zev Benjamin 631783f3cd [manual] Use dedicated Redis server for staging 
Before we deploy this commit, we must migrate the data from the staging redis
server to the new, dedicated redis server.  The steps for doing so are the
following:

* Remove the zulip::redis puppet class from staging's zulip.conf
* ssh once from staging to redis-staging.zulip.net so that the host key is known
* Create a tunnel from redis0.zulip.net to staging.zulip.net
  * zulip@redis0:~$ ssh -N -L 127.0.0.1:6380:127.0.0.1:6379 -o ServerAliveInterval=30 -o ServerAliveCountMax=3 staging.zulip.net
* Set the redis instance on redis0.zulip.net to replicate the one on staging.zulip.net
  * redis 127.0.0.1:6379> slaveof 127.0.0.1 6380
* Stop the app on staging
* Stop redis-server on staging
* Promote the redis server on redis0.zulip.net to a master
  * redis 127.0.0.1:6379> slaveof no one
* Do a puppet apply at this commit on staging (this will bring up the tunnel to redis0)
* Deploy this commit to staging (start the app on staging)
* Kill the tunnel from redis0.zulip.net to staging.zulip.net
* Uninstall redis-server on staging

The steps for migrating prod will be the same modulo s/staging/prod0/.

(imported from commit 546d258883ac299d65e896710edd0974b6bd60f8)
 2014-02-10 13:23:28 -05:00
Tim Abbott 88fbd5d16a Split out new module message_store.js. 
(imported from commit 57cf3f2b8e74d7c56e3baf75859d5b3646282225)
 2014-01-31 15:57:28 -05:00
Tim Abbott c8d57fcafb Split out message_flags.js. 
(imported from commit 52afa76fa71141630e325e558cb9c6955d8c03d5)
 2014-01-31 14:59:03 -05:00
Tim Abbott e505583f52 Split out new module people.js for tracking people. 
(imported from commit fb9b769819ade25d1d3d6e452e68c7ee8651cfdd)
 2014-01-30 17:32:58 -05:00
Tim Abbott a7b1b29bf0 Move get_updates into a module. 
(imported from commit 9a6c0ab1e76dd96abad8626bc5b1fdbd234b2645)
 2014-01-30 15:57:28 -05:00
Steve Howell 12c095fd4b Extract test_runner.py 
The file test_runner.py has our subclass of DjangoTestSuiteRunner
and various methods that help it work.

(imported from commit 8eca39a7ed3f8312c986224a810d4951559e7a8b)
 2014-01-29 10:55:59 -05:00
Leo Franchi daecc7993a Add a fenced code parser in javascript 
(imported from commit 42b1dc18ca34cbbdf3cda6e833adde631a9d88f5)
 2014-01-28 15:35:32 -05:00
Jessica McKellar a62c720e0e [manual] Add back json_tutorial_send_message endpoint. 
Before deploying to staging, create the tutorial bot:

email: welcome-bot@zulip.com
name: Zulip Welcome Bot

(imported from commit 2f337a00ffac888b121975bdb95a89cf2f8ab3a7)
 2014-01-23 17:06:27 -05:00
Leo Franchi 24cb5fb079 Add a localstorage.js module 
(imported from commit 9f3ab248ce84ce296bb1fb918de3b2dd8cde1ded)
 2014-01-23 16:28:58 -05:00
Leo Franchi 835e385b75 [third] Add marked.js, a javascript markdown parser 
(imported from commit e85d9b50328ce7d31882464fcc283478f7a9f753)
 2014-01-23 16:28:54 -05:00
Leo Franchi 0b2ba855f9 Add helper for rough determination of markdown client-side 
(imported from commit 3b6439f54e55fbca0f586392d1a0add4d7f694b8)
 2014-01-23 16:28:54 -05:00
Jason Michalski d4aece75a5 Add JS to for the inline subscribe button 
Add javascript to handle the button clicks and update the status based
on the subscribe and unsubscribe events from the server.

(imported from commit 6b9c0b40d9084e3d8b64bed701ebc786bef6d432)
 2014-01-22 11:28:31 -05:00
Luke Faraone c3eac38fa4 Make cookie domain configurable via zulip.conf 
Adapted from a cherry-pick picked of Zev's
fda2d99d9e9a07951d11fcd9fc61cf229988f471.

(imported from commit 4701511d94f9ae34523202ca395e72ceb7a1adfb)
 2014-01-16 16:29:49 -05:00
Zev Benjamin fa097a1201 Remove jquery.highlight 
The one call we were making to it was actually unnecessary since highlighting is
no longer done client-side.

(imported from commit 7644a5961ca48cd57f4b65c6f698083677e0a130)
 2014-01-15 16:07:20 -05:00
Tim Abbott 2ebb962114 Enable USING_RABBITMQ for all development systems. 
(imported from commit ffe5f3f8210372479051b5f1908a7efc12398ef8)
 2014-01-14 12:09:15 -05:00
Zev Benjamin ced2f86fd7 Add an IS_WORKER setting that is True when the current process is a worker 
(imported from commit f8976b8345e9c709c2336a17d18260130f3f2562)
 2014-01-14 11:47:12 -05:00
Zev Benjamin db23674749 Do query time tracking at the psycopg2 level instead of the Django level 
This allows us to track the query time of SQLAlchemy and raw queries.

(imported from commit 818a4ee41786ffc57b80d7ed1cfba075f29b6ee5)
 2014-01-14 11:47:12 -05:00
Luke Faraone 000beafc7f Add default for GOOGLE_CLIENT_ID 
(imported from commit 9ef9eea6629cf9257276e006ee8ac56d1136db9f)
 2014-01-13 16:24:21 -05:00
Steve Howell 2504baf783 Use compiled.js in dev environments. 
Make our dev setup more similar to prod by using compiled.js,
instead of AJAX-ing templates on the fly and compiling them
with non-node code.  This will make our dev environment more
consistent with prod (to avoid surprising bugs), plus it should
be faster (fewer AJAX calls).

This change also means we don't have to keep two copies
of static/third/handlebars/handlebars.js around.

(imported from commit d8d584b9aa13adcdcce7e424033610d77d2df79b)
 2014-01-10 21:39:04 -05:00
Tim Abbott 795930c803 Add channel module wrapping our various JSON requests to the server. 
(imported from commit 6489938678551ad8594822363ae6d1c9ae295496)
 2013-12-19 16:52:47 -05:00
Tim Abbott 8c6ac1288d Add a couple more IP addresses to ALLOWED_HOSTS. 
(imported from commit 472bfbb59169cea7a0730073319f262936c07185)
 2013-12-19 16:52:35 -05:00
Tim Abbott b30afe432e Return a nice JSON error when CSRF errors happen in JSON views. 
(imported from commit 916166c115f9b3ba0fdc93f8d917ff37ae22c2ae)
 2013-12-19 16:48:51 -05:00
Luke Faraone 50e8d8b69a Specify default for EMAIL_GATEWAY_EXAMPLE 
Otherwise the app would crash when it tried to build template context:

Traceback (most recent call last):
  [...]
  File ".../zerver/context_processors.py", line 23, in add_settings
    'email_gateway_example': settings.EMAIL_GATEWAY_EXAMPLE,
  File "/usr/lib/python2.7/dist-packages/django/conf/__init__.py", line 55, in __getattr__
    return getattr(self._wrapped, name)
AttributeError: 'Settings' object has no attribute 'EMAIL_GATEWAY_EXAMPLE'

(imported from commit 6cc5d3f150326a55230ea91e6c228ae9b1e19df3)
 2013-12-18 16:25:10 -05:00
Jessica McKellar 6b64ef6be3 digest: log when we enqueue emails. 
(imported from commit 1b34e05bc2eebedb818673a4c9a3944e1db15c6d)
 2013-12-17 10:47:17 -05:00
Tim Abbott 827aa0e752 logging: Add a central log file that logs all errors. 
(imported from commit a845c39be69330749475b8a8938bfb736198b953)
 2013-12-16 15:59:35 -05:00
Luke Faraone 9329109391 Specify default for EXTERNAL_URI_SCHEME 
Otherwise, build-enterprise-tarball FTBFS.

(imported from commit 14a9d9e843575e4b47a7bae5b6e618c207481fae)
 2013-12-13 18:06:19 -05:00
Jessica McKellar b6e46986f0 Remove unused message_tour.js. 
(imported from commit e25a9315377ad11d47ad78a5d466df40e306f713)
 2013-12-12 11:47:09 -05:00
Jessica McKellar ebb0d82c83 Rename Humbug to Zulip in a few lingering places. 
(imported from commit ed74de98ca01914318be10453544e9fb4fb981b4)
 2013-12-12 11:47:08 -05:00
Kevin Mehall 662edc2558 [manual] Backend support for Android GCM push notifications 
This adds a dependency on gcmclient:
http://gcm-client.readthedocs.org/en/latest/gcmclient.html

pip install gcm-client

or

apt-get install python-gcm-client

(imported from commit 9f1fbf1f793e4a27baed85c6f1aa7a7b03106a10)
 2013-12-11 15:37:48 -05:00
Tim Abbott bd68884607 Fix documentation for email gateway on Zulip Enterprise. 
(imported from commit 82e706b4e8e82df3044e5fc3df70e46b2183bc56)
 2013-12-04 16:39:39 -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 9d8adba30c settings: Add some new IP addresses to ALLOWED_HOSTS. 
(imported from commit e2794219b7393bc2513142e074b43513ba120e9c)
 2013-12-02 16:03:21 -05:00
Tim Abbott b7d13d542c Cleanup our logging paths. 
(imported from commit 2f72ee8e320a501b2e011784c005951ca341102d)
 2013-11-26 10:46:25 -05:00
Luke Faraone 567c821cc0 Define empty AUTH_LDAP_SERVER_URI so it exists when we later do a check on it 
(imported from commit 959ea2efde99f84c971ff1cd5947e3042d64ea96)
 2013-11-25 19:14:36 -05:00