paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 01:16:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,690 Commits 30 Branches 160 Tags
3422766c25c20f638b10cde1e8fd3c7c0684d69c
Commit Graph

26690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eeshan Garg
4f98a45507 docs: Rename "webhooks" to "incoming webhooks". 
I only renamed references that I thought were absolutely necessary
and only if the resulting sentence structure wasn't awkward.

If the renaming resulted in awkward structure, I replaced the term
"webhook" with "integration" (but only in some very obvious cases).

Fixes #9500.
 2018-05-30 18:21:13 -07:00
Steve Howell
8abaca1457 minor: Turn HTML comment into template comment. 
We don't need to send comments about our portico
setup over the wire.
 2018-05-30 18:12:34 -07:00
Steve Howell
c0a9eb19fd poll widget: Clear input after adding an option. 2018-05-30 18:11:03 -07:00
Steve Howell
f1877d8fdb poll widget: Prevent blank poll options. 2018-05-30 18:11:03 -07:00
Steve Howell
d67c323c01 poll widget: Add very basic styling. 
These styles aren't great, but they're hopefully
better than none at all and inspire a follow up
commit from somebody else (so it starts to look
like a "real" feature instead of feeling completely
proof-of-concept).
 2018-05-30 18:10:59 -07:00
Akash Nimare
873cd23811 desktop: Update app version to v2.3.2. 2018-05-30 15:08:06 -07:00
Steve Howell
7305d4f652 submessages: Add update_message() function. 
We want to update message.submessages for new events, even
though our couple of widgets (poll/tictactoe) that can process
"update" events currently just apply events as "deltas"
to their current data.

This does fix a subtle issue where you may get incoming
events for a message that the client knows about but which
it hasn't yet activated as a widget.  Up until now,
we've rarely seen the bug that's fixed here, since it's
usually the case that as soon as we receive a message, we
widgetize it right away.
 2018-05-30 14:47:36 -07:00
Steve Howell
8b08772128 minor: Introduce submsg variable in a couple places. 
We also pass in the submessage id to handle_events.
 2018-05-30 14:47:36 -07:00
Steve Howell
554883e039 submessages: Add submessage_id to submessage event. 
It's useful to have the submessage_id so that widgets
can in theory sort all the events (and not have to rely
on them arriving in sequence).
 2018-05-30 14:47:36 -07:00
Tim Abbott
d947ada4da stream_creation: Improve documentation link pointing to help center. 2018-05-30 14:46:31 -07:00
Tim Abbott
984da1f3b1 stream creation: Remove the bullhorn symbol for announcement. 
It felt a bit awkward with the adjacent content.
 2018-05-30 14:41:44 -07:00
Tim Abbott
555d3128d8 templates: Rename the stream creation form template. 
"subscription creation" was a pretty confusing name for this.
 2018-05-30 14:29:37 -07:00
Shubham Padia
214ce1ccca streams: Add create and edit ui for is_announcement_only. 
The user can now specify the value while creating a stream.
An admin can later change it via `Change stream permissions`
modal. Add is_announcement_only to subscription type text.
 2018-05-30 14:22:15 -07:00
Shubham Padia
518764b843 streams: Change stream-privacy-model save button text to Save changes. 2018-05-30 14:18:41 -07:00
Shubham Padia
bb8ad15fa9 streams: Set is_announcement_only when creating streams. 
Adds is_announcement_only to create_stream_if_needed and
add_subscriptions_backend.
 2018-05-30 14:17:33 -07:00
Tim Abbott
bab09a6579 stream_types: Suggest private, shared history before protected history. 
This feels like the more common use case for most users.
 2018-05-30 14:17:32 -07:00
Tim Abbott
ee45125f82 stream_types: Change descriptions of stream privacy models. 2018-05-30 14:17:00 -07:00
Steve Howell
bfc13ecea4 submessages: Just send content for submessage events. 
For some reason in my original version I was sending both
content and data to the client for submessage events,
where data === JSON.parse(content).  There's no reason
to not just let the client parse it, since the client
already does it for data that comes on the original
message, and since we might eventually have non-JSON
payloads.

The server still continues to validate that the payload
is JSON, and the client will blueslip if the server
regressses and sends bad JSON for some reason.
 2018-05-30 13:53:11 -07:00
Steve Howell
d76450a117 node tests: Test submessage.handle_event(). 2018-05-30 13:53:11 -07:00
Steve Howell
de7f147cd9 minor: Remove blueslip call in submessage.handle_event. 2018-05-30 13:53:11 -07:00
Steve Howell
a6e7520819 node tests: Use run_test helper in submessage.js. 2018-05-30 13:53:11 -07:00
Shubham Dhama
5ce58d3cc5 Revert "i18n: Revert pieces of recent settings changes." 
This reverts commit ef9681caa3.
 2018-05-30 23:52:09 +05:30
Shubham Dhama
19bee9ed52 settings_ui: Move settings_ui.strings to top-level. 2018-05-30 23:36:16 +05:30
Shubham Dhama
b002ef26b7 i18n: Fix reference error for localstorage. 2018-05-30 23:28:21 +05:30
Shubham Dhama
d6c2160a3d admin: Move 'admin_settings_label' to top-level. 2018-05-30 23:28:21 +05:30
Shubham Dhama
402bd4a4c6 settings_org: Move 'time_limit_dropdown_values' to top-level. 2018-05-30 23:28:18 +05:30
Shubham Dhama
0caf55f2f0 settings_bots: Move bot_creation_policy_values to top-level. 
Since ensure_i18n is dead we don't need to explictly load them.
 2018-05-30 23:25:02 +05:30
Shubham Dhama
d1bfb59872 home: Make translations load before app bundle. 2018-05-30 23:20:57 +05:30
Rhea Parekh
25ac6e812f Matrix: Create 'install-matrix' macro. 
'install-matrix' is used twice, in 'integrations/irc.md'
and 'integrations/matrix.md'. Hence we create a macro for
it.
 2018-05-30 10:47:02 -07:00
Rhea Parekh
dffb23afc2 Matrix: update the integration documentation. 2018-05-30 10:47:02 -07:00
Rhea Parekh
e2f2ea7248 test_export: Add tests for 'do_export_user'. 2018-05-30 10:28:10 -07:00
Rhea Parekh
74cc07bb2f test_export: Add tests for export of files. 
Thanks @Zachary-Jackson for some preliminary work
on this.
 2018-05-30 10:28:10 -07:00
Tim Abbott
ef9681caa3 i18n: Revert pieces of recent settings changes. 
Apparently, i18n isn't declared/exported at module load time, so we
still need some of these gymnastics.

Sorry for the sloppy merging!
 2018-05-30 10:10:46 -07:00
Tim Abbott
8c100f45f0 docs: Update development environment docs for Ubuntu bionic. 
We also clean up some flows in the documentation that were somewhat
confusing that I noticed while working on this.
 2018-05-30 10:00:41 -07:00
Tim Abbott
5a35507a7a success-http-headers: Add X-Frame-Options. 2018-05-30 09:41:50 -07:00
Tim Abbott
f8e8d1fb27 upload: Suppress coverage warnings for now. 2018-05-30 09:31:47 -07:00
Tim Abbott
afdfdf775c nginx: Set X-Frame-Options header to DENY. 
While there are legitimate use cases for embedded Zulip in an iFrame,
they're rare, and it's more important to prevent this category of
attack by default.

Sysadmins can switch this to a whitelist when they want to use frames.
 2018-05-30 09:24:17 -07:00
Tim Abbott
bbcdf8ca99 upload: Fix logic for orientation when uploading avatars. 
The previous logic was broken for an avatar without exif data.
 2018-05-30 09:22:36 -07:00
Tim Abbott
3f0a1e7c54 translations: Clean up indentation for initialization code. 2018-05-30 09:14:20 -07:00
Tim Abbott
d9347dea3e i18n: Remove now-unused ensure_i18n function. 2018-05-30 09:13:48 -07:00
Tim Abbott
269b5202d9 gear_menu: Remove now-unnecessary ensure_i18n call. 2018-05-30 09:13:12 -07:00
Tim Abbott
00411e712f settings: Remove now-unnecessary ensure_i18n gymnastics. 2018-05-30 09:12:22 -07:00
Tim Abbott
276b70ffb8 subs: Remove now-unnecssary call to ensure_i18n. 2018-05-30 09:10:43 -07:00
Tim Abbott
c5b4dacd3b info_overlay: Remove unnecessary ensure_i18n call. 2018-05-30 09:09:17 -07:00
Tim Abbott
04b0e225c7 unread_ui: Remove now-unnecessary ensure_i18n call. 2018-05-30 09:07:49 -07:00
Tim Abbott
b88ec552cf settings_notifications: Remove now-unnecessary ensure_i18n. 2018-05-30 09:06:59 -07:00
Tim Abbott
a087b34f12 drafts: Eliminate now-unnecessary ensure_i18n. 2018-05-30 09:06:13 -07:00
Tim Abbott
a1f5fe4f92 settings_ui: Remove now-unnecessary ensure_i18n. 2018-05-30 09:05:46 -07:00
Tim Abbott
41b1dcbfe0 settings_org: Eliminate now-unnecessary ensure_i18n. 2018-05-30 09:03:34 -07:00
Tim Abbott
1e6564308f settings_toggle: Remove now-unnecessary ensure_i18n. 2018-05-30 09:02:29 -07:00