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

18287 Commits

Author SHA1 Message Date
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
Aditya Bansal 7f15cfea91 integrations: Add download python bindings macro. 
This will be used in various integration docs.
 2017-06-06 21:40:27 -07:00
Aditya Bansal c579a0515b Clean confirm.html to use 4 space and consistent indentation. 2017-06-06 21:28:08 -07:00
Cory Lynch 60b62ac81d typeahead_helper: Add test coverage for highlighting. 
Specificially, the test_highlight_with_escaping, used in
most of our typeaheads.
 2017-06-06 21:19:28 -07:00
Cory Lynch 4056ae9cc9 composebox_typeahead: Fix stream typeahead highlighting. 
Changed the highlighting method used by the stream input field.
The one now in use supports spaces in the input.
Fixes #5211
 2017-06-06 21:19:28 -07:00
Tim Abbott 4efdf85f62 bots: Add test for invalid bot type. 2017-06-06 21:16:27 -07:00
Abhijeet Kaur 60ff82ed7c bots: Add UI for creating different types of bot. 
Add 'Type of bot' option for bots by adding dropdown option in
settings->"Your bots".  For now, this allows creating incoming webhook
bots in addition to default bots.

This will enable users to add a bot as an incoming webhook
(in addition to add full-featured bots).

With various minor tweaks and cleanups by tabbott.

Fixes #2186.
 2017-06-06 21:11:22 -07:00
Sarah 381ec1f5d4 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.

Formatting tweaked by tabbott.
 2017-06-06 20:35:56 -07:00
David Coleman 0be5178759 refactoring: timerender maintains list of objects instead of arrays. 
The function maybe_add_update_list_entry() will push objects instead
of arrays onto the list of timestamps that need updating. This
should improve readability.
 2017-06-06 20:01:21 -07:00
David Coleman 13915740bb refactoring: use class attr to identify timerender date <span>. 
The floating_recipient_bar is cloned from recipient_bar elements.
The cloning created elements in the DOM with duplicate id
attributes, specifically <span id="timerender{id}">, which
contains the date of the message stream. The timerender span
will now use class="timerender{id}" instead.

Fixes #4997.
Fixes #5128.
 2017-06-06 20:01:21 -07:00
David Coleman 01d303da3e message view: show recipient_row_date when floating bar is hidden. 
Force display of the top-most recipient_bar's recipient_row_date
when the floating_recipient_bar is just about to overlap and
becomes hidden while user is scrolling.

Fixes #4844.
 2017-06-06 20:01:20 -07:00
Tim Abbott 27de57b621 docs: Document new user discussion streams. 2017-06-06 17:38:50 -07:00
Tim Abbott 9be2c589bc version: Update following 1.6.0 release. 2017-06-06 17:16:55 -07:00
Tim Abbott 2e9f469c9a Release Zulip Server 1.6.0. 2017-06-06 16:57:10 -07:00
Tim Abbott b286a4210e docs: Update release checklist. 2017-06-06 14:20:13 -07:00
Tim Abbott acc83a3fcc locale: Update a few last translation strings. 2017-06-06 13:57:08 -07:00
Tim Abbott 45c47aff34 travis: Remove unnecessary nvm install step. 
This was needed before Zulip switched to using a pinned node version.
 2017-06-06 13:39:51 -07:00
Tim Abbott 2215af4b57 docs: Add a bunch of documentation on Travis CI. 2017-06-06 13:39:51 -07:00
Tim Abbott 16a54ad837 locale: Update German and Spanish strings. 2017-06-06 12:56:53 -07:00
Tim Abbott f7b604f9be webhooks: Fix unnecessary/buggy translation string. 2017-06-06 11:59:36 -07:00
Tim Abbott 968f65686f locale: Update strings for Zulip 1.6 release. 2017-06-06 11:54:28 -07:00
Tim Abbott ec6abddc38 portico: Remove obsolete code for Zulip open sourcing announcement. 
This was only ever used on the old zulip.com.
 2017-06-06 11:36:03 -07:00
Greg Price 4165c9a62e apps: Link directly to the upstream /apps page. 
Now that this page redirects to upstream, make our own links
to it point directly upstream.  This saves a redirect, and
makes it more transparent where the link points if the user
examines it before following.
 2017-06-06 11:21:20 -07:00
Greg Price 04b363f3a2 apps: Redirect /apps -> zulipchat.com/apps, except on upstream itself. 
This page describes software the user will get from upstream for
their own devices, independent of what's on the server they're
using.  So it should live in a place maintained together with
that other software, rather than be distributed and versioned
with the server.

The use of ZILENCER_ENABLED to tell the difference is rather a hack
but is currently how we do this in the small handful of similar
spots; see #5245.

Fixes #5234.
 2017-06-06 11:21:20 -07:00