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

9153 Commits

Author SHA1 Message Date
Steve Howell 97511067df Sort imports in test_events.py. 
(imported from commit 85443b002a3e9231a98d0d1cc85a56e949748ea3)
 2014-03-11 13:06:17 -04:00
Jessica McKellar e7ef654b45 [puppet]: Adjust zmirror Nagios checks to be more tolerant of a bad network. 
We get a lot of alerts and sometimes pages due to network blips.

(imported from commit 4766585e71533b8551d49fa61bc4653114a65457)
 2014-03-11 13:06:16 -04:00
Leo Franchi 9d8758557b Use global match in alert word regex to match all matches 
(imported from commit aaec296ad6b18b20c1c2d1cb017cffef8e3e0512)
 2014-03-11 13:06:16 -04:00
Leo Franchi 65b6c80f07 Don't highlight alert words that are in URLs, breaking them 
(imported from commit e20ee33a1687f935482f48f829c19a1606ce6db1)
 2014-03-11 13:06:16 -04:00
Leo Franchi 246a5737e7 Use a message's position not offset() to detect if it's off the bottom of the page 
(imported from commit f7915c567b54ad5fd82daf137f89db566a1b417b)
 2014-03-11 13:06:15 -04:00
Zev Benjamin eda05d23bf Optimize get_occupied_streams 
In a test run with a hand-constructed query, this sped up the query time from
280ms to 50ms.

(imported from commit 8cbe199ca50a487491d13d6d6ef940ea668c1038)
 2014-03-11 13:06:15 -04:00
Zev Benjamin 2090d6ee27 jabber_mirror: Calculate the zulip domain from the client email address 
We were previously calculating it from the zulip_email option, which might not
be set if it is being specified via the config file.

(imported from commit 76866c239ca63ef90a7967c9a6027aeec9be6390)
 2014-03-06 21:59:55 -05:00
Zev Benjamin 27aaa3b1bf Rename mit_to_mit -> same_realm_zephyr_user for uniformity and clarity 
(imported from commit 74063d6c8bb9e9fbf62c24dcd8a18294b8f7b51f)
 2014-03-06 21:59:55 -05:00
Zev Benjamin cc9fe19a9f Special case Jabber mirroring same-realm check for ist.mit.edu 
We can't just check that the realms are the same because ist.mit.edu is an open
realm and uses @mit.edu email addresses.

(imported from commit 7dbaa81cea6e4f82563dfc0cfe67a61fe9378911)
 2014-03-06 21:59:55 -05:00
Waseem Daher 3a8b663eb1 Square off bot avatar. 
(imported from commit 628816b490732e03cca77d721614979ba25da2f3)
 2014-03-06 21:59:55 -05:00
Waseem Daher b5ec6c9958 Delete unused .profile_picture CSS class. 
grepping for it turns up nothing relevant.

(imported from commit c7bb97515c993c0d5ed6de7e4ac9edc99ff83ff2)
 2014-03-06 21:59:55 -05:00
Waseem Daher c359499386 Square off avatars in commit messages. 
(imported from commit 8c2c505e6b84b50b4498f51bbf170e4dea3af39a)
 2014-03-06 21:59:54 -05:00
Waseem Daher b80af20541 Larger emoji. 
(imported from commit 3fb9a5df7fde4cd073f344d9aed5cb16c1b0de71)
 2014-03-06 21:59:54 -05:00
Waseem Daher 96f6939284 Fix a few more unstyled 'cancel' buttons. 
(imported from commit 1d8145fe1576af62b73be0badad9de1b75da816a)
 2014-03-06 21:59:53 -05:00
Waseem Daher d8108f944c Restyle bankruptcy "no" button. 
(imported from commit 86520ec9e0067316d2f737175e59315745be62b7)
 2014-03-06 21:59:53 -05:00
Waseem Daher fb00ee79a0 Fix unstyled button on Settings stream notification propagation. 
(imported from commit ebc046e8d0f29a6bbf64005c70f32522a366fa6b)
 2014-03-06 12:45:06 -05:00
Steve Howell 8f37c3f5fd Tolerate spaces after language in markdown fences. 
See #2357.  We now support `~~~ .py ` with that trailing space.

Note that the test coverage is Python-side only due to
bugdown_matches_marked being set to false, since we don't yet
support language syntax on the client side.

(imported from commit ccd5fcb0eee01478d349161400103480678d7486)
 2014-03-06 10:15:20 -05:00
Waseem Daher 91fb286b0d Properly style integration-edit buttons. 
(imported from commit dbbe831bbc86b24ba37fa9cb06dfdba32a1e8867)
 2014-03-05 17:43:00 -05:00
Waseem Daher ae326c066f Properly style 'Cancel' button in edit dialog. 
(imported from commit 8c63567f7f696175b7293fabe26fea2d9c60a15a)
 2014-03-05 17:33:01 -05:00
Waseem Daher a9f01e382a Switch streams page over to use consistent buttons. 
(imported from commit c4d7f658f361a759a38951349e027ac3e279fe9b)
 2014-03-05 17:23:23 -05:00
Waseem Daher 66ecc7a6f2 Slightly tidy up realm name change 'Save' button on admin page. 
This commit got lost in an earlier rebase.

(imported from commit 36bfad56fc08f443c3721c880cb4dd3427fd0541)
 2014-03-05 16:43:10 -05:00
Waseem Daher 2429ed6eeb Remove old Bootstrap2 button code. 
(imported from commit 1483c549a3d41802755fea4db7229324e1595b42)
 2014-03-05 16:24:55 -05:00
Waseem Daher 095c82ecc4 Actually switch to Bootstrap3-esque buttons. 
(imported from commit ddcecb8c5a63324a666ffe170e2d5a76171776c9)
 2014-03-05 16:24:54 -05:00
Waseem Daher 82dfc7b109 Remove border-radius from Bootstrap3-esque buttons. 
(imported from commit 1c86fb21ab39f8e489481aa0e3f82dc4247364b3)
 2014-03-05 16:24:54 -05:00
Waseem Daher 23155bbbae Rename some class names for Bootstrap2 compatibility. 
(imported from commit 6a9b9a9e431902640651cad0a02b848bd2717fbc)
 2014-03-05 16:24:54 -05:00
Waseem Daher a983a62ad2 [third] Import button CSS from Bootstrap 3.1.1 
(imported from commit 07fea19901d31339d9cb7481f00a6d244b09bdb4)
 2014-03-05 16:24:54 -05:00
Waseem Daher 6ef234ba80 Slightly tidy up realm name change 'Save' button on admin page. 
(imported from commit dfa8d4a08d1e2f505f4edf8b0ef5314da47292a1)
 2014-03-05 16:24:54 -05:00
Allen Rabinovich b343d322fe Fix errant scrollbar in stream list 
(imported from commit 7a70bad72adb5d57ea11e926f48301d2a9cc7fd0)
 2014-03-05 14:14:27 -07:00
Leo Franchi 05d911b913 Allow auto-linked URLs to end with a !, without including the ! in the url 
(imported from commit 26fbf8d8318dc32f31f94f366750521afab94ac5)
 2014-03-05 15:22:05 -05:00
Steve Howell 957486cc95 Fix support for searches like "in:home search:foo". 
Previously, if you searched for "in:home search:foo", we
weren't making "in:home" a public operator, so the back end
wouldn't know to exclude muted messages, but the front end
also wouldn't exclude muted messages, because it assumed
that queries with "search:" in them were fully narrowed by
the back end.

Prior commits made it so that the back end is now capable
of doing "in:home" narrowing, so to get the properly narrowed
results, we simply needed to make in:home be a public operator
in this commit.  We also made in:all be public for convenience,
although it's essentially a no-op.

(imported from commit e4a8b10813b50163c431b1721bd316b676be1b83)
 2014-03-05 14:56:35 -05:00
Steve Howell e7769d9004 Add back end support for in-home/in-all narrows. 
(imported from commit bfa54fbb8c7eaced19e354514536d75c30a24b15)
 2014-03-05 14:56:34 -05:00
Leo Franchi aa9c98ef10 Make the selectable sidebar block width the same width as the overall sidebar 
(imported from commit 078765c03dbc015b22b3cbb12df692573f6b33cd)
 2014-03-05 14:48:54 -05:00
Jason Michalski 30f89f4669 Convert the bot section of the settings page to use bot_data 
(imported from commit 63e6982f96ac46d1cebd2ea16d2a7abc7f8d6597)
 2014-03-05 14:16:20 -05:00
Jason Michalski fa37e91e5c Add admin status to bot_data 
(imported from commit 47b84b3ef1e97e355dee84f0595e94a4612bf4df)
 2014-03-05 14:16:20 -05:00
Jason Michalski 3f6e53db6e Add bot_data module that updated with events 
(imported from commit b0bd714258132fc81db763d316a15f5a81b1f4ff)
 2014-03-05 14:16:20 -05:00
Jason Michalski 86175e8627 Add events for bots disabling bots 
(imported from commit 9de3410555a45038c31341b3857782ffc8246cf7)
 2014-03-05 14:16:20 -05:00
Jason Michalski 0165da405f Add events for bot default_events_register_stream changes 
(imported from commit 143ed5b110a7f3b37f145dcd3fbe9133a183c7ec)
 2014-03-05 14:16:20 -05:00
Jason Michalski f66d864f45 Add event for bot default_sending_stream changes 
(imported from commit 7a859cf9f51b6ec1bacb1e3b3cfa9da2c6fbf32f)
 2014-03-05 14:16:20 -05:00
Jason Michalski b5ca2631e6 Add event for bot default_all_public_streams changes 
(imported from commit f189fb6692cb8c833cc2a1951ad8a4695cc4c27f)
 2014-03-05 14:16:20 -05:00
Jason Michalski 3772344e2d Add events for bot avatar_url changes 
(imported from commit c058386ce5ef9d89165c44fd853808cfe1f625f4)
 2014-03-05 14:16:20 -05:00
Jason Michalski 280575aff0 Refactor json_set_avatar and patch_bot_backend to use do_change_avatar_source 
(imported from commit eba0ff8a5c4409ac01c710455fe200b28f953b56)
 2014-03-05 14:16:20 -05:00
Jason Michalski c0d104c110 Add events for bot api_key changes 
(imported from commit 44e4e374ee4951c4d984c009ef7af825985fabbf)
 2014-03-05 14:16:20 -05:00
Jason Michalski 64ba85aa19 Refactor regenerate_api_key and regenerate_bot_api_key to use do_regenerate_api_key 
(imported from commit 5c54e4771b6730a8ebe304f6b6e86722d28eca8d)
 2014-03-05 14:16:20 -05:00
Jason Michalski b161f4cff9 Add events for bot full_name changes 
(imported from commit 7a8945982a060b208c5459a2b3d130eb84a72922)
 2014-03-05 14:16:19 -05:00
Jason Michalski c17ed8dc8c Add bots to page_params and send events on bot creation 
(imported from commit ce418b4f056576d57f82d26af621473c730c12d8)
 2014-03-05 14:16:19 -05:00
Jason Michalski 494868d21d Group bot stream options lists by public/private 
(imported from commit 940319a25edfd1943d78ff95542ffda6f482a40b)
 2014-03-05 14:16:19 -05:00
Jason Michalski f82cbe855f Support editing a bot's default streams 
(imported from commit 72ceb5152745ddfcc22dfd929904927950bf46e4)
 2014-03-05 14:16:19 -05:00
Jason Michalski eebbf0d4ee Show the new bot's default stream settings in the edit view 
(imported from commit d6f1872e0dedd57ebde31da2caf075804195dfb0)
 2014-03-05 14:16:19 -05:00
Jason Michalski eb1032c9c2 Add UI to set "all public" default to during bot creation 
(imported from commit ec03ccdce309c9fbe866343368044b00ea0f5b81)
 2014-03-05 14:16:19 -05:00
Jason Michalski 17b579911e Add UI to set listen on stream during bot creation 
(imported from commit b481a55c16f853766c82883b4c6c86de5c87759e)
 2014-03-05 14:16:18 -05:00