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

2002 Commits

Author SHA1 Message Date
Umair Khan 86b75aade2 Django 1.10: Fix i18n tests. 
SimpleCookie does not accept unicode strings and the name of
Simplified Chinese is changed to zh-HANS.
 2016-11-10 16:20:03 +05:00
Tim Abbott 46a601c4c4 Import the user documentation guide into new user docs system. 
This is an import of
https://github.com/brannerchinese/zulip_user_documentation
into the main Zulip repository.  Important changes include:

* Removed trailing whitespace.
* Changed URLs for images to work properly.
 2016-11-09 21:39:55 -08:00
Brock Whittaker 129d88825c messages: Wrap inline code blocks on long lines. 
In 25b28bf82c and then
cb1bc70ab0, we attempted to make long
code blocks scroll in a reasonable fashion, without much success.

This change causes code blocks to be line-wrapped, without needing to
set `overflow-y: hidden` for paragraphs (which cause problems with
taller elements like emoji that overlfowed wrong).  Our octopi finally
have legs again.

It's not clear that this is the final answer, but it's the best
version we've found so far.
 2016-11-09 19:26:45 -08:00
Steve Howell 16e37f8874 Limit compose at-mention typeaheads to realm users. 
Fixes #2240
 2016-11-09 19:20:58 -08:00
Steve Howell 5e51a93688 Change stream_data.remove_subscriber() to accept user ids. 2016-11-09 15:03:08 -08:00
Steve Howell 00068f3164 Extract stream_data.unsubscribe_myself(). 2016-11-09 15:03:08 -08:00
Steve Howell 537a3b8ca8 Change stream_data.add_subscriber() to accept user_ids. 
We no longer require passing in an email to
stream_data.add_subscriber(), since we only track user ids
in stream_data.js.
 2016-11-08 15:49:23 -08:00
Steve Howell a03a7d4c95 peer_remove: Send user_id, not email, for unsubscribe events. 2016-11-08 15:36:29 -08:00
Mohsen Ibrahim 44c8e4c58c streamLinkHandler: render stream links correctly. 
After adding the ability to add stream links to messages using
the following pattern '#**stream_name**' there was a problem
with rendering this using our markdown engine because '**' means
bold text so that would render just to bold text.
To solve this I had to add regular expression in marked.js to match
that pattern and when it matches I call handleStreamLinks in echo.js
which will correctly render it to HTML.

Fixes #2218.

[tweaked by tabbott to url-encode the stream name in the URL and
adding the missing "#" in the display].
 2016-11-08 13:52:31 -08:00
Meena Rajan 30acb23314 bugdown: Add support for strikethrough in markdown processor. 
[Tweaked to move tests to bugdown_data.json, add additional tests, and
add frontend processor support by tabbott]
 2016-11-07 22:26:38 -08:00
Igor Tokarev 07d05390bf markdown: Fix client usermention regular expression. 
Fixes #993.
 2016-11-06 18:37:09 -08:00
umkay f4c621ffe3 admin: Enable admins to toggle supported auth methods via UI. 
Add a table to the administration page that will allow realm admins to
activate and deactivate the supported authentication methods for that
realm.
 2016-11-06 16:29:35 -08:00
Steve Howell debc06b449 Rename subject-name to topic-name and move CSS to left-sidebar.css. 2016-11-05 15:03:29 -07:00
Steve Howell 06fe4bc943 Rename subject_box to pm-box/topic-box. 
I'm not crazy about the names pm-box and topic-box, but they
are less confusing now.
 2016-11-05 15:03:29 -07:00
Steve Howell 43c372bfb6 css: Clean up styles for subject_box. 
These styles are uniform for now, so we don't need a complicated
selector.
 2016-11-05 15:03:29 -07:00
Steve Howell e38b684eea Simplify CSS for topic-sidebar-arrow. 2016-11-05 15:03:29 -07:00
Steve Howell b1f288dddb topic lists: Rename expanded_subject to topic-list-item. 2016-11-05 15:03:29 -07:00
Steve Howell 8b7e9101ca topic lists: Rename expanded_subjects -> topic-list. 2016-11-05 15:03:29 -07:00
Tim Abbott ee361cbe30 js: Eliminate process_loaded_for_unread global. 2016-11-05 11:33:04 -07:00
Tim Abbott d60ec24c1f js: Move set_user_statuses to activity.js initialization. 2016-11-05 11:33:04 -07:00
Tim Abbott 6daf2b1e46 js: Move pointer initialization code out of zulip.js. 2016-11-05 11:33:04 -07:00
Tim Abbott d76f9b09a3 unread: Move consider_bankruptcy into unread module. 2016-11-05 11:33:04 -07:00
hackerkid 70223ef2da [third] Update marked base to newer version 0.3.6. 
This basically re-applies the Zulip changes to marked 0.3.6.

Fixes #2190.
 2016-11-04 21:56:53 -07:00
Brock Whittaker ee8d54db0f Change content to rely on data-* attribute. 
Content now relies on the data-no-description attribute which then
allows for it to be embedded in HTML and therefore translatable.
 2016-11-04 17:26:53 -07:00
Brock Whittaker 4400665a6d subs: Move stream settings into an independent overlay. 
This replaces the scrolling stream settings feature with a stream
settings overlay.
 2016-11-04 17:13:26 -07:00
Tim Abbott 78ec0341c4 subs: Fix color picker issue with subscribing. 2016-11-04 17:13:26 -07:00
Tim Abbott 73f020645f subs: Remove unnecessary update_stream_color call. 
The color was already being updated in the response from the server.
 2016-11-04 16:37:29 -07:00
Tim Abbott a70c5eb923 colorpicker: Migrate to use stream IDs to access things. 2016-11-04 16:37:29 -07:00
Tim Abbott ab6fd87161 subs: Fix rename stream handling of email addresses. 2016-11-04 16:37:29 -07:00
Tim Abbott e6734bfada subs: Cleanup stream rename logic. 2016-11-04 16:37:29 -07:00
Tim Abbott ee976a9bdc subs: Use subscription_settings when changing descriptions. 2016-11-04 16:37:29 -07:00
Tim Abbott 45c7945818 subs: Use sub_settings in subscriber add/remove flow. 2016-11-04 16:37:29 -07:00
Tim Abbott 8e522cd933 subs: Convert stream_home_view_clicked to use sub_settings. 2016-11-04 16:37:29 -07:00
Tim Abbott 2467f765ad subs: Stop using sub_row when rendering settings. 2016-11-04 16:37:29 -07:00
Tim Abbott 16408da823 subs: Cleanup change_stream_privacy. 
We now:
(1) Only look up streams by ID

(2) Correctly look up both the stream-row and subscriptions_row after
the success handler returns.
 2016-11-04 16:37:29 -07:00
Tim Abbott 32a571445a subs: Use settings_for_sub when redrawing privacy stuff. 2016-11-04 16:37:29 -07:00
Tim Abbott b67c0a4ad5 subs: Move settings_for_sub and button_for_sub earlier. 2016-11-04 16:37:28 -07:00
Tim Abbott b1a5d57405 subs: Update get_subscriber_list to use subscription_setings. 2016-11-04 16:37:28 -07:00
Tim Abbott 109287dceb subs: Update descriptions in settings separately from stream rows. 2016-11-04 16:37:11 -07:00
Tim Abbott 7a59ae591a subs: Fix get_stream_name to use IDs from the DOM. 
We haven't added a data-stream-name to the subscription_settings
object yet, and ideally we'd be moving away from using
data-stream-name anywhere.
 2016-11-04 16:16:07 -07:00
Brock Whittaker cc03d2014d subs: Add missing li open/close tags. 
Two elements were sharing the same li element, when they should be
in different elements.
 2016-11-04 13:58:36 -07:00
Brock Whittaker 9b90a47fd6 Change .sub_settings_title to div. 
All the properties they had weren’t being activated because they were
inline elements. Change to div to activate properties.
 2016-11-04 13:55:11 -07:00
Brock Whittaker 7d51b6a454 subs: Create get_stream_name to get stream name from UI. 
This accepts an arbitrary click target in the DOM inside a stream row
or stream settings element and returns the stream name.
 2016-11-04 13:53:12 -07:00
Steve Howell 2088e8420f User user_id, not email, in peer_add events. 2016-11-04 11:37:14 -07:00
Steve Howell 17e39a88ef Remove people.test_set_people_name_dict(). 
We use a cleaner approach to setting up test data in echo.js to
allow us to remove the one call to test_set_people_name_dict().
 2016-11-04 11:37:14 -07:00
Steve Howell 8c47f7f7db Remove people.test_set_people_dict(). 2016-11-04 11:37:14 -07:00
Steve Howell 472f049cae Alphabetize subscription event cases in server_events.js. 
I also split up peer_add and peer_remove into their own cases,
since they do opposite things and didn't share that much code
in common.
 2016-11-04 11:37:14 -07:00
Steve Howell 38f2789152 Remove page_params.email_dict. 2016-11-04 11:37:14 -07:00
Steve Howell 3941334d00 Use user_ids for subscribers in stream_data.js. 
We still shim a lot of methods to keep using emails, but the
internal data structure now has user_ids.
 2016-11-04 11:37:12 -07:00
Steve Howell 7509f73f02 Clean up stream renaming in the JS code. 
We now use stream_id as our key to rename streams, which
should prevent a few race conditions long term.  (We are
still possibly contending with other events that use
stream_name as a key, so this is not perfect.)
 2016-11-04 11:30:18 -07:00