f528ac659d
Only attempt to reorder a message if we had it in the message list originally
...
(imported from commit 0b2802c1f1b6b17cd9f52dd9cecdf84f6f1cf5b0)
2014-01-24 14:01:18 -05:00
b1ac754448
Don't local echo messages that we can't apply locally to the narrow filter
...
(imported from commit 372063352f17caa4990195ace4757bb68c53523a)
2014-01-24 14:01:18 -05:00
063484a917
Only clear the compose box if a message was locally echoed
...
(imported from commit a90a566f61e939e34eab9666743848e47c122400)
2014-01-24 14:01:18 -05:00
5108253e97
nagios: Make Zephyr mirroring alerts not pageable.
...
(imported from commit ab98af762b1edf93703fc865496aedc59ce7bd2d)
2014-01-24 13:53:48 -05:00
e63d9d32e2
Remove an unneeded call to build_stream_list().
...
We were calling build_stream_list() twice in succession for
no good reason. The call to build_stream_list() inside
populate_subscriptions was pulled out to happen right after
its two callers.
(imported from commit 816ae2fd34224d8baf4e4bcccdb670143795bb42)
2014-01-24 12:23:41 -05:00
4015189094
Release page_params.{un,}subbed_info during initialization.
...
(imported from commit 410eeb7978281ae9b9e2a28fe26dcae10a65518d)
2014-01-24 12:23:41 -05:00
b82ed52e7b
Rename page_params.stream_list to page_params.subbed_info.
...
This matches page_params.unsubbed_info, plus it sets up to
add something like page_params.stream_dict without being confusing.
(imported from commit 2d40deb779e5c7a488d6952560b4119094bbc0d8)
2014-01-24 12:23:41 -05:00
ee0f569c59
Don't alert on elevated mail queues during digest sends.
...
(imported from commit 2074b08c0f402c147bfdd1f0a4f0663081d5e55d)
2014-01-24 10:07:26 -05:00
1c67d05e5f
Handle duplicate GCM registrations by dropping the old ones.
...
While we're at it, lets comment up the function so I know what this is
doing next time :)
(imported from commit e745be75fcd6dbce9997e1d73464619fc8b73996)
2014-01-23 19:21:28 -05:00
c01c7285db
Add a test for !modal_link.
...
(imported from commit fac5adf7d596eaca4ea8ed860ddaceb496e72c7a)
2014-01-23 17:06:29 -05:00
ee7a1f0953
tutorial: add helpful in-app links and be consistent with realm welcome message.
...
(imported from commit 2057dbe2606d32721192021ed2046ed9f412d8a7)
2014-01-23 17:06:29 -05:00
086eab8bb5
bugdown: support modal in-app links in messages.
...
(imported from commit 0e3c0ff61cf9a84bae81e37b0a6d79831dea9224)
2014-01-23 17:06:29 -05:00
6aaa11027f
Fix the Desktop App banner covering top links in the left sidebar.
...
Before this commit, while the banner is open you can't click on the
Home link.
(imported from commit 4d41bacc50d8115b4868fbda537c9bd64250040a)
2014-01-23 17:06:28 -05:00
993a20bdee
tutorial: be flexible about the work-focused warm-up message recipient.
...
(imported from commit 190f0cb27dda8cb89c2682affe1daee4248fe846)
2014-01-23 17:06:28 -05:00
117c98796e
Send some messages to warm up the first user in a realm.
...
(imported from commit b4d92d474b27c9a0eabf99576a0f441a7d919106)
2014-01-23 17:06:28 -05:00
a62c720e0e
[manual] Add back json_tutorial_send_message endpoint.
...
Before deploying to staging, create the tutorial bot:
email: welcome-bot@zulip.com
name: Zulip Welcome Bot
(imported from commit 2f337a00ffac888b121975bdb95a89cf2f8ab3a7)
2014-01-23 17:06:27 -05:00
fcd89d5861
tutorial: show content as if in a stream narrow.
...
(imported from commit 716640dd5d0abeafdd8fd2f1b033a6203486a405)
2014-01-23 17:06:27 -05:00
ebd6408ec7
Make the tutorial shorter, and visually highlight important concepts.
...
(imported from commit 543d0ff838edbc2148df4b8d08331c793c7af4f6)
2014-01-23 17:06:27 -05:00
a677db4672
Start users in a narrow to the notifications stream after the tutorial.
...
They'll see the welcome messages they need without being overwhelmed
by the home view.
(imported from commit 195cb4defa1dc0aa5ba8870226036e4dfd111c0f)
2014-01-23 17:06:27 -05:00
7702461700
Unconditionally subscribe new users to the notification stream if it is public.
...
(imported from commit 7d7f14eb6fee43ca6f18adddda741665ce22d24a)
2014-01-23 17:06:26 -05:00
e5a24c2d21
tutorial: tweak Desktop app banner language.
...
(imported from commit 727dd269314092a28b39e43300ee322416e3e18e)
2014-01-23 17:06:26 -05:00
1c9a59fd3f
Add newlines outside code blocks in marked.js to match bugdown
...
(imported from commit 7618260dbfa11209b3cc45d007407476897c2a20)
2014-01-23 16:50:29 -05:00
aee127cdbe
Share bugdown test data across frontend and backend tests
...
(imported from commit b278a60b5899cd336840e71d8e632e2b31338d82)
2014-01-23 16:50:29 -05:00
07dae5fcb9
Locally echo messages that are loaded from storage and resent
...
(imported from commit 474a0994d82bdbff9c98b453d3e1e4dc7732f5bd)
2014-01-23 16:28:59 -05:00
4ac59a71bd
[socket] Persist queued requests across restarts in localStorage
...
(imported from commit a3a7b0c8292c53807d179b343d371eebc11ef10b)
2014-01-23 16:28:59 -05:00
fd4b68aa72
[socket] Save pending and queued requests together
...
(imported from commit aecf59b26938c831da03a6a31545f2522387e67f)
2014-01-23 16:28:59 -05:00
56d9446c41
[socket] Use socket req ids that contain queue ids
...
(imported from commit 781eafe60bf117d79ce3a30deea02ec1e875060a)
2014-01-23 16:28:58 -05:00
24cb5fb079
Add a localstorage.js module
...
(imported from commit 9f3ab248ce84ce296bb1fb918de3b2dd8cde1ded)
2014-01-23 16:28:58 -05:00
e24dcb3952
Report proper displayed/receive time and local echo data
...
(imported from commit 63aba6ef05b1a55d61e975831ebbaa074f8ea74f)
2014-01-23 16:28:58 -05:00
7743aa191c
Pass through local_id and sender_queue_id in non-rabbitmq case
...
(imported from commit 8989225a0943b39e45bd5debe405acb9768acc8c)
2014-01-23 16:28:58 -05:00
439633fd03
More markdown compatibility fixes
...
* Escape " as "
* Enable GFM newlines
* Output a linebreak after <br> in the generated markup
(imported from commit c007ec422054f9fc66a810b66aac70f70a2a1952)
2014-01-23 16:28:58 -05:00
c1442f386f
Local echo messages that mention the sender should be highlighted
...
(imported from commit 58184f00e63fd50ed4a68d12afe0779ae3745749)
2014-01-23 16:28:57 -05:00
86cb451dcb
Render <a> with title and target attributes
...
(imported from commit 0e195db0a3ff1ebe3d567a1ab6408c4a1bfe1e2d)
2014-01-23 16:28:57 -05:00
97a69cbc12
Convert realm filters in client-side markdown parser
...
(imported from commit ef12b9ed28cf0176881d33caa1973fe4d9b90d0b)
2014-01-23 16:28:57 -05:00
b1a6fdf5e2
Add support for realm filters to marked.js
...
(imported from commit cea1720b6535a23469185f0ad2677edd373e7cfb)
2014-01-23 16:28:57 -05:00
c0d56c822f
Use the batched_flag_updater in ui.js as well as zulip.js
...
(imported from commit 6dea64d068d013471baf4022a8041f54da5c111e)
2014-01-23 16:28:57 -05:00
b7b322d8cd
Parse user mentions client side
...
(imported from commit b2919912792b8a02afad45f48e1c8df4783b93a9)
2014-01-23 16:28:56 -05:00
0f8cb25d89
Parse emoji client-side
...
(imported from commit 3bf150d866689b301ee31218cb3d570119b766cf)
2014-01-23 16:28:56 -05:00
0de824f73e
Add a zulip module to marked, which supports emoji and user mentions
...
This is partially inspired by https://github.com/chjj/marked/pull/238
(imported from commit 03b84cde88fc8c2fe31c1003a5ce852cc364733e)
2014-01-23 16:28:56 -05:00
87ce2bd0be
More standardization of client-side markdown parsing
...
(imported from commit bc010d69ee92758481d3645f84f2a68dcafacf7a)
2014-01-23 16:28:56 -05:00
53739622fd
Animate/rotate the retry spinner while retrying local send after failure
...
(imported from commit 13daa2b956baecb8e30fbc5807bcd969eb46a653)
2014-01-23 16:28:56 -05:00
03ceef0c40
Trigger a JS event on the inital load of messages completing
...
(imported from commit 9f1dc0c2f631bdd0a0b020b4b9565ee910e07c98)
2014-01-23 16:28:55 -05:00
34722de1da
Don't allow editing of in-flight locally delivered messages
...
(imported from commit 771ba4910a8f8e50803baa5f7ec75208077ed2dd)
2014-01-23 16:28:55 -05:00
883122b129
Allow editing of locally echoed messages that failed to be sent
...
(imported from commit eff8d55af7a1ff123ed2a2e45e58ff74de96beac)
2014-01-23 16:28:55 -05:00
c3f798297e
Show message failure message on hover of error
...
(imported from commit 8379c3c35c612d3609d2ab378eb6ca2f7ec120b1)
2014-01-23 16:28:55 -05:00
00f64113e9
Support locally echoing messages when sending
...
(imported from commit 00b5c5f9b933d119553c32cadff0f17b9f7c2879)
2014-01-23 16:28:55 -05:00
5b8e46f971
Allow emails in display recipient until local PMs are reified from server
...
(imported from commit 73f87449206c3789a4d74b8f776588d588ef88e1)
2014-01-23 16:28:55 -05:00
835e385b75
[third] Add marked.js, a javascript markdown parser
...
(imported from commit e85d9b50328ce7d31882464fcc283478f7a9f753)
2014-01-23 16:28:54 -05:00
0b2ba855f9
Add helper for rough determination of markdown client-side
...
(imported from commit 3b6439f54e55fbca0f586392d1a0add4d7f694b8)
2014-01-23 16:28:54 -05:00
f5af245c09
Clear compose box immediately after message is sent
...
(imported from commit 07cf0ca34dea1a64c37261e153730a9564281b3b)
2014-01-23 16:28:54 -05:00
Leo Franchi
Tim Abbott
Steve Howell
Jessica McKellar
Luke Faraone