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

9562 Commits

Author SHA1 Message Date
Tim Abbott 29ed28af00 Fix ZulipRemoteUserBackend for activating mirror dummies. 
If you're using e.g. our Jabber<=>Zulip mirroring capability along
with the RemoteUser SSO integration, previously it would fail if a
user with a corresponding dummy user tried to login/signup (since they
didn't have an account but one wouldn't be created because
ZulipRemoteUserBackend was reporting that an account already existed).

(imported from commit 006eaa9afa8feedddd860c2bef41e604285228a7)
 2015-08-18 11:28:36 -07:00
David Roe 81d0f7c172 Switch copyright clause on signup page to link to /hello. 
(imported from commit 77b711acf017a3b17da8fe4e167f2f9263e6cf19)
 2015-08-18 10:52:28 -07:00
David Roe 147304c676 Remove +Dropbox from login logo 
(imported from commit f4f811ae33122d5fd2f226ec45f2ca7bd759a148)
 2015-08-18 10:52:09 -07:00
Reid Barton 9c310c6cdd Update review email address 
(imported from commit 2642b9fb91ab4ca0445063bccc0d46738adb64eb)
 2015-08-17 15:24:33 -07:00
Luke Faraone c6ca60d6dc quick fixes to provision.py 
(imported from commit c2726fee7634498b627dae99a7a87f76f5bc83fd)
 2015-08-17 11:15:21 -07:00
Luke Faraone 01d3c0c6aa Update docs for OS X 
(imported from commit 1fb3219f6531a18bf8f8a1ad93568a2c1689854a)
 2015-08-17 11:15:03 -07:00
Luke Faraone f38aa4ca39 Increase memory for VM 
(imported from commit 1f3976bff1526483c5f7f791fbe66ee3dcbb7980)
 2015-08-17 11:14:52 -07:00
Luke Faraone dd71771a82 Fix syntax error in Vagrantfile 
(imported from commit 68366c2be0a0d08e332934100ef03570e9e20df4)
 2015-08-17 10:18:40 -07:00
Luke Faraone e8ea761fbe Initial attempt at Vagrantization 
This is slightly hacky; it doesn't support as many arches as I'd like, but it works.

(imported from commit 5993014b0518d6d6dd2856fbf73180830e934b5f)
 2015-08-17 09:45:51 -07:00
Luke Faraone 4702d8e9b3 Fix broken shebang in postgres-init-test-db 
This was causing failures when execing outside of a shell

(imported from commit b63f8269d121b2bb8be5bcd84b3f868c9bedc9cd)
 2015-08-16 21:36:36 -07:00
Luke Faraone f5089e535d Add dummy secrets for use in development. 
We also reference these secrets from zproject/local_settings.py, keying
off IS_DEPLOYED.

(imported from commit eb83310e219616ed1c6c253f0d6893134bbe3517)
 2015-08-16 21:35:34 -07:00
Luke Faraone 2fb2300d1b Initial attempt at README.dev and requirements.txt 
(imported from commit dea8b88114a419a127105a81c334f54670f65625)
 2015-08-16 16:46:17 -07:00
Luke Faraone 48f1a84d6e Additional defaults for dev. 
(imported from commit 1b4bd71ff4ed27a83a24e58e797d900a7869c72d)
 2015-08-16 16:46:08 -07:00
Luke Faraone 494d02cc35 Skip S3 write/read test cases 
(imported from commit 838c9a5245b45fc9082f753fe6756f270c7378a7)
 2015-08-16 16:45:15 -07:00
Luke Faraone 81a2a20bbf Disable sync_api_key if no zuliprc 
(imported from commit f9e7f924c00230137ca45c204158b709cd311ebb)
 2015-08-16 16:45:15 -07:00
Luke Faraone 8ea139c772 Fix bugdown fixture for dummy camo key 
(imported from commit 698b261918457117a01ce51f69d49f54f35b3297)
 2015-08-16 16:45:15 -07:00
Luke Faraone cf7ea9bef9 Allow configure-rabbitmq to be run w/o sudo 
(imported from commit 98e820d92b42420d6851a967f6675940ee4d8217)
 2015-08-16 16:45:07 -07:00
Tim Abbott e4fce10f46 Give root higher nofile limits in limits.conf. 
(imported from commit f7fd9ce325449931f8866f6696f8484769c39a14)
 2015-08-16 13:39:48 -07:00
acrefoot 2f88b7dcd0 fix test_messages; othello can't be created twice 
(imported from commit a3407a3f876dd3a7e3136ec19f23dc5cf9d33649)
 2015-07-30 21:08:22 -03:00
acrefoot c545a42a67 fall back to debugger if one of the test modules has an importerror 
(imported from commit 856415f91dee53c72511e68f710a952fbe1a5f2e)
 2015-07-30 21:08:13 -03:00
Zev Benjamin 466a678c2c Remove "More messages below" indicator 
It's been very buggy for a while, has limited usefulness compared with
unread counts, and profiling over the weekend indicates that it's very
slow.

(imported from commit 716fe47f2bbec1bd8a6e4d265ded5c64efe2ad5c)
 2015-03-30 15:44:36 -07:00
Zev Benjamin 4d3f0cdc74 Encode unicode strings using UTF-8 before applying search highlighting 
(imported from commit 45ded691fb89ccff12e76d5ca3b593ce3ff3f2e0)
 2015-03-19 15:25:42 -07:00
Jason Michalski 802a3dd357 Enable missed message notifications for zulip.com 
Also increase the number of messages sent as context from 5 to 10 and
look up to 15 minutes in to the past for context.

(imported from commit bfaed9bcff1ee2047fc3b7a63acf93cd2d47cc7d)
 2015-02-20 21:13:36 -05:00
Zev Benjamin d3822c5d7b Fix initial stream subscription notification settings 
(imported from commit 899577caaf5f5ea9bcff43e1bd97f8c6be453ac1)
 2015-02-12 15:02:26 -08:00
acrefoot 0b7ef24a34 Add option to explicitly add pagerduty topic 
(imported from commit 39ee1b37a807b19570d494f56bf7557228813ed5)
 2015-02-10 23:56:03 -08:00
Jason Michalski 4eaf88e8d1 Add missing pagerduty fixture 
(imported from commit 692317cfac44343788327dbd8fc65319512276de)
 2015-02-10 23:56:03 -08:00
Leo Franchi 0ae8e28635 Exit without exception if this APNS attempt has no connection 
(imported from commit bbdd9f3e11946739459f34b2580e4a7371b158a0)
 2015-02-11 07:20:51 +00:00
Leo Franchi d865732e0d Maintain two APNS connections and send correct notifications to each 
Now we have 2 different Zulip apps out there, and they are signed with
two certs: Zulip and Dropbox. The Dropbox-signed apps are going to need
to be sent APNS notifications from the appropriate APNS connection

(imported from commit 6db50c5811847db4f08e5c997c7bbb4b46cfc462)
 2015-02-11 06:57:25 +00:00
Leo Franchi 1c22b48bb1 Add an optional ios_app_id field to PushDeviceToken 
(imported from commit 32d6efd1ecc58297b83e515350e6daac3bce8469)
 2015-02-11 06:57:22 +00:00
Luke Faraone 910429f365 Move secrets to their own file 
(imported from commit 4e46f217e8a1df9b7cc03db9dc9fc41a6c273365)
 2015-02-10 17:31:26 -08:00
Leo Franchi 64a0b86917 pagerdudy -> pagerduty 
(imported from commit 7cd25db67a8b20875edceafe881c872061a48fab)
 2015-02-10 07:25:46 +00:00
Leo Franchi 2bb268476e Rename Streams to Manage Streams, remove hr 
(imported from commit aa0dccbb35d1e10b8c7b4bbad777e176e838b965)
 2015-02-10 07:23:00 +00:00
Jason Michalski 3ad140e5a7 Convert all template strings to unicode 
(imported from commit ddf60d53d30a02e1bb87fac35bb45768d17e378c)
 2015-02-08 22:12:33 -08:00
Jason Michalski 179bf06940 The subject is an optional field in the pagerduty API 
Pages from MP are using the description field not the subject field.
Include both in the page if given and don't fail if the key is missing.

(imported from commit 4351e5656d4ea025a03c07c8bb3bb5d406ef2d3d)
 2015-02-08 21:30:19 -08:00
Jason Michalski 15713964a5 Add the notification-bot to the cross realm PM whitelist 
(imported from commit 92a19f955a99650c79b83c6afb23726caf02e577)
 2015-02-08 21:03:45 -08:00
Jason Michalski a0a537e0ce Add the feedback bot to OG_ZULIPER_EMAILS 
The feedback bot needs to be included in the OG_ZULIPER_EMAILS so users
can send feedback.

(imported from commit b0c3295379d0f062a912f8b6c957419335be1c48)
 2015-02-08 10:08:32 -08:00
Jason Michalski 2c1ef7d89e Remove failing missed message test 
We disabled missed messages for the zulip realm and this test was
failing.

(imported from commit c37d301ac98c38495ff16e95d773f3d6d700772d)
 2015-02-07 18:16:12 -08:00
Jason Michalski f4239d60ca Add pagerduty webhook 
(imported from commit 06219066b423f53d08094f3f97a98016e145b2a7)
 2015-02-07 18:16:11 -08:00
Jason Michalski 53b02a694a Update the review script to use @dropbox.com 
(imported from commit 30c8c516d0542c1319cb2faf5a9da8e9c8b26041)
 2015-01-30 23:39:47 -08:00
Jason Michalski 1eebcb472d Only allow users in the OG zuliper list to send cross realm PMs 
Changes from allowing all of the zulip realms to a whitelist of users.

(imported from commit 5ad2db9a62b430ef2c9d867e4afdf661b11ae96a)
 2015-01-30 23:39:47 -08:00
Zev Benjamin 2c760ae735 Remove mixpanel 
(imported from commit 9b6cc58ee9be483db8bf2d2eaaaecabc14f821e4)
 2015-02-06 13:59:30 -08:00
Luke Faraone a901677be1 Use a unicode string when grabbing SSO unames 
(imported from commit 5742147003928e2207d9eac8704aa6090fb8cb8a)
 2015-02-06 09:56:39 -08:00
Jason Michalski 6ba5271824 Fix the SSO path to support mirror dummies 
The SSO flow which was never used on a realm with mirror dummies before.
Also change the redirect to stay on the same doain.

(imported from commit 0f1b8a8fcef82ae6eaa5a264686f98d62a683fac)
 2015-01-30 20:07:13 -08:00
Zev Benjamin 517703ab47 Update default api/site URLs to prod 
(imported from commit bcd32a0e8f197abd728616d1b0ae1c78a6639e68)
 2015-02-05 22:46:31 -08:00
Zev Benjamin b9baf049e6 Send deployment zulips to prod 
(imported from commit 8f75e028ead3016093ff7f8eacdebf05dc0687f5)
 2015-02-05 22:46:30 -08:00
Zev Benjamin 8ecb555a98 Update log2zulip bot config 
(imported from commit c25802d55cd50c1a81050466d9a59a29501aca87)
 2015-02-05 22:46:30 -08:00
Zev Benjamin db0cec8d70 Update Trac bot config 
(imported from commit 07e976637882030faedbf2e34448404e7e1de379)
 2015-02-05 22:46:30 -08:00
Zev Benjamin 83dafb662a Update Git bot config 
(imported from commit 8c189e199178efd8aa054d9762cb26330ab4ae86)
 2015-02-05 22:46:30 -08:00
Zev Benjamin 3c76c3fe54 Update Nagio's zuliprc 
(imported from commit ac06b7cf41b1c0353c2096c4b9befae432fd7c5b)
 2015-02-05 22:46:30 -08:00
Zev Benjamin fc828ed116 Update review script 
(imported from commit f8902233a29dcde900218fc7a62735024eb67974)
 2015-02-05 22:46:30 -08:00