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
0355f444af
Document our Asana integration.
...
(imported from commit 1ffa39325331631423cc99ed0fbb09d4e509eec7)
2013-11-19 13:30:35 -05:00
1e1a0ee0e9
Add basic Asana integration.
...
Due to limitations in their API, we have to poll and check for
creation and completion events.
(imported from commit be65e507fac16a7f8ad3dc57b2af9c4b98aacf39)
2013-11-19 13:30:34 -05:00
9ca8288918
Do not use display: none on file inputs, as some browsers will not let you trigger clicks on them
...
(imported from commit f05b18f7ad3f4235d33a1142db7e662f97eff308)
2013-11-19 12:35:11 -05:00
32702ef7ab
Align the sender name to the /me status
...
(imported from commit a0217f8c795aa5f903af94220816482bdc9ac364)
2013-11-19 09:10:23 -08:00
39c9ac79ae
socket: Resend messages on reconnect when the server never received them
...
(imported from commit 1810a76adf663e40c2d5292b48eb98553b47181d)
2013-11-19 11:06:14 -05:00
ddd3af0a36
sockjs: Don't throw an exception when _didClose is called when readyState is CLOSED
...
This clearly happens in practice, so return early instead of throwing an
exception.
(imported from commit 79d9624ed071aa87ace4b09a187a128b5728748d)
2013-11-19 11:06:14 -05:00
36ecaea338
socket: Reconnect if we don't get an ACK for a request
...
(imported from commit ec7698f50c6bc21482539e11e574d9444bc6c35e)
2013-11-19 11:06:14 -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
beb7f519a9
socket: Try to reconnect on unsuspend
...
(imported from commit f4d630ccc4c2dc622f6e9b7cbbb1f318a7f4b430)
2013-11-19 11:06:13 -05:00
5d93cf9ea5
Trigger an event when we detect that we've unsuspended
...
(imported from commit a26414a3083af1267bf30c165cf721ab9f5a80be)
2013-11-19 11:06:13 -05:00
17cc606eee
Socket: Reconnect if we miss server heartbeats
...
(imported from commit 52bd5ebdbec6e89f54dc67ad19a538dce910fe47)
2013-11-19 11:06:13 -05:00
1562ba7439
socket: Clean up reconnection logic
...
(imported from commit 3060803452bbb29417388cf612669785237f84f9)
2013-11-19 11:06:13 -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
2df532313a
socket: Rename _timeout_id to _reconnect_timeout_id
...
(imported from commit a1f5c86adf9397bc4147cbc4875e036ba6844160)
2013-11-19 11:06:13 -05:00
f783d24892
Make sure user list shows when you open it with the toggle button.
...
If you don't call ui.resize_page_components(), then the user
list will have zero height. Now we call it.
(imported from commit ca2e295319550509360e4d2278489f9a328335ff)
2013-11-19 10:56:25 -05:00
1c91d1a5bc
Clean up back end HTML templates.
...
The check-handlebars-templates script now looks at most of our
back end templates to try and find imbalanced tags. This commit
fixes a bunch of the existing templates.
(imported from commit fad4a5d85d68160370dd588b41d6f125f64d198f)
2013-11-19 10:43:56 -05:00
197ddd6edb
Turn off left side userlist on staging.
...
(imported from commit 2c137eaaadbe94ec4f9e3cd9a02766f962641785)
2013-11-19 09:22:40 -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
e2c388c49c
Attempt 2: Notifications in the composebox
...
This moves the notify-not-in-view notifications into the composebox area.
It also tries to be a bit smarter about what action it links and what it displays.
(imported from commit 1c79bd0d9ef972059a006b17501a09b72e961ee3)
2013-11-18 16:09:34 -05:00
e7e2f0ee6e
Use "Username" consistently for bot emails.
...
(imported from commit 481609759e8bf051c99d4a983dcc8f8620837462)
2013-11-18 15:28:11 -05:00
07d4dd66c4
Show admins on /realm_activity page.
...
(imported from commit 7d6beb4145b86d95b872b175ea8a567b7ce56d23)
2013-11-18 14:41:37 -05:00
3a5d930ede
Clean up compatability code from Django 1.6 transition.
...
(imported from commit a83bd3340f5488fd687f045e2143c32f9385fa88)
2013-11-18 13:57:01 -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
91a463def0
Show webhook clients in activity pages.
...
(imported from commit 423df7def53583ab8122a26271068423f03a687c)
2013-11-18 12:58:39 -05:00
76a1754357
Use from/import style for datetime imports in activity views.
...
(imported from commit 72772f63f00d1b5e9d5d0ccefb56b6714d1a2370)
2013-11-18 12:36:25 -05:00
38a7aa2255
Highlight recently active users in /realm_activity.
...
(imported from commit 307ed9c17ea1055f40cd983d5c2b2f308203f3f7)
2013-11-18 12:36:24 -05:00
ae77b98155
DRY up East Coast time formatting.
...
(imported from commit b5b5787816c2dc641bbe4cfb351f4ff765e44969)
2013-11-18 12:36:24 -05:00
dd53b92efc
Add row_class support to /activity tables.
...
(imported from commit 69dcbeccc3b048053b2dcca82c628b0cfccddfbb)
2013-11-18 12:36:24 -05:00
818ef42d05
Show zulip-desktop-sso package for local server installs
...
(imported from commit d0a05bfb2e7a15c02c0e61d6b95ef841a44340b3)
2013-11-18 12:04:43 -05:00
b78fa0857f
Allow overriding the default avatar image
...
(imported from commit 66d413682a822e0019f28033f19908bdd9fa0156)
2013-11-18 11:48:53 -05:00
3a4b576135
Add a directory for enterprise admins to add static files.
...
For things like custom default avatars that shouldn't be overwritten
on update.
(imported from commit 2487d2532a5255b91bff956fdfb0d885cb786701)
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
c66cea8ffc
Remove margin that was above Home link.
...
(imported from commit edcbee9a8bdf5c387641199b09880e4111fc9f0a)
2013-11-18 10:44:04 -05:00
be48e6ab15
Update paths to rss-bot.
...
(imported from commit ab6ea5e881593c8533680323bf525faacc2ddfec)
2013-11-18 08:11:06 -05:00
6971a0f4cc
Fix rss-bot parsing of feeds that don't specify a post ID.
...
(imported from commit 67fdb8b92b39fc14c81b87b7fa8089964c07be8b)
2013-11-18 08:11:06 -05:00
35dd1153ea
Don't use a spinner in the "Create bot" form.
...
Just disabling the button with a status message is probably
sufficient.
(imported from commit dd46e5ac3d2224d84dc32d057469c434007001fa)
2013-11-16 13:03:56 -06:00
dd6f1c981f
Properly align "create bot" button on settings form.
...
Also move the "Adding bot..." spinner a little.
(imported from commit 65aa869e71a33a23f77d8bb054bbd0fe8e6a7de2)
2013-11-16 12:53:39 -06:00
5327e41156
Reindent settings page bot form.
...
There are no changes here, just whitespace changes.
(imported from commit 2681e22ac6a3d256ffbed0a747d1eda57e7fd149)
2013-11-16 12:43:14 -06:00
6b0584742f
Remove stray <hr> in password reset form.
...
(imported from commit 3d233bfaba94514411ace4f638fb34e2b35aae30)
2013-11-16 12:39:26 -06: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
6497f330ea
Fix missing table headers on admin page.
...
(imported from commit e5c97838e1b5b11c90384d8c49aa2087fd8fc219)
2013-11-16 11:35:26 -05:00
Jessica McKellar
Leo Franchi
Allen Rabinovich
Zev Benjamin
Steve Howell
Tim Abbott
acrefoot
Kevin Mehall
Waseem Daher