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

18660 Commits

Author SHA1 Message Date
Umair Khan 520d1de052 12-toggle-message-editing.js: Remove waitForText. 2017-06-07 13:41:59 -07:00
Umair Khan 591098cd27 11-mention.js: Remove waitForText. 2017-06-07 13:41:59 -07:00
Umair Khan 33e46af898 08-edit.js: Remove waitForText. 2017-06-07 13:41:59 -07:00
Umair Khan 5ae822fc54 07-stars.js: Remove waitForText. 2017-06-07 13:41:59 -07:00
Umair Khan fe8204f1f0 05-subscriptions.js: Remove waitForText. 2017-06-07 13:41:59 -07:00
Umair Khan 0c952dca73 04-compose.js: Remove waitForText. 2017-06-07 13:41:59 -07:00
Umair Khan e4f6f53e74 casper: Add waitForSelectorText. 
Fixes #1110
 2017-06-07 13:41:59 -07:00
Sarah 9ebb503340 settings_notifications.js: Save notification settings on change. 
Refactor settings_notifications to save each setting on change.

Fixes #3264.
 2017-06-07 13:39:27 -07:00
Sarah baf92b98f2 settings_notifications.js: Refactor using notification_settings variable. 
Create an array of all user notification settings and loop through it
to update notification settings and display results.
 2017-06-07 13:33:08 -07:00
Harshit Bansal 0aaf434176 settings/bots: Fix broken tooltip. 2017-06-07 13:24:07 -07:00
Jack Zhang 98a785bb25 message_edit: Replace highlighting replaced text with delete / insert. 
Rationale: For the more off-to-the-side edit history view, changes
are easier to digest by highlighting deleted content in red followed
immediately by added and changed content in green.

TODO: Toggle for showing the edited messages without highlighting;
deleted content would not be shown in this view.
 2017-06-07 11:06:15 -07:00
Jack Zhang a3557b8d2c message_edit: Style text & highlights for inserted/deleted text. 
Changed to: red and line-through for deleted text, green for inserted
text. This should increase contrast.
 2017-06-07 11:06:15 -07:00
Steve Howell ce1dd9f50b presence: Do not show bots in the buddy list. 
(Before this fix, we were showing empty circles for bots
in small realms.)
 2017-06-07 10:36:26 -06:00
Joshua Pan 6a5c01a36e node tests: Get unread.js to 100% node coverage. 2017-06-07 03:23:57 -06:00
Joshua Pan 0a56156017 node tests: Get stream_sort.js to 100% node coverage. 2017-06-07 03:23:57 -06:00
Joshua Pan 9f9cb618c9 node tests: Get recent_sender.js to 100% node coverage. 2017-06-07 03:23:57 -06:00
Joshua Pan a6efbddd65 node tests: Test drafts_overlay_open(). 2017-06-07 00:02:14 -07:00
Joshua Pan bbc0103183 drafts.js: Create initialize() function. 2017-06-07 00:01:55 -07:00
Harshit Bansal 821ff06629 Add `unified_reactions.json` to be used for reactions migration. 
This file contains the mapping from old emoji names to new codepoints
from iamcal's dataset to be used in reaction migration.
 2017-06-06 23:52:41 -07:00
Rohitt Vashishtha 7125ea6b61 docs: Update git-guide with tools/clean-branches. 2017-06-06 23:50:36 -07:00
Rohitt Vashishtha 7a81591f38 docs: Update git-guide with tools/fetch-pull-request. 2017-06-06 23:50:36 -07:00
Rishi Gupta 769c5ab105 emails: Send password reset emails through zerver.lib.send_email. 
Previously, the password reset email behaved differently from all the other
email Zulip sends.
 2017-06-06 23:22:22 -07:00
Rishi Gupta 7aa735294f emails: Remove unneeded safe tags from non-HTML email templates. 
Reverts 7527ac9, and removes an additional |safe tag in
missed_messages.txt. These files are now rendered by a template engine
with autoescape=False.
 2017-06-06 23:22:22 -07:00
Rishi Gupta 15e5814c27 emails: Prevent subject lines and plaintext emails from being HTML-escaped. 
Adds a new template engine with autoescape=False, and uses the new engine to
render subject lines and plaintext emails.
 2017-06-06 23:22:22 -07:00
Rishi Gupta 4d67ce8051 settings.py: Make template engine settings easier to duplicate. 
No functional changes.
 2017-06-06 23:22:22 -07:00
derAnfaenger 9e3e2c56ce bots: Refactor and simplify bot_test_lib.py. 
This commit integrates the mock_test function in
check_expected_responses and makes this function usable
for simple tests only by not allowing mock http conversations.

assert_bot_response() is now used for single message-response pairs,
resolving potential issues with multiple messages and a single http
request-response pair.

The giphy bot test file is updated accordingly.
 2017-06-06 23:06:40 -07:00
Tejas Kasetty ba91d7f59f zulip.css: Remove dead realm emoji CSS. 
Removes .emoji.realm-emoji; it hasn't been used in months.
 2017-06-06 22:54:45 -07:00
Akhil 6adf241d7e message_edit: Avoid always fetching raw content. 
Altered message_edit.start to check for message.raw_content before
retrieving the same from the backend.

With tweaks by tabbott to update, rather than delete, on repeated
edits.

Fixes: #4404.
 2017-06-06 22:41:27 -07:00
neiljp 130c79d4d8 test-bots: Enable list of bots to test & check for valid bot names. 2017-06-06 22:29:57 -07:00
Aditya Bansal 8f8149c0a5 Clean invite_user.html to use 4 space and consistent indentation. 2017-06-06 22:04:55 -07:00
Aditya Bansal 8555770646 Clean zephyr.html to use 4 space and consistent indentation. 2017-06-06 22:04:55 -07:00
Aditya Bansal 864ee6aaf9 Clean left_sidebar.html to use 4 space indentation. 2017-06-06 22:04:55 -07:00
Aditya Bansal 9219298774 Clean main.html to use 4 space indentation. 2017-06-06 22:04:55 -07:00
Aditya Bansal f9edf8bc0e Clean accounts_home.html to use 4 space and consistent indentation. 2017-06-06 22:04:32 -07:00
Aditya Bansal f58d102664 Clean confirm_email_change.html to use 4 space indentation. 2017-06-06 22:00:37 -07:00
Aditya Bansal d8bfeb6b98 Clean realm_summary_table.html to use 4 space indentation. 2017-06-06 22:00:36 -07:00
Aditya Bansal f2679448e8 Clean ad_hoc_query.html to use 4 space indentation. 2017-06-06 22:00:36 -07:00
Aditya Bansal 1143aec53b Clean 404.html to use 4 space indentation. 2017-06-06 22:00:36 -07:00
Aditya Bansal cb36ce26de Remove files from ignore list which were migrated to markdown. 2017-06-06 22:00:36 -07:00
Aditya Bansal 12c6ffa593 Migrate integrations/twitter.html to markdown. 2017-06-06 22:00:35 -07:00
Aditya Bansal 642deef72f Migrate integrations/google-calendar.html to markdown. 2017-06-06 22:00:03 -07:00
Aditya Bansal 2adfc8be4d Migrate integrations/trac.html to markdown. 2017-06-06 21:57:32 -07:00
Aditya Bansal 08c5af5e39 Migrate integrations/subversion.html to markdown. 2017-06-06 21:56:46 -07:00
Aditya Bansal 26212a55dd Migrate integrations/openshift.html to markdown. 2017-06-06 21:55:16 -07:00
Aditya Bansal ee53f80de9 Migrate integrations/nagios.html to markdown. 2017-06-06 21:50:25 -07:00
Aditya Bansal a712a789fc Migrate integrations/git.html to markdown. 2017-06-06 21:48:54 -07:00
Aditya Bansal a1f24dc6a3 Migrate integrations/mercurial.html to markdown. 2017-06-06 21:48:04 -07:00
Aditya Bansal 6fec949678 Migrate integrations/jira-plugin.html to markdown. 2017-06-06 21:46:46 -07:00
Aditya Bansal 6b86de3a3c Migrate capistrano.html to markdown. 2017-06-06 21:40:28 -07:00
Aditya Bansal 84bbed6c49 Add integration name and display_name to context for rendering. 2017-06-06 21:40:28 -07:00