792e0c5976
Add FencedBlockPreprocessorTest.
...
(imported from commit a7f73f04408288192b33f688bd5baadd362f9458)
2013-11-20 16:06:54 -05:00
0d920dae87
Extract FencedBlockPreprocessor.placeholder().
...
(imported from commit cf6dab74ae97a57498e1e1807c7c4f272f3f448b)
2013-11-20 16:06:53 -05:00
2955cac47e
Extract vars in FencedBlockPreprocessor.process_fence().
...
(imported from commit 092a8e5f7479f1d918219cae058b6a867743c7f9)
2013-11-20 14:30:56 -05:00
b3344c2f49
Move langclass var into FencedBlockPreprocessor.format_code().
...
(imported from commit e468a8b6a12494facb0dfa97eff90e02cd14f169)
2013-11-20 14:30:55 -05:00
46838ec6d0
Simplify FencedBlockPreprocessor.format_fence().
...
(imported from commit 741f4f0640756d545019b6fe6850af3198b351ba)
2013-11-20 14:30:55 -05:00
c0f312ec29
DRY up m.group('code') in FencedBlockPreprocessor.
...
(imported from commit b23caae1ab63a9adb80025b628bc1a7c6a988ce0)
2013-11-20 14:30:55 -05:00
6bc25d3d7b
DRY up m.group('lang') in FencedBlockPreprocessor.
...
(imported from commit 9f9ab5604b7df711a3a369247def1277880b0b5f)
2013-11-20 14:30:55 -05:00
7bb30a96ac
Extract FencedBlockPreprocessor.format_fence().
...
(imported from commit 8a35de7df9ad956496263c82668b118910edd6b3)
2013-11-20 14:30:55 -05:00
64410fae5e
Extract FencedBlockPreprocessor.format_quote().
...
(imported from commit 59db5415d624402b37ade7fe5547b16f58ae565f)
2013-11-20 14:30:55 -05:00
9d4b6d0684
Extract FencedBlockPreprocessor.format_code().
...
(imported from commit 3c98b9a7391a71e9c55a7b5c97abd0ee74178b44)
2013-11-20 14:30:54 -05:00
25c63f08de
Use ujson instead of pickle for serializing event queues
...
(imported from commit 2d90574ae97cc973c9686c2bd557cc199d4b0850)
2013-11-20 14:25:36 -05:00
69e5e2c3d2
Remove old migration code
...
(imported from commit 5366411706ef296dc14d0d0dd9e2566cb8abb8b7)
2013-11-20 14:25:36 -05:00
06ee83b531
Construct EventQueues externally from ClientDescriptors
...
(imported from commit 7ef882074ed1c3663939da199d54e4959df8f127)
2013-11-20 14:25:36 -05:00
3caee45cf4
Fix missing support email address in signup notifications.
...
(imported from commit f1a4fbe5fbc68292080f87960f038fe530ba87e2)
2013-11-20 11:01:11 -05:00
db29e60249
Move the last event queue pickle file to /var/tmp instead of deleting it
...
(imported from commit b8edaa686e2dadfdb2111ee1da93456591e44a50)
2013-11-19 15:05:19 -05:00
151fbd832c
do_update_message: use is_admin to check who can edit a topic.
...
(imported from commit e96245506c7eecc8aed3fbdb6dfb7c44aca3234e)
2013-11-19 14:31:02 -05:00
d1619b3f3c
Use a more accurate "is admin?" check.
...
UserProfile.show_admin was intended to be a check for users that have
administrative rights in other realms, which we've harmlessly but
erroneously been using to check if they are an admin in their realm.
Use the more straightforward check instead, with a more intuitive
name.
(imported from commit d81050c7dbbb19e59c5e31750be303a4630e1456)
2013-11-19 14:31:02 -05:00
2c841042ae
Allow admins to rename any topic.
...
(imported from commit 5b557e8244e5196c9aa0ee29d4efb00986434528)
2013-11-19 14:31:02 -05:00
15a837d12e
[manual] socket: Send explicit ACKs
...
There will be browser errors on staging when this is deployed due to the socket
protocol changing.
(imported from commit f1eda5b5c2ec9c60c23b3ca96277a61debadf5bb)
2013-11-19 11:06:14 -05:00
7870b4d158
socket: Fix a traceback on server restart
...
I believe there may also be others. I'm still not sure why clients would be
sending open requests without session or csrf values in their cookies, though.
(imported from commit 7e9660c1c4d5c2abf55ff21b433ba0117180eb82)
2013-11-19 11:06:13 -05:00
c66113104c
Clean up logging of send times to not waste a log line.
...
(imported from commit 824488a323a4361ef058f27da6e0768dffc43b6d)
2013-11-18 18:05:19 -05:00
26f7b783a2
logging: Fix request processing time to not count initialization.
...
Previously, we counted not just the time required to process a
particular request, but also the time required to import+find the view
function via urls.py. The latter is usually fast, but when a new
Django thread starts up, it can take significant time, resulting in us
flagging slow requests on each server restart and also when a new
Django thread starts up on prod to handle requests.
This change means that we no longer include that startup time as part
of request processing time -- but we still log it in the case that it
was more than 5ms, so that we can identify why a particular request
was slower than expected if high startup times become a problem. We
annotate the time in log lines as "+start" rather than just "start" to
make clear that it's not counted in the total.
(imported from commit c677682e23b26005060390d85d386234f4f463ad)
2013-11-18 18:05:19 -05:00
d44c6636c6
Add setting to enable profiling of all requests.
...
This is useful for the occasional case where we cannot figure out what
is causing a particular problem, but it can be easily reproduced on
staging.
(imported from commit 8b51184a8b686814f2c6ff103ba355538463ceb0)
2013-11-18 18:05:19 -05:00
74c304ae40
Don't send heartbeat events to clients that don't request them.
...
(imported from commit 1147814b22fb9737a807057ddbdbe0e9554086e0)
2013-11-18 13:57:01 -05:00
14f6625569
Don't send server restart events to clients that don't request them.
...
(imported from commit b3381e904704c18918fcce97d2493241e49004be)
2013-11-18 13:57:01 -05:00
b78fa0857f
Allow overriding the default avatar image
...
(imported from commit 66d413682a822e0019f28033f19908bdd9fa0156)
2013-11-18 11:48:53 -05:00
a63f4284f0
Allow enterprise deployments to disable the use of Gravatar.
...
(imported from commit 49c14cc7629f2ffe6cedaab5d42ad5bf7f6569a4)
2013-11-18 11:48:53 -05:00
9cba43d49c
GitHub: Always report the topic as 'GitHub' for customer14.invalid.
...
(imported from commit d9d35f4dcabf6246b1c9bc623a01bc68e1142b35)
2013-11-18 11:44:25 -05:00
5c6a85f99a
socket: Change path for 'not yet authenticated' error messages
...
(imported from commit 826d3a0ea9084644810a00a14f2f19936e21118c)
2013-11-18 11:42:57 -05:00
319852c60e
socket: Fix keyword argument name for error logging
...
(imported from commit e61eace1aa48fe17d5d2338f7990e32d3404d390)
2013-11-18 11:42:57 -05:00
f3fa78d30c
Rename do_[rd]activate to do_[rd]activate_user.
...
For similarity with do_activate_user.
(imported from commit 2874af84dbe1ce666de10e0d8ffe2daa8bad9731)
2013-11-16 11:35:26 -05:00
a78ec1d0d3
get_members_backend: Report a bit more data on users.
...
(imported from commit af1c2a30abed4aa2796f0babe311f993965a008b)
2013-11-16 11:35:26 -05:00
1144e0b3f9
Update active_user_dicts_in_realm cache when touching is_active flag.
...
(imported from commit c9407e2c18dcfcc7a4b1ec79c471f825dff04b1e)
2013-11-16 11:35:25 -05:00
0b16dfc999
Add /json/users/<email>/reactivate endpoint.
...
(imported from commit 7afa29f7718430ea2df7c489ab2af4d93d4ce497)
2013-11-16 11:35:25 -05:00
bdfd3ed9c2
Add do_reactivate() action.
...
(imported from commit fc73d0fdd3a6125b3b31a75c3b108ceb266e528b)
2013-11-16 11:35:25 -05:00
bafb6f8dc3
fixup day1/day2 email templates
...
(imported from commit 30846fc298d04ac763025e82a60731d158840462)
2013-11-15 21:51:37 -05:00
1a904185f2
fix path for do_confirm redirect
...
(imported from commit d61d8f155fc06fbadc68155f32f510e212adf6c0)
2013-11-15 21:31:37 -05:00
9616ea7afd
remove enqueue_followup_emails management command
...
(imported from commit 20ce0b698cf795a6e1c7ff5ba7b546901e1fd8a4)
2013-11-15 21:31:37 -05:00
e77d534e78
remove ALLOW_ARBITRARY_SENDERS_LOCAL_EMAIL
...
(imported from commit 7a374959516d8505685466293f146d95094a7ea7)
2013-11-15 21:31:37 -05:00
daffe049ad
Don't use hardcoded noreply@zulip.com, zulip@zulip.com, or https://zulip.com
...
(imported from commit 1132553b63ae23ebcca746f0f65205b97bfee7dc)
2013-11-15 21:31:37 -05:00
4116e06c88
Disable signups for realms that exist as part of enterprise deployments.
...
(imported from commit 4200b44c7153d1dba674982916ef0470c75bdf6d)
2013-11-15 19:36:17 -05:00
30e4de6767
Freshdesk: fix erroring on unknown statuses by hardcoding FlightCar's.
...
(imported from commit 0a4b8ccaa883048fdc7a7d7712cc528194775d89)
2013-11-15 17:43:55 -05:00
337c22f9e1
Fix redirects landing newly registered users at :8888/accounts/do_confirm.
...
This is similar to the related issue we had with the remote_user_sso
codepath.
(imported from commit 5c2c99be9699a1bce88c4a7de15dae4348fc7967)
2013-11-15 15:04:13 -05:00
220678ae40
Support emojis/bolding/etc. in single-line /me messages.
...
(imported from commit c62ae8cf26117e30a029e025021cc4a3a67f4a83)
2013-11-15 14:34:38 -05:00
fe0dcd4313
Disable camo on enterprise.
...
CUSTOMER13 doesn't want it, and there's currently no nginx config
or configurable Camo URI, so it wouldn't work if image preview
were enabled.
(imported from commit 615d4a32acbc4d4d590f88cf4e7d45d8f49db1d3)
2013-11-15 14:27:16 -05:00
b0209fec05
Don't puke on non-ASCII characters when shelling out to html2text.
...
(imported from commit a407c9fb2a090075d5e26b5db00388f4f81de1f5)
2013-11-15 12:28:30 -05:00
545e2539f8
Use non-ASCII characters in Freshdesk tests, to catch encoding bugs.
...
(imported from commit 0cc3ebf3548b28c018d75d51e7e66de5dbb59a0b)
2013-11-15 12:28:30 -05:00
7f2936a985
Allow enterprise customers to disable name changes
...
(imported from commit 1f2039f3e88a4ec0cc48dba75f714563c1de4af8)
2013-11-15 11:26:10 -05:00
53c76aa657
Move enterprise-registration to zilencer/ from zerver/
...
(imported from commit d8a58913040376dbdbc9dcee13ab8a7910733da7)
2013-11-15 11:21:52 -05:00
52ca432745
remote_user_sso: Redirect to EXTERNAL_HOST, rather than a relative /.
...
This fixes a problem where the desktop app would attempt to load
https://zulip.akam.ai:8888/ after authenticating the user, which fails
with CSS issues.
We should probably, separately, change our Django-under-apache to only
serve the one URL that it needs and redirect the rest back to
Django-under-nginx.
(imported from commit 3e3251863618269790f61b371e88af57b6cfb272)
2013-11-15 11:10:19 -05:00
Steve Howell
Zev Benjamin
Tim Abbott
Jessica McKellar
Kevin Mehall
acrefoot
Leo Franchi