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

21329 Commits

Author SHA1 Message Date
rht ed9b3ca440 zilencer: Remove import print_function. 2017-09-27 18:06:47 -07:00
rht 74f8a527e4 analytics: Remove print_function. 2017-09-27 18:05:45 -07:00
rht 32650c8fdc zerver/management: Remove print_function. 2017-09-27 18:05:45 -07:00
rht 26f5d9a32c zerver/tests: Remove print_function. 2017-09-27 18:05:45 -07:00
rht b8aa92194c zerver/tornado: Remove print_function. 2017-09-27 18:05:45 -07:00
rht 2e12fe5e2e zerver/lib: Remove print_function. 2017-09-27 18:05:45 -07:00
rht e4c824ed61 zerver/views: Remove print_function. 2017-09-27 18:05:45 -07:00
Vishnu Ks 17cc32f168 settings: Show error or success message when deleting uploaded files. 
Fixes #6519
 2017-09-27 17:50:22 -07:00
Vishnu Ks 8faa9ab214 settings: Show upload quota and total uploads size in uploaded files page. 
Fixes #6408
 2017-09-27 17:50:22 -07:00
Vishnu Ks 865bc06945 settings: Show attachment size and upload date in uploaded files page. 2017-09-27 17:50:22 -07:00
Vishnu Ks 2f32439fc3 node_tests: Fix broken assert.equal in templates.js. 2017-09-27 17:50:22 -07:00
Vishnu Ks 94e099eaab auth: Make multiuse invite link work with oAuth2. 
This works by attaching to the user's session the multi-use invitation
key, allowing that to be used in the Google/GitHub auth flows.
 2017-09-27 17:47:40 -07:00
Brock Whittaker 945e97ec35 portico: Style "confirm email change" page. 
This adds the white box styling to the "confirm email change" page.

Fixes: #6706.
 2017-09-27 17:41:45 -07:00
Steve Howell de0b47fd4e Always notify service bots about stream mentions. 
Before this change, we were only triggering service bots
for stream mentions when the bot was subscribed to the
stream.
 2017-09-27 17:22:12 -07:00
Brock Whittaker 4e86bffb15 /help/: Remove "overflow: hidden" from sidebar on mobile. 
This removes the "overflow: hidden" value in CSS on screens that
are less than 1000px wide.

Fixes: #6700.
 2017-09-27 17:18:33 -07:00
rht b937e1fede Remove the rest of `import six` outside zerver.lib. 
We no longer need the six module, now that we're Python 3 only.
 2017-09-27 17:09:15 -07:00
rht daef6a7dbc zerver/tests: Remove `import six`. 2017-09-27 17:07:40 -07:00
rht a7803cbf1b zerver/tornado: remove `import six`. 
Tweaked by tabbott to remove the changes in
zerver/tornado/handlers.py, which are hard to test.
 2017-09-27 17:07:08 -07:00
rht 0fa3c1d876 zerver/management: Remove `import six`. 2017-09-27 17:06:16 -07:00
rht 2ae47525d3 zerver/worker: Remove `import six`. 2017-09-27 17:06:16 -07:00
rht 106375bd68 zerver/views: remove `import six`. 2017-09-27 17:03:03 -07:00
Tim Abbott 28eaf5620e emails: Use common_context for email change notifications. 
This also lets us remove `realm_uri`.
 2017-09-27 16:48:18 -07:00
Rishi Gupta d0a9e92f1d emails: Fix duplicate html structure added to compiled emails. 2017-09-27 16:48:18 -07:00
Vishnu Ks 69b68286ee devtools: Mention to run inline css command in /emails section. 2017-09-27 16:48:18 -07:00
Vishnu Ks dfaa939af2 emails: Store the compiled emails in separate directory. 2017-09-27 16:48:18 -07:00
Vishnu Ks caaa90f22d emails: Extract CSS from email_base_default. 2017-09-27 16:48:18 -07:00
Vaida Plankyte 207e06d558 frontend: Add header & body illustrations to emails. 2017-09-27 16:32:43 -07:00
Vaida Plankyte 6222a487ec frontend: Add buttons to emails. 2017-09-27 16:16:43 -07:00
Vaida Plankyte 0993617214 frontend: Add new style to emails. 2017-09-27 16:16:43 -07:00
Vaida Plankyte cb7353a3b5 frontend: Remove inline color assignments in emails. 2017-09-27 16:16:43 -07:00
Steve Howell 1b518f1983 Return mentioned users in get_user_info_for_message_updates(). 
The dictionary result for get_user_info_for_message_updates()
now has a `mention_user_ids` field that is a set of user ids
who were mentioned in a message.
 2017-09-27 16:01:50 -07:00
Steve Howell 646abb57b7 refactor: Extract get_user_info_for_message_updates. 
We'll want to expand this to get users that were mentioned in
the prior message, but this commit is just a refactoring.
 2017-09-27 16:01:50 -07:00
Steve Howell 5abf52de71 Extract get_idle_userids(). 
This function will help us send missed-message mails for
updates, in a future commit.
 2017-09-27 16:01:50 -07:00
Tim Abbott 06e6b3abe1 event_queue: Fixed stream_push_notify code path in missedmessage_hook. 
This finishes implementing the stream_push_notify feature, which
previously didn't work if you were not idle when the message was sent.
 2017-09-27 15:57:48 -07:00
Tim Abbott 2b1ea1555c event_queue: Simplify API of maybe_enqueue_notifications. 2017-09-27 15:57:47 -07:00
Tim Abbott fa461c6a4f missedmessage_hook: Fix name of ClientDescription argument. 
This was previously incorrectly named to suggest it was the EventQueue
object.
 2017-09-27 15:57:47 -07:00
Tim Abbott d6732d0781 event_queue: Fix handling of private messages in missedmessage_hook. 
Previously, we didn't correctly trigger email/push notifications for
PMs in these cases.
 2017-09-27 15:57:47 -07:00
Tim Abbott bfa8f0efdb tests: Add an end-to-end test for missedmessage_hook. 
This checks what arguments it passes into the enqueuing function.

Note, however, that the arguments are wrong for various cases, we'll
update the tests as we fix those bugs.
 2017-09-27 15:57:47 -07:00
Tim Abbott 71fc8363b4 tests: Add a test suite for maybe_enqueue_notifications. 
This ensures that as we expand the logic for under what circumstances
email and push notifications should be sent, we can be confident about
this code path always doing the right thing.
 2017-09-27 15:55:29 -07:00
Tim Abbott 830d3e8d07 event_queue: Use maybe_enqueue_notifications in missedmessage_hook. 
This fixes a problem introduced in the recent refactoring where
`triggers` would not be set correctly when a push or email
notification was triggered by missedmessage_hook.

Fixes #6612.
 2017-09-27 15:55:29 -07:00
Tim Abbott 9749826e9c event_queue: Refactor code for checking if a message was mentioned. 
Now, the two code paths do the same thing for this check.

It seems like there may be more work to do here, in that
wildcard_mentioned messages seem to not be eligible for sending
email/push notifications.  We probably want to add some logic there
for the user doing the mention to control whether or not it does.
 2017-09-27 15:55:29 -07:00
Tim Abbott f68089fbe1 event_queue: Extract maybe_enqueue_notifications. 
Conceptually, this code path should be shared between the
process_message handler and the garbage-collection hook.
 2017-09-27 15:55:29 -07:00
Tim Abbott c3911e3fb6 test_classes: Improve error handling for send_message. 2017-09-27 15:55:29 -07:00
Brock Whittaker f397925df2 /apps/: Add an "install instructions" line. 
This adds a line under the app description that has a link to the
installation instructions for all the platforms.
 2017-09-27 15:50:09 -07:00
akashnimare 7d1759818b docs: Add desktop app installation instructions. 2017-09-27 15:50:09 -07:00
Greg Price 704e94c85c run-mypy: Deindent a bit of logic by moving an exit path up. 2017-09-27 12:22:03 -07:00
Greg Price 103178ffb2 run-mypy: Move "which mypy" noise into --version, and use in Travis. 
Printing the version in Travis builds will help in debugging when we
get different results there from locally.  The new `--version` path
also gives us a handy place to put the "what mypy command are we running"
diagnostic, getting it out of the way of normal interactive use.
 2017-09-27 12:22:03 -07:00
Greg Price 9ef68d6d42 run-mypy: Add --version to check the version of mypy used. 2017-09-27 12:22:03 -07:00
Greg Price c46755d48d run-mypy: Reorder CLI options for clearer --help. 2017-09-27 12:22:03 -07:00
Greg Price 6697e3620b run-mypy: Give CLI option help a consistent style. 
Most CLI tools (including GNU tools and Mercurial) use lowercase
sentence fragments, with no period, for option glosses, so we
follow that style.  Also make the voice and wording consistent,
and the quote type in the Python source.
 2017-09-27 12:22:03 -07:00