5f655088ef
Fix ~/.gitattributes syntax.
...
For git that's not between version 1.8.1.1 and 1.8.1.6, the previous
version did not actually exclude those things from the tarballs on
some git versions, due to changes in the syntax for that file that
were made in 1.8.1.1 and reverted in 1.8.1.6.
Kevin's also adding a check that we're not including any of the files
intended to be excluded here.
(imported from commit 503ec24ed8db4cc32c29bdf5a361e5013a02b995)
2013-11-12 19:34:30 -05:00
aac6ee308d
puppet: apache configuration for an example SSO instance.
...
(imported from commit 0aa6c80e206a70efd481d710aa2a6c2431c662f3)
2013-11-12 19:18:35 -05:00
dcb4487c56
puppet: generic localhost SSO manifest
...
(imported from commit 9398800ba7e26390d1bd6f691f39a45d2740870f)
2013-11-12 19:18:35 -05:00
61ce8ccd95
puppet: Add app.d configuration for a separate authentication server
...
(imported from commit 9f564bb513292e446ee4f7498ebeca5d167e5037)
2013-11-12 19:18:35 -05:00
950300d20f
puppet: Include /etc/nginx/zulip-include/app.d/ configuration if defined
...
Some sites may want to have small modifications to the base app config. This
directory helps support that, but does not need to exist if it is unused.
(imported from commit d23b19dc59bb56d00e69ff03af3279b66af9466d)
2013-11-12 19:18:35 -05:00
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
046c2927ab
Redirect to / instead of the login page on successful login.
...
(imported from commit 9bb61dc48861c580baf170dbdbdc2564e177e8a5)
2013-11-12 19:18:35 -05:00
74b6a940e8
Actually log the user in when they authenticate via SSO
...
(imported from commit aa33e8781d08f7a2793a3738e44e09701122e10c)
2013-11-12 19:18:35 -05:00
fafa14db9a
Patch out references to zilencer so the app runs without it on ENTERPRISE
...
(imported from commit bd4fe1ff47e1b4dc9038f800ee8aa2980bd00fdf)
2013-11-12 18:43:06 -05:00
cf96cc478f
freshdesk: use their authentication fields intead of auth in the URL.
...
(imported from commit 7413db16cd9c5e76e287c32950ab97e8a4503efa)
2013-11-12 17:17:16 -05:00
cb11780ded
Remove whitespace from message template to make tests pass.
...
(imported from commit f577bae7651aab096e35ff9cb384a17fdc10fd97)
2013-11-12 16:47:32 -05:00
cf8cf1fe03
socket: Fix non-rabbitmq codepath
...
(imported from commit 3ccdcbfb3283fc57ca502878e9c8d6068e7bce40)
2013-11-12 16:42:15 -05:00
c7d9bf41bc
Rename SSL certificates for Zulip Enterprise.
...
(imported from commit 4f15f2aee2bcc7450953488c94e8b88734aeaff7)
2013-11-12 15:57:42 -05:00
270f5730fa
Rename local server => enterprise in some scripts.
...
(imported from commit 98cdb4c2e1be5a6abb59821eb32f749c058b773b)
2013-11-12 15:57:42 -05:00
3dadb5b76a
Update comments to rename Local Server => Enterprise.
...
(imported from commit 82bf89aa1148a78ce11ead203a0bc16243d1fca8)
2013-11-12 15:57:02 -05:00
966fde261a
puppet: Rename local_server => enterprise.
...
(imported from commit 5faa269df5937f6db99098e44aaea7d0a4f2c14a)
2013-11-12 15:57:02 -05:00
21f1058fd2
Rename local_server=>enterprise in DB initialization script.
...
(imported from commit 76e26f43858e3baa6ed1b38d67973ed41acf04f3)
2013-11-12 15:57:02 -05:00
5293cdebe8
Rename LOCAL_SERVER to ENTERPRISE.
...
(imported from commit 7edf353eefe6c9e7aac74b7bbc37b923cac1b913)
2013-11-12 15:57:01 -05:00
b461e3c10e
Add a README file documenting the installation process for local server.
...
(imported from commit 4fb149a39acb4dda7ee0d2f038212534f410e064)
2013-11-12 15:57:01 -05:00
5d5e662c08
Disable event logs on local server.
...
(imported from commit eafbd645ae7ce8d868de2fb8c6548325a05b1340)
2013-11-12 15:57:01 -05:00
57b5231063
install: Script the install process more fully.
...
We can probably later merge the create-database code with that of our
internal do-destroy-rebuild-database.
(imported from commit 323932dbf2eb916545d6ebdda70eb1f5e1abb181)
2013-11-12 15:57:01 -05:00
2e41515cc3
localserver: Make the zulip user own supervisor.sock.
...
We really should fix this in supervisor itself, since in particular we
lose this setting every time the system is rebooted.
(imported from commit a700078b158808340f5f30812235449c74508cde)
2013-11-12 15:57:01 -05:00
1354d522cc
puppet: Require postgres being installed before installing our config.
...
(imported from commit c871792d78de368f922586124725edfa6725246e)
2013-11-12 15:57:01 -05:00
a593a798f8
Move send_stats management command back to zerver/
...
It's not analytics, and it's needed for restart-server.
(imported from commit 979fa15715ea437cbbc5d986c859ee4d6c668da8)
2013-11-12 15:50:08 -05:00
9b6c99c7af
Copy localserver prod-static instead of linking so old files are retained.
...
(imported from commit 728cce9f1b3a47d62f2856a509ed65a3ac6bd451)
2013-11-12 15:50:08 -05:00
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
d0b81f6b2e
build-local-server-tarball: Add prod-static to a clean git archive tarball
...
This avoids exporting .pyc files and any other junk left behind by the
build process.
(imported from commit 8bdb9de3867b10eb5be9f52b784aa906c5f19d23)
2013-11-12 15:50:07 -05:00
3f0fa363f9
Add explanatory comment
...
Leo and I were looking over this code and I couldn't remember what it
was doing. So after I re-derived its purpose, we figured that an
explanatory comment was in order.
(imported from commit ce984362e2b504b40f3d3586777bd73691ad5ea7)
2013-11-12 15:32:09 -05:00
673f497a6f
socket: Only deregister connections that have been registered
...
(imported from commit bfaed299a129bac1e901883f5c6e3339f5a8b688)
2013-11-12 15:24:30 -05:00
eec195f421
socket: Use our full logging infrastructure
...
We also now separate out the times for the socket overhead, the
request service time, and the queuing delays.
(imported from commit e1683f7f28b968b86ebb701b0ac29b00ac6d67c3)
2013-11-12 15:24:30 -05:00
6ff8ff0f3f
Make all the work of the logging middleware not depend on Request or Response objects
...
(imported from commit ce13909d338230a931cb09405d54bb872b2ff0a6)
2013-11-12 15:24:30 -05:00
32ed5f9f42
Move flushing the display recipient cache to its own middleware
...
(imported from commit 27a6935a5830ef986b18de169d66dd86d273d064)
2013-11-12 15:24:30 -05:00
53ec292022
Store logging data in a dict instead of individual attributes
...
(imported from commit f7d76670428d5d8298c572a23cbfffc1d9695f23)
2013-11-12 15:24:30 -05:00
279b52b0f8
socket: Don't generate an error for duplicate responses
...
(imported from commit abb789f9a3ab97160420bee5955a9033142c31f4)
2013-11-12 15:24:30 -05:00
24ee4a5d57
socket: Build a real Request object to send through our full stack, including middleware
...
One quirk here is that the Request object is built in the
message_sender worker, not Tornado. This means that the request time
only counts time taken for the actual sending and does not account
for socket overhead. For this reason, I've left the fake logging in
for now so we can compare the two times.
(imported from commit b0c60a3017527a328cadf11ba68166e59cf23ddf)
2013-11-12 15:24:29 -05:00
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
632ec1db47
Don't bold sender status when you use /me.
...
(imported from commit a88628bb5354f4be3db31e161e744d349e15c570)
2013-11-12 14:36:52 -05:00
d877ec0e7f
Add enterprise terms
...
(imported from commit e8e9600797bea6e5c2f6fcd06dccebe69721034e)
2013-11-12 10:49:29 -05:00
56c39728ba
Support /me syntax.
...
If a user types "/me runs to the store", we put "runs to the store"
in bold after their name.
(imported from commit fbc11e99244e1c8fa1c03e4753e706957fcd449e)
2013-11-12 10:49:10 -05:00
0d27d88a49
Put Django cookie expiry options in local_settings_template.py
...
(imported from commit 1e24f4c326cef1333a8d9706528324f6be1cd32a)
2013-11-12 10:37:33 -05:00
59757b37e2
Get user API key without password when SSO is the only login option
...
(imported from commit 195ff68cc54cd2e7d200702c699bb3a258d3e868)
2013-11-12 10:37:33 -05:00
4a6b7cb20b
Disable password change when SSO is the only login option
...
(imported from commit fd1a14237e2d6ea574331ed178bfc0db5beb18c6)
2013-11-12 10:37:33 -05:00
cc2d17d7c0
Allow omission of EMAIL_GATEWAY_BOT and stream emails
...
(imported from commit 51412d2a46bbacd6537ef892e7b6bdf33ac94079)
2013-11-12 10:32:34 -05:00
ab874ddc84
Document our Freshdesk integration.
...
(imported from commit 1a098c410ca9c7fcca60f6293f3868e6bbae97f2)
2013-11-12 10:24:26 -05:00
59117f0e03
Display Freshdesk's inline images in notifications.
...
(imported from commit b40de8282ac26e7b77e6d9de439b521bbe7adbe2)
2013-11-12 10:24:26 -05:00
30151eff92
Add tests for the Freshdesk webhook.
...
(imported from commit 5b745ef1a590812d4b3c1adbba7d43d25983c4ad)
2013-11-12 10:24:26 -05:00
3adb9c6d80
Add a basic Freshdesk webhook.
...
The Freshdesk API is bonkers, but we do the best we can with it to
support notifications on ticket creation and ticket updates.
(imported from commit 2023622b274ef83f4e1544d0df286fe2e68581b3)
2013-11-12 10:24:26 -05:00
676b14fb15
test_settings: Don't hardcode LOCAL_DATABASE_PASSWORD.
...
(imported from commit 5bf4ae48d490fafbc8e2ae7f63783473b3a4e8a9)
2013-11-12 09:38:43 -05:00
03bf4ba423
postgres-init-db: Don't hardcode LOCAL_DATABASE_PASSWORD.
...
(imported from commit e2cf6c6c0abb688c77661e4849e7b574b4222e68)
2013-11-12 09:38:43 -05:00
2bc4e14a72
zephyr_mirror: Update maximum length of stream names when syncing.
...
(imported from commit 6ab7f5ae47c9dfe9edf411e73ac9e5ab22d375a7)
2013-11-12 09:38:43 -05:00
Tim Abbott
Luke Faraone
Jessica McKellar
Steve Howell
Zev Benjamin
Kevin Mehall
Leo Franchi
Waseem Daher
Jeff Arnold