c3d176a480
Move marketing pages to corporate app.
...
(imported from commit 70528b544ceb4be12fb02be32889e1b9ca8caeb4)
2013-11-06 12:07:32 -05:00
6193f60d45
Move static MIT-related pages to corporate app.
...
(imported from commit e2c5f72d3f3e4d8f8fa888326b2ba455beb9156c)
2013-11-06 12:07:31 -05:00
a827d727cc
Create non-localserver "corporate" app with jobs pages.
...
The corporate "app" is not a full-fledged Django app, but it has
a urls.py and a templates directory. This commit creates the app
and moves the jobs pages into it. Localserver deployments will
not see any of the corporate code.
(imported from commit 35889c3cf92329258c30741fdfa564769a4fac1a)
2013-11-06 12:07:31 -05:00
d51ac058e2
alert words: add multi-word and non-ascii words to tests.
...
(imported from commit 9c9c7b6ec255970e7e396cf6185af07c7677753c)
2013-11-06 11:43:35 -05:00
fdb5863687
Allow alert words to be multi-word.
...
(imported from commit ccf8a387a25d079cf43ed335f6dc9debd70db75d)
2013-11-06 11:43:34 -05:00
8dd4bf8f00
[puppet] Log endtoend send time on a per-realm basis as well as aggregate
...
(imported from commit 07226b20081d203af1f52776475228d9b6783869)
2013-11-06 11:25:00 -05:00
74d1a56c68
Do not notify on stream messages by default for CUSTOMER19.
...
(imported from commit 7f737b9068ec39fc53678aa5c0976d3da908ce00)
2013-11-06 10:40:28 -05:00
3daca0ca9c
Fix rebasing errors that rightfully made the linter sad
...
(imported from commit fbed798c7d752ea2b058aeebb5ae31a620684a3a)
2013-11-05 17:52:53 -05:00
980dc8345a
Strip unicode chars from statsd path
...
(imported from commit 1c5829be7f89ad1e26be52b416a51da63e2a94cf)
2013-11-05 17:47:15 -05:00
1271ca0f45
Add a simple pair of tools for blocking and unblocking deployments
...
The main use-case here is for ensuring that we don't deploy to master
while doing demos.
(imported from commit d3c8ba502052b352291548200032f39e0743b774)
2013-11-05 17:13:45 -05:00
b2ea2dca81
puppet: Add the stats1 cert (was missing from git).
...
(imported from commit 909c70089f95a08cf62656432e09df170b322aaa)
2013-11-05 17:06:33 -05:00
41fcfcb11c
puppet: Require pgtune for pgtune rule.
...
(imported from commit 824bd42e9262b47eb2235c379be661a2d77a3b76)
2013-11-05 17:06:33 -05:00
7f0eb71d9b
Don't include local_settings.py in local server tarballs.
...
(imported from commit 5d893375de87f878d270bf8dc3270c7fcd3b25af)
2013-11-05 17:06:33 -05:00
f8cc8388ec
puppet: Move nodejs into app_frontend.pp.
...
It's needed for camo and update-prod-static.
(imported from commit ae121f168f735abef002c6143b57c961e5d20429)
2013-11-05 17:06:32 -05:00
b5979a3fed
[manual]: Rename zulip-internal puppet module to zulip_internal.
...
(imported from commit 64ac7ec0f3495b1fe7810da3d4d41263c52b9b3b)
2013-11-05 17:06:32 -05:00
9089cda01c
puppet: Move some directory declarations into app_frontend.pp
...
(imported from commit c54f758a5aa7d7d788728c90789b9714d7fa665d)
2013-11-05 17:06:32 -05:00
9ec4de2e8c
puppet: Fix path to postgres configuration template.
...
(imported from commit 3a2e677366fb872884635c4ce3e95402196641cc)
2013-11-05 17:06:32 -05:00
dd12f51ea2
puppet: Use safepackage hack to avoid conflicting package declarations.
...
(imported from commit 2ea597a209ea5b2acaf61184ae9bf62a8507018e)
2013-11-05 17:06:32 -05:00
b10f387558
Rename puppet modules for _/- consistency.
...
(imported from commit 16f139f59af3313a5868c0a7b6d9911b59e40266)
2013-11-05 17:06:32 -05:00
c38bad0b65
zulip-puppet-apply: Fix the force option handling.
...
(imported from commit e3a0f3902ac183c7c30ba0e8ed27e7bd9924ff2b)
2013-11-05 17:06:31 -05:00
6b9ebfdad5
localserver: Fix leftover code in install script.
...
This should have been removed when forking from our internal install
script.
(imported from commit cb0c0790ba8343d62ef5f5171b219c458a16e906)
2013-11-05 17:06:31 -05:00
6fea6a7856
Make our install script executable.
...
(imported from commit 26be3f76b2654701b7361f2b369e9b82eeeda54e)
2013-11-05 17:06:31 -05:00
00e72cd97d
Switch url parameter to full_name from service-specific gafyd_name
...
(imported from commit 21541da29d2846cfd912d19b73e239e96606f9e5)
2013-11-05 16:17:06 -05:00
c11b65590b
SSO / REMOTE_USER support
...
(imported from commit 4f4fad7af5d3c6099cac95d7708338c182626d72)
2013-11-05 16:14:13 -05:00
b4ad8d2a5a
Factor out Google Apps user-not-registered logic
...
(imported from commit ba1d9da60df01f063cbfc0374130b655b7555b4a)
2013-11-05 16:14:13 -05:00
a34731ed00
Factor out get_user in zproject/backends.py
...
(imported from commit d60b5440722ed596ffbcb81086b2f62d535288dd)
2013-11-05 16:14:13 -05:00
547442bd9e
puppet: Build an unstable chroot on build0
...
(imported from commit ee3751379efe473aecdd8907d4ed02a98a77813b)
2013-11-05 15:56:10 -05:00
83c8f25ac6
Move activity report templates to zilencer.
...
(imported from commit b546ae89d8ab0ba679672fc3f6b7ef09d0e86d1b)
2013-11-05 15:41:03 -05:00
5ff6bc7330
Move activity reports to zilencer.
...
This commit moves the view code and the URLs. It doesn't touch
the templates yet.
(imported from commit dbef5eafe4956b29154c1134c05aa586c9e417b2)
2013-11-05 15:41:03 -05:00
4fb4e04501
Add activity.full_huddle_name().
...
(imported from commit 304e47ac88d7497fcde49f448912a2e063dd0bd1)
2013-11-05 15:34:29 -05:00
e628efff6c
Fix people_dict in activity.js tests.
...
The simulated people_dict in the activity.js test was not
matching the production code, and going forward, we'll want to
share the people_dict setup for all of our tests.
(imported from commit fc21a02216b9422130b9fe9c11bcf80590612844)
2013-11-05 15:34:28 -05:00
6d511486cb
Add activity.process_loaded_messages() and get_huddles().
...
Activity.js now has the capability to track huddles that
come through in loaded messages and return them in reverse
chronological order by their most recent message. Right
now this only connected to a unit test, not any production
code.
(imported from commit 59957086fa2e454e5711472df091f178217aed2b)
2013-11-05 15:34:28 -05:00
a4ff7320fb
Remove unused presence_description "away" entry.
...
(imported from commit 46f377399335ca9757ee52ecd21d6679b52635ed)
2013-11-05 15:34:28 -05:00
617b0a95d2
Short circuit MIT case earlier in update_users().
...
This can be squashed with the prior commit, which inlined this
MIT check into update_users() while trying to avoid other
complications. After inlining the code, it's clear that we
don't need to call the sort_users() line of code for MIT users,
so I moved the MIT guard condition up.
(imported from commit fa5b52e14964ad595b34d40ce6c8450ea93726c5)
2013-11-05 15:34:27 -05:00
7f3115fa53
Move set_presence_list from ui.js to activity.js.
...
Since ui.set_presence_list is only called from activity.js, I am
inlining the code into activity.update_users(). This also allows
us to move ui.presence_descriptions into activity.js, which
is the right home for presence-related things.
(imported from commit 0ff239275c544a86c14d517bc386d06726b81cd9)
2013-11-05 15:34:27 -05:00
82fd0f2b52
Rename user_info -> presence_info inside activity.js.
...
The user_info var was mapping users to presence information, and
presence_info is a better name for it. This change is partly tactical,
as it sets us up to inline ui.set_presence_list, which receives
user_list as presence_list and then has a completely different
variable called user_info.
By doing this pre-factoring, the next commit becomes just a pure
code move without more moving parts of renaming variables.
(imported from commit 4b015d19886b43d24905124eb37cd9dd317aa87b)
2013-11-05 15:34:26 -05:00
e82f11ed46
Fix a JS error introduced by the debug logging.
...
Narrow.activate was called without an options object in one
obscure location. I'm not sure how it's actually triggered,
since all searches seem to go through the typeahead path with
the "Search for x" option, but someone managed to do it.
(imported from commit 5e0e1bbe7570e5f6a654949547dc164e01125efa)
2013-11-05 15:07:24 -05:00
e06722657a
[manual] Remove /messages/latest API and related legacy code.
...
This requires doing a puppet apply on our servers to take effect
properly.
(imported from commit 19dc56f071f07a5d2571eef49dd835121b2e82b6)
2013-11-05 14:19:40 -05:00
ae8648b07f
puppet: Fix misc puppet bugs
...
(imported from commit b8bff5de95e8310d19e1b176c88f79b4f22afe6a)
2013-11-05 14:15:22 -05:00
042ab1a68d
puppet: Add postgresql.conf for local servers and tune it during puppet apply
...
(imported from commit 0c29da5c6340f80ae425468c2207c49ed8278479)
2013-11-05 14:15:22 -05:00
6c8884dbb9
puppet: Make zulip::local_server use zuilp::postgres_appdb
...
(imported from commit 23eac4233996d3515b48e972a1e98e43e1dd4bf0)
2013-11-05 14:14:53 -05:00
2afdb4b11e
puppet: Move public portions of Postgres puppet config to the zulip module
...
(imported from commit 25cb2e386e16b5c12f8efa26aa029215e29099f2)
2013-11-05 14:14:19 -05:00
b3e6d49d2f
puppet: Switch puppet to using include-style class declarations
...
This allows us to declare classes more than once, which we need as
we're making our class dependency graph more complicated. See
http://docs.puppetlabs.com/puppet/2.7/reference/lang_classes.html#aside-history-the-future-and-best-practices
(imported from commit d4199b0df0d92d166fbc3559957f67ee9cf2ecdc)
2013-11-05 14:14:19 -05:00
0073014ea9
Remove redundant EXTERNAL_HOST settings
...
(imported from commit dcf9709bc5c2a2c3f00410fd1b2849d3ab879fb9)
2013-11-05 14:14:19 -05:00
787215d743
[manual] Switch over to new /etc/zulip/zulip.conf config file
...
Run the following commands as root before deploying this branch:
# /root/zulip/tools/migrate-server-config
# rm /etc/zulip/machinetype /etc/zulip/server /etc/zulip/local /etc/humbug-machinetype /etc/humbug-server /etc/humbug-local
(imported from commit aa7dcc50d2f4792ce33834f14761e76512fca252)
2013-11-05 14:14:19 -05:00
e9bd56b5a0
Make topic edits propagate by default from message header form
...
(imported from commit 6adcce6ebf90b35e84316e9f079de4010a635f8b)
2013-11-05 12:46:59 -05:00
2551968966
Log end-to-end send time to statsd
...
(imported from commit 5a085b2cc72eaa69ca5dd704e3b33df895144b95)
2013-11-05 11:47:48 -05:00
7794373db6
Include 10.7+ info in mac app page, as well as link to 10.6-compatible version
...
(imported from commit 7af1f3709188baf2e388548783210ff1cab594be)
2013-11-05 11:29:31 -05:00
d0722b6962
Remove dead code related to /activity.
...
(imported from commit ebec4ddb8727c16dc04ebd32829389e5594d49f5)
2013-11-05 11:00:59 -05:00
c2f2987222
Link to newer realm report from /activity.
...
(imported from commit a52dab0532748b46d21157c49d758c389cafef86)
2013-11-05 10:46:42 -05:00
Steve Howell
Jessica McKellar
Leo Franchi
Luke Faraone
Zev Benjamin
Tim Abbott
Kevin Mehall
acrefoot