be3257de62
Add sso sparkle paths and files
...
(imported from commit f8a953f4262b170931792ed223f1ddc29c5fe5ed)
2013-11-14 10:22:35 -05:00
9a6f34a807
Make generate_enterprise_secrets.py work regardless of path.
...
(imported from commit c1ab8231fbe907a32b18c02a00cee51011abbb21)
2013-11-14 09:10:10 -05:00
037460b24c
Fix permissions on install script.
...
(imported from commit af71b3a4988059c58e741bf94d0c28383c08f704)
2013-11-14 08:56:06 -05:00
870ae09aae
Add setting for disabling inline image preview.
...
(imported from commit 2321390eb14cfe5701347861b9ae5ad6fdac0cbb)
2013-11-14 08:47:11 -05:00
f9707dd903
Clean up scripts/ by moving helper tools into lib/.
...
(imported from commit 31a99d5cc68524a1399daa50eb1fcda54383a317)
2013-11-14 08:47:11 -05:00
9a0ddb644d
Improve the copy a bit on local_settings_template.py
...
(imported from commit e9f8a87dc824b5c51178be87999e27ed79897388)
2013-11-14 08:19:21 -05:00
b2798385ac
Organize local_settings_template.py a bit better.
...
(imported from commit c880b1237504e81ce828ccaf58dcc383ac0231b6)
2013-11-14 08:19:21 -05:00
042f5a3959
Improve documentation of SSO_APPEND_DOMAIN.
...
(imported from commit b91893924c1f64958c361aa83bd042509c8beec6)
2013-11-14 08:19:21 -05:00
486fcfa53f
README
...
(imported from commit c02dfbd15ab6bac5a450d04075b15a7c44e8ddfe)
2013-11-14 08:19:20 -05:00
bd607a32e6
unpack-zulip: Update for zulip-server paths containing versions.
...
(imported from commit 9318cab0cfcdf57412afbe9386371c8f9994da9f)
2013-11-14 08:19:20 -05:00
7e64e19cc2
settings: Set ONLY_SSO to False when not enabled.
...
(imported from commit fcfe8462aae70dbdff55d245cfd5a6b723cd8378)
2013-11-14 08:19:20 -05:00
be99b4438c
Don't send stream invite notifications to bots.
...
(imported from commit b45ef40b056f451c5085e5fb2afec4bbb68fa3f5)
2013-11-14 08:19:20 -05:00
87a6838e0e
enterprise: Log the output of upgrade-zulip and install scripts
...
We may eventually want to rotate the log files, but this seems good
enough for now.
(imported from commit 9a54fa6b40bc62f68e52ef552c1a676856b21829)
2013-11-14 08:08:59 -05:00
7940f7725c
create_deployment: Actually print out the new deployment's info.
...
(imported from commit b42c71c17c0d1461ec759cc2dfc95a7c194fb74a)
2013-11-13 21:56:48 -05:00
f9ab464c82
puppet: Fix owner/group for our puppet.conf file.
...
(imported from commit c91dcd07646482d380cd36df1a0002a5d8d76241)
2013-11-13 21:47:22 -05:00
498cce8ef9
puppet-apt: Fix missing owner/group for created files.
...
(imported from commit a435f90593788034421d4817386215bc14e83d01)
2013-11-13 21:47:14 -05:00
af2da58fd0
Set default default streams for enterprise installations.
...
(imported from commit 87b9fdc6ef19a88a2abda4ba5cdfe2a5b35d581d)
2013-11-13 21:42:21 -05:00
4078b8bb6c
Move set_default_streams from zilencer to zerver.
...
We'll want to use it for setting up local server instances.
(imported from commit 47c60c349ba3cebad58506f439013def4c40708b)
2013-11-13 21:08:14 -05:00
90c011e632
Fix rebase issues in the not_enterprise transition.
...
(imported from commit f0a8169825de303c60e5dba5cd95eef96cd7de7e)
2013-11-13 21:04:43 -05:00
34582d8e0a
enterprise: disable feedback button in gear menu
...
(imported from commit 78d50979366b20ad4cfe708dd5b360746b09c861)
2013-11-13 20:40:39 -05:00
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
Leo Franchi
Tim Abbott
Zev Benjamin
acrefoot
Allen Rabinovich
Jeff Arnold
Kevin Mehall
Luke Faraone
Jessica McKellar
acrefoot