e64472cd32
Rename enterprise template variable to not_enterprise.
...
The problem here is that some error-related templates render without
the context managers that we specify, and so we want the handling of
"the context was not set" to default to the enterprise case (because
the enterprise version will work basically fine on !enterprise, but
the opposite is not true because the enterprise distribution doesn't
even have the templates for certain !enterprise pages that may be
linked to).
(imported from commit 7547311d87e048d33221587f44b82fe0ba320ca1)
2013-11-13 20:10:33 -05:00
98b59f551a
Shorter stream rows
...
(imported from commit 2d5e8e73f66b5b2876c78fffc93cd71a7dc931c5)
2013-11-13 17:05:55 -08:00
11d05c1689
Our docs should not try to hire our customers' employees
...
(imported from commit aae1e6fb236b44eabcf3cf7c4e48534bea6cd731)
2013-11-13 19:57:50 -05:00
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
372984b56d
Serve sso app builds to enterprise users
...
(imported from commit a9741833c514c364c5e67fdbb31d191e1ab0f1df)
2013-11-13 18:11:49 -05:00
ca4e6a0ff8
Updates to stream list
...
(imported from commit 426a8035e9661598f9bbfa6ae83883ca3ac6106e)
2013-11-13 14:59:07 -08:00
8120382b12
Fake authenticate users if they have previously authed and settings.ONLY_SSO is set
...
(imported from commit d5f4bf400c4bdcaf8b858bd17a0082e5bc62419d)
2013-11-13 17:57:33 -05:00
4b8a770825
Don't prompt for a password if password auth is disabled
...
(imported from commit d696c9f6de2008c177fa3282383257de15aaeb29)
2013-11-13 17:57:33 -05:00
d19ffd67a7
Don't make enterprise users agree to the ToS
...
(imported from commit 2d01de949210a14edb5bef949d59a8495136ecac)
2013-11-13 17:57:32 -05:00
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
53520b85e6
Change our login links to go to the SSO login page on SSO sites.
...
(imported from commit 2bccde3846dafd3373db89f507cf63f394d6d7cf)
2013-11-13 17:54:43 -05:00
e375f11a78
Check for excluded files in tarball in case .gitattributes doesn't work
...
Because git < 1.8.1 ignores lines with trailing slashes and
1.8.1.1 - 1.8.1.6 ignore lines without!
(imported from commit 8139a742f4a52ccb1bce4e06fb24c9626fdb01f2)
2013-11-13 17:54:43 -05:00
b6751d2119
additional lowercase situations in clear_followup_emails
...
(imported from commit c0c031e7abb2a166636075596fb0d5ed21a5822c)
2013-11-13 17:53:37 -05:00
338de6715d
Fix broken html to markdown conversion on Linux.
...
(imported from commit 1b62d382e4f2b60972384a6b4b4173161ea58b73)
2013-11-13 17:47:28 -05:00
0175440afc
[manual] fixup nagios postmaster configuration
...
(imported from commit e3c00b31bbb0ced38e62d31ae80b58e8c6374c7f)
2013-11-13 17:37:54 -05:00
d610f2511f
Fix search highlighting
...
The handlebars "../" syntax is the worst.
(imported from commit eadc9fbd47e384b618c06b30ab979b1c372649ff)
2013-11-13 17:28:48 -05:00
bf991dac94
enterprise: Create feedback_bot as a bot.
...
(imported from commit 8bd985f82aa80380188a644869c55bc54b6f7977)
2013-11-13 17:26:30 -05:00
6d38285a2e
fixup supervisor oops related to postmaster config
...
(imported from commit 8b5c39f0d13abb5e1def9f88a2ab82cfa67b42f6)
2013-11-13 17:15:55 -05:00
1546d06344
upgrade-zulip-stage-2: Tweak log message
...
(imported from commit e8979fa3331119f1f039b3809f6d06fc81fd5e0e)
2013-11-13 16:57:00 -05:00
718a1a8405
upgrade-zulip-stage-2: Restart Apache when using SSO
...
(imported from commit c06be261ec4ab56551962d26cfc41590a64f49e7)
2013-11-13 16:57:00 -05:00
fdc63b48d5
Add a setting for whether we're using SSO
...
(imported from commit 76b450d9ebba2828a63f08be61a3b998a1cd7680)
2013-11-13 16:57:00 -05:00
9addde74ec
enterprise: Split upgrade-zulip in two for better future-proofing
...
(imported from commit 808d8d68a6e799aa2962eec90c0953db3c94cfa4)
2013-11-13 16:57:00 -05:00
e8c104012b
Move su_to_zulip into zulip_tools.py
...
(imported from commit 4a79f87dc396da9419a0a1cf5f5b7bb798d5b194)
2013-11-13 16:56:59 -05:00
81156cf2f5
Clean up initialize_enterprise_db and fix domain.
...
(imported from commit af6f20c7705720c0043817516fdb3c21777796bb)
2013-11-13 16:47:37 -05:00
eab6a1d190
[manual] add nagios checks for email_deliver
...
manual step: puppet apply, make sure that these nagios checks are working properly
(imported from commit abc75b8a5b153510243c14035b820fbc864b7776)
2013-11-13 16:41:36 -05:00
b134ecc102
add print_email_delivery_backlog for nagios reasons
...
(imported from commit c1c1edb8614913c7fff63e175423ee5701465223)
2013-11-13 16:41:36 -05:00
08069bf34e
[manual] Add the new deliver_email management command to the supervisor config.
...
You will have to puppet apply on both staging and prod to get this worker running.
(imported from commit 92969371220f08142f510d3415e8611dcfecd91f)
2013-11-13 16:41:36 -05:00
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
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
9e50781131
Random javascript shortenings
...
(imported from commit 68a34d67ac38e34035a3e3986518824bf5a96fc5)
2013-11-13 16:41:36 -05:00
f5fc59e3e0
email mirror: remove some TODOs enterprise users don't need to see.
...
These should live in tickets anyway.
(imported from commit 9c2a9445640278d251a99c68c0074c138b832c60)
2013-11-13 16:28:30 -05:00
3b4303598a
email mirror: use the correct API host locally.
...
In particular, EXTERNAL_HOST doesn't specify the protocol, which gets
coerced to HTTPS.
(imported from commit 53f2e8106cf33114dcdd2ad17e09b41609641e71)
2013-11-13 16:28:29 -05:00
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
8382e074fe
Move use of html2text to a subprocess call.
...
(imported from commit 36e8a6f030d75196c28fbdc0e58c6968952d95ff)
2013-11-13 16:28:29 -05:00
0b592a27b1
enterprise: Make upgrade-zulip do puppet applies and schema migrations
...
(imported from commit 6d0109e6cd6a02ed5d57b0c0b4c9dc052f158344)
2013-11-13 16:26:04 -05:00
67ed16a12e
enterprise: Make /root/zulip be a symlink to ~zulip/deployments/next
...
(imported from commit 2a0e7f99fe4517e45ad2794b7fa464df08d40db1)
2013-11-13 16:26:04 -05:00
031dfbcc46
zulip_tools.py: Add a make_deploy_path function and make it invokable from the commandline
...
(imported from commit 94578d117864fba76f9353784734c712c89c4bf2)
2013-11-13 16:26:04 -05:00
baecc950a5
enterprise: Remove dead code
...
(imported from commit ca0cdc89f72367d15cd8cfe33666a4cff80deb66)
2013-11-13 16:26:03 -05:00
8aa307f438
enterprise: Restart all Zulip processes every week
...
(imported from commit e44167023e0ad49eaf14c314a7731b93289900e6)
2013-11-13 16:26:03 -05:00
98caa8eaf1
Add option to disable error reporting
...
(imported from commit 3621aa6e7a5badd21b22891026285099db393df0)
2013-11-13 16:22:21 -05:00
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
f7f2ec0aca
[puppet] Report enterprise and prod errors to staging.
...
Errors are sent to a queue processor that posts them to staging,
just like the feedback bot.
(imported from commit 4a8d099672a1b3e48a8bc94148d8b53db73d2c64)
2013-11-13 16:22:21 -05:00
3ec7663cb2
Fix incorrect code to get the deployment name
...
(imported from commit 134ffafc4b15da77b0bb5ffc84766a3fb4099ae2)
2013-11-13 16:22:21 -05:00
1cb339a23d
Expose password-protected /enterprise/download through nginx.
...
(imported from commit 8fba915bf0d0c718138ac62bd4333aef4e845d55)
2013-11-13 16:20:43 -05:00
76e1c80ac5
Add an enterprise registration page.
...
(imported from commit 5888f588ad219ba25b235477a7137853e5954bb5)
2013-11-13 16:20:42 -05:00
5c0a624f9e
Don't notify on stream messages by default for LevelUp.
...
(imported from commit c0c21047698612dbcee5eee9e858f37a8f8e29bd)
2013-11-13 16:14:36 -05:00
c66556381a
Set the ADMINS to be the ZULIP_ADMINISTRATOR by default.
...
(imported from commit 6ff4e611bb2e145e49ea6f477d79415816372a16)
2013-11-13 15:35:45 -05:00
a16a7a028c
Fix internal postgres_common.pp.
...
We didn't remove python-argparse from the requirements when that was
removed, and we also still need python-pip to install wal-e :(.
(imported from commit b82d3b429cffe0a3993819358511e11268ee2fef)
2013-11-13 15:35:45 -05:00
c54322f76a
install: Move DROP SCHEMA PUBLIC to run in zulip database.
...
(imported from commit 1eef44e7255b8fe1314f7763ebfc6c04083305e5)
2013-11-13 15:35:45 -05:00
c842b42b12
postgres-init-db: The zulip user doesn't need CREATE DB on enterprise.
...
Also clean up the series of similar blocks.
(imported from commit fdb468bd6be3077bdbf2d72289064397ea04f27a)
2013-11-13 15:35:45 -05:00
Tim Abbott
Allen Rabinovich
Jeff Arnold
Kevin Mehall
Leo Franchi
Luke Faraone
acrefoot
Jessica McKellar
Zev Benjamin
acrefoot