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

192 Commits

Author SHA1 Message Date
Zev Benjamin 25c63f08de Use ujson instead of pickle for serializing event queues 
(imported from commit 2d90574ae97cc973c9686c2bd557cc199d4b0850)
 2013-11-20 14:25:36 -05:00
Tim Abbott d44c6636c6 Add setting to enable profiling of all requests. 
This is useful for the occasional case where we cannot figure out what
is causing a particular problem, but it can be easily reproduced on
staging.

(imported from commit 8b51184a8b686814f2c6ff103ba355538463ceb0)
 2013-11-18 18:05:19 -05:00
Tim Abbott 3a5d930ede Clean up compatability code from Django 1.6 transition. 
(imported from commit a83bd3340f5488fd687f045e2143c32f9385fa88)
 2013-11-18 13:57:01 -05:00
Kevin Mehall b78fa0857f Allow overriding the default avatar image 
(imported from commit 66d413682a822e0019f28033f19908bdd9fa0156)
 2013-11-18 11:48:53 -05:00
Kevin Mehall a63f4284f0 Allow enterprise deployments to disable the use of Gravatar. 
(imported from commit 49c14cc7629f2ffe6cedaab5d42ad5bf7f6569a4)
 2013-11-18 11:48:53 -05:00
Steve Howell 0b16dfc999 Add /json/users/<email>/reactivate endpoint. 
(imported from commit 7afa29f7718430ea2df7c489ab2af4d93d4ce497)
 2013-11-16 11:35:25 -05:00
acrefoot e77d534e78 remove ALLOW_ARBITRARY_SENDERS_LOCAL_EMAIL 
(imported from commit 7a374959516d8505685466293f146d95094a7ea7)
 2013-11-15 21:31:37 -05:00
acrefoot ccb7446d5c move Enterprise Email options into better places 
(imported from commit f205c29b224f31474e2983c7f2bdb1ee5e2c754b)
 2013-11-15 21:31:37 -05:00
Tim Abbott f941644099 Don't cache templates in development. 
(imported from commit 986df6aecb7e638eb0e017654553e812ac6e0ed2)
 2013-11-15 18:13:09 -05:00
Kevin Mehall fe0dcd4313 Disable camo on enterprise. 
CUSTOMER13 doesn't want it, and there's currently no nginx config
or configurable Camo URI, so it wouldn't work if image preview
were enabled.

(imported from commit 615d4a32acbc4d4d590f88cf4e7d45d8f49db1d3)
 2013-11-15 14:27:16 -05:00
Leo Franchi 7f2936a985 Allow enterprise customers to disable name changes 
(imported from commit 1f2039f3e88a4ec0cc48dba75f714563c1de4af8)
 2013-11-15 11:26:10 -05:00
Kevin Mehall 53c76aa657 Move enterprise-registration to zilencer/ from zerver/ 
(imported from commit d8a58913040376dbdbc9dcee13ab8a7910733da7)
 2013-11-15 11:21:52 -05:00
Tim Abbott 66bbf40b5a Simplify deployment role configuration. 
(imported from commit f9a9cf0ae33e7a74517255f944c91fa9aba14e33)
 2013-11-14 13:01:51 -05:00
acrefoot 4a74425f37 derive DEFAULT_FROM_USER from EMAIL_HOST_USER 
(imported from commit 2358f00a8eddb744392cd8f8f02cbed406e25013)
 2013-11-14 12:57:47 -05:00
Tim Abbott c24addf2d5 Build internal bots in the zulip.com domain. 
Otherwise do_create_realm can't actually send the notifications.

(imported from commit 4fa9a53f1d3d8a2e26d7b89401e7dfa77f2f7533)
 2013-11-14 11:16:16 -05:00
Tim Abbott 870ae09aae Add setting for disabling inline image preview. 
(imported from commit 2321390eb14cfe5701347861b9ae5ad6fdac0cbb)
 2013-11-14 08:47:11 -05:00
Tim Abbott 9a0ddb644d Improve the copy a bit on local_settings_template.py 
(imported from commit e9f8a87dc824b5c51178be87999e27ed79897388)
 2013-11-14 08:19:21 -05:00
Tim Abbott b2798385ac Organize local_settings_template.py a bit better. 
(imported from commit c880b1237504e81ce828ccaf58dcc383ac0231b6)
 2013-11-14 08:19:21 -05:00
Tim Abbott 042f5a3959 Improve documentation of SSO_APPEND_DOMAIN. 
(imported from commit b91893924c1f64958c361aa83bd042509c8beec6)
 2013-11-14 08:19:21 -05:00
Tim Abbott 7e64e19cc2 settings: Set ONLY_SSO to False when not enabled. 
(imported from commit fcfe8462aae70dbdff55d245cfd5a6b723cd8378)
 2013-11-14 08:19:20 -05:00
Kevin Mehall 15da532faf Don't include metrics.js on enterprise builds. 
It throws an exception when the mixpanel library is not present. This
exception breaks emoji autocomplete, among other things.

(imported from commit 6ae2a69d40282701b8717b60d887836416c85a6c)
 2013-11-13 18:35:12 -05:00
Luke Faraone 79bbb9b0d0 Add settings.ONLY_SSO which will be true if no other auth sources are enabled 
(imported from commit 608cc32754ef8e4925995564b5e05a8ff9fd94c5)
 2013-11-13 17:57:32 -05:00
Zev Benjamin fdc63b48d5 Add a setting for whether we're using SSO 
(imported from commit 76b450d9ebba2828a63f08be61a3b998a1cd7680)
 2013-11-13 16:57:00 -05:00
acrefoot f5199081d5 Add the deliver_email management command 
This command should be run continuously via supervisor. It periodically
checks for new email messages to send, and then sends them. This is for
sending email that you've queued via the Email table, instead of mandrill
(as is the case for our localserver/development deploys).

(imported from commit a2295e97b70a54ba99d145d79333ec76b050b291)
 2013-11-13 16:41:36 -05:00
acrefoot f7b5a10da0 [schema] Add ScheduledJob table, and update mandrill related code 
ScheduledJobs with type Email displace the usual mandrill codepaths
in the Zulip Enterprise deploys

* Email-specific helper functions will appear in deliver_email.py
* 0058_auto__add_scheduledjob.py

(imported from commit 8db08d8a279600322acfdbed792dc1a676f7a0ab)
 2013-11-13 16:41:36 -05:00
Jessica McKellar b69cc46be6 Add back the ability to do local email mirror testing against the Test folder. 
(imported from commit 01f1f58bb365a9827f25329446f4b2c2666fb92a)
 2013-11-13 16:28:29 -05:00
Kevin Mehall 98caa8eaf1 Add option to disable error reporting 
(imported from commit 3621aa6e7a5badd21b22891026285099db393df0)
 2013-11-13 16:22:21 -05:00
Kevin Mehall 08cc6378af Remove old email error reporting handler 
Broken out into an independent commit for easy revert if necessary.

(imported from commit d83619c431a0e656f2e644d1eccb156a63c2169c)
 2013-11-13 16:22:21 -05:00
Jessica McKellar 76e1c80ac5 Add an enterprise registration page. 
(imported from commit 5888f588ad219ba25b235477a7137853e5954bb5)
 2013-11-13 16:20:42 -05:00
Tim Abbott c66556381a Set the ADMINS to be the ZULIP_ADMINISTRATOR by default. 
(imported from commit 6ff4e611bb2e145e49ea6f477d79415816372a16)
 2013-11-13 15:35:45 -05:00
Steve Howell 2238807e59 Add /avatar/<email> URL. 
The /avatar/<email> URL redirects to the appropriate
avatar URL for an email, whether it's hosted by Gravatar
or Zulip.  (This will work even for external users, as
it falls through to Gravatar.)

(imported from commit 7e6f226659cb2e5a7f6426da0be8aa9bae9cff14)
 2013-11-13 13:45:08 -05:00
Tim Abbott 7d61a57822 Change HOME_NOT_LOGGED_IN if SSO is the only auth enabled. 
(imported from commit a6b41a83d53ac1a87547f005c26ea970fe7508f6)
 2013-11-13 12:07:15 -05:00
Tim Abbott 2fff9f94ab Fix example configuration for ZulipRemoteUserBackend. 
(imported from commit 9f78901d24fc88dc149af5d4db23b24e9b9859fd)
 2013-11-13 12:07:15 -05:00
Tim Abbott 729f7460d4 Reorganize local_settings_template to put mandatory fields near top. 
(imported from commit b5d447962a5e7c008e9aba44388f244359520fb4)
 2013-11-13 12:02:50 -05:00
Tim Abbott 6bcd5a7ffc Update installation instructions to include configuring the app. 
(imported from commit 89395815c32416ec0636efcff12eb76f5d890bbd)
 2013-11-13 12:02:50 -05:00
Tim Abbott 939cd864eb Fix postgres configuration to use local socket. 
(imported from commit 1835e712b2fe4578cf6381891844bb3abe2b767e)
 2013-11-13 12:02:50 -05:00
Luke Faraone a7237938c8 Set FEEDBACK_TARGET for enterprise case. 
(imported from commit 478033bf3eefb8406d93fb2f0225420812dee7b0)
 2013-11-13 12:02:49 -05:00
Tim Abbott cb9931110f Automatically configure EMAIL_GATEWAY_BOT as a superuser. 
(imported from commit 1e74ae458e446edec59eb1ab238cede969c4dbbc)
 2013-11-13 12:02:49 -05:00
Tim Abbott e18a08c69e settings: Move hardcoded API super users into local_settings.py. 
(imported from commit fea7550a771c837db0fb948238488f778bedf73a)
 2013-11-13 12:02:49 -05:00
Leo Franchi 300cceb3e4 Create feedback bot in enterprise installs 
(imported from commit 0c0a6919bd29e12484d520f80789b39b203099b0)
 2013-11-13 11:18:03 -05:00
Leo Franchi 6274c33f86 Allow disabling of feedback system in UI 
(imported from commit ce16b2916784e9cf10a230cb47515ffc65888778)
 2013-11-13 11:18:02 -05:00
Leo Franchi 306ce65ea3 Only create initial passwords for local dev setups 
(imported from commit 2ef33ebbab0fe21486acbb1a3a78ed434abac2db)
 2013-11-12 22:42:05 -05:00
Luke Faraone 20dcc2e036 Import zerver.models in wsgi.py 
Because import_module does not correctly handle safe circular imports we
need to import zerver.models first before the middleware tries to import it.

(imported from commit 1afebd8c950c44c8d136b0b63a09319ccef02555)
 2013-11-12 19:18:35 -05:00
Tim Abbott 3dadb5b76a Update comments to rename Local Server => Enterprise. 
(imported from commit 82bf89aa1148a78ce11ead203a0bc16243d1fca8)
 2013-11-12 15:57:02 -05:00
Tim Abbott 966fde261a puppet: Rename local_server => enterprise. 
(imported from commit 5faa269df5937f6db99098e44aaea7d0a4f2c14a)
 2013-11-12 15:57:02 -05:00
Tim Abbott 5293cdebe8 Rename LOCAL_SERVER to ENTERPRISE. 
(imported from commit 7edf353eefe6c9e7aac74b7bbc37b923cac1b913)
 2013-11-12 15:57:01 -05:00
Tim Abbott 5d5e662c08 Disable event logs on local server. 
(imported from commit eafbd645ae7ce8d868de2fb8c6548325a05b1340)
 2013-11-12 15:57:01 -05:00
Kevin Mehall e6ca5d265d Include handlebars templates in build-local-server-tarball 
update-prod-static needs DEBUG=False. This also replaces our
local_settings.py before generating anything included in the tarball.

(imported from commit 890cd9d1a44acfd2c20e1662e0c68132c633d1b3)
 2013-11-12 15:50:07 -05:00
Zev Benjamin 32ed5f9f42 Move flushing the display recipient cache to its own middleware 
(imported from commit 27a6935a5830ef986b18de169d66dd86d273d064)
 2013-11-12 15:24:30 -05:00
Leo Franchi ffbadf61df Restore original desktop_home redirect 
Without it, a reverse lookup on zerver.views.home would return /desktop_home

(imported from commit 037bd532162441ca070bcb90a86d372048518cd4)
 2013-11-12 15:02:18 -05:00