Commit Graph

6795 Commits

Author SHA1 Message Date
Luke Faraone 5c0bcffc97 Depend on nodejs only on local_dev for now.
We need to make sure it's totally drop-in functional on the app servers
before I'd feel comfortable modifying their config.

(imported from commit e42d6e37732d65f827982aabaff9399ec1bda0f2)
2013-10-10 14:14:14 -04:00
Luke Faraone 1d9391e867 Initial local server configuration.
(imported from commit ac9b9896b74b78c6ca03af7f411d0788ae402cff)
2013-10-10 14:14:14 -04:00
Luke Faraone dda89debb2 Move base inclusion to child puppet classes.
(imported from commit 30a55c0ccf835aa6bfc708208914ee1f20352d75)
2013-10-10 14:14:14 -04:00
Allen Rabinovich 83ae9d8f82 Removing old FF hack that broke the gear placement
(imported from commit 89020da2c65b27782282e21a487ff5cdc3db9b68)
2013-10-10 10:47:44 -07:00
Luke Faraone 7d03614a1b Store the feedback bot key in local_settings.py
(imported from commit 3322d8976328db61cd382acb06775c6a6df3fea0)
2013-10-10 11:31:15 -04:00
Steve Howell 89cbda5001 Keep in-progress compose open on narrows.
If the user has text in the compose box, don't close or
change the compose box when they narrow.

(imported from commit f9b400f6bac37cb313f1fd87aadb3ba1d3a035ef)
2013-10-10 11:20:49 -04:00
Steve Howell 8017fc9a15 Move compose.start() calls out of click handlers.
For the two cases where narrowing should open the compose box,
we now put that logic inside of narrow.js.

(imported from commit 570e22e90c2f6d422ba71cce400c075f0b8adf51)
2013-10-10 11:20:49 -04:00
Steve Howell 7007cf203d Move compose.cancel() calls out of click handlers.
Handle closing the compose box inside of narrow.js, to
ensure consistent behavior for all the narrowing UI options.

(imported from commit f17a687491eb2361c73032cd974cedb2a0a2dd85)
2013-10-10 11:20:49 -04:00
Leo Franchi 6e188fb067 Tweak alert_word matches and add some more tests
(imported from commit 63dc4064c15d5d33a7ec0c992b183bf323dd4ee8)
2013-10-10 10:58:21 -04:00
Leo Franchi 08ae641dd2 Pre-fetch data from the DB and hand to markdown thread
We want to avoid opening a DB connection in the markdown thread
as its DB connection might live for a long time

(imported from commit 7700b2ca793ee5e9add7f071b92f22a4bf576b3d)
2013-10-10 10:58:21 -04:00
Steve Howell 62dde61ca4 Fix indentation in trailing_bookend.handlebars
(imported from commit d1a631b39934f984b2603db12b63dbe3db1e12dc)
2013-10-09 17:18:58 -04:00
Steve Howell c68bbaa649 Fix indentation in subscription.handlebars.
(imported from commit 66a3d60fd520b3350600e15a7a23ea86e1d8394c)
2013-10-09 17:18:57 -04:00
Steve Howell ca1264fd0c Fix indentation in compose-invite-users.handlebars
(imported from commit 32e4ad5f80bdc08bc1579c4e528a1c9e4d65f9ef)
2013-10-09 17:18:57 -04:00
Steve Howell de511482a1 Fix indentation in subscription_table_body.handlebars
(imported from commit 7879ebbfc3a74aeb5b7511547627496d658d83ac)
2013-10-09 17:18:57 -04:00
Steve Howell e2213eae9a Fix indentation in message.handlebars
(imported from commit 186bd9506aa6a7d3052f1f96e8af05a22812a636)
2013-10-09 17:18:26 -04:00
Steve Howell 5c4fb277c1 Add tools/check-handlebar-templates.
(imported from commit e9f634be4d3699eb2d4fc12f6311b42ead710427)
2013-10-09 17:16:52 -04:00
Steve Howell a78a1ec36c Use <a> tags for links in the recipient/summary bars.
The main user-facing feature here is that users can open narrows
in new tabs or windows. Internally, it makes the HTML more semantic.

One consequence of making these elements into actual anchor tags
is that clicking on them no longer triggers this logic to
close the compose box when you click outside of it:

        // Unfocus our compose area if we click out of it. Don't let exits out
        // of modals or selecting text (for copy+paste) trigger cancelling.
        if (compose.composing() && !$(e.target).is("a") &&
            ($(e.target).closest(".modal").length === 0) &&
            window.getSelection().toString() === "") {
            compose.cancel();
        }

Instead of patching the above code, I elected to just call
compose.cancel() explicitly in the click handlers for the links
themselves.

We are gonna try to clean up the compose-box behavior globally soon.

(imported from commit c9a01916f1714fe3dd495d25c78cd5e5532105ef)
2013-10-09 17:09:10 -04:00
Kevin Mehall e29855e106 Show floating recipient bar on faded messages.
Trac #1837

(imported from commit 1f90b02a5a07b5ce106ad935a4b1cf18e47a0909)
2013-10-09 16:33:24 -04:00
Luke Faraone 1975a6f693 Cancel a compose if you click on one of the global filters
See trac ticket #1840.

(imported from commit 3e0a781252db575e5c0abb70565919e4cdaa963f)
2013-10-09 15:37:00 -04:00
Allen Rabinovich fe9cc4597f Make settings menu more apparent
(imported from commit 15e5db5c4792d39b54fa5a354f1156cde355160b)
2013-10-09 08:42:54 -07:00
Zev Benjamin 2c4a1912e8 Fix parameters for on_close callback
Some of the older documentation was apparently wrong.

(imported from commit 9ebf9d1a72c8b230563f1883d63c26212eb80e22)
2013-10-09 10:45:38 -04:00
Zev Benjamin 46350c5dd8 codebase: Truncate subjects to 60 characters
(imported from commit db5ba1a8af80f2060aec03b3ba1d9e0f3e75c0b3)
2013-10-08 18:54:03 -04:00
Zev Benjamin 4dbedaf1fb codebase: Fix URLs
(imported from commit 664de2e6ad78d07498c7ad8813049d1e07c5b379)
2013-10-08 18:53:42 -04:00
Tim Abbott 1a7ddd9ea3 Fix UserActivityInterval overlap bug.
The previous version was incorrect in the event that log_time >
last.start + 15.

(imported from commit 56aa619e8c86db1796cf936c2be5224a25ca2e1f)
2013-10-08 17:21:59 -04:00
Tim Abbott 50a4b194af check_user_zephyr_mirror_liveness: Include older zephyr mirror API version.
(imported from commit e96f25e35709ee3ee85cc0c4522f98148cb31926)
2013-10-08 17:21:58 -04:00
Tim Abbott aad13aea04 post-receive: Login as the zulip user when deploying.
(imported from commit 750c3de9dc37ae3bc32964543da26a4d26eb8591)
2013-10-08 17:21:58 -04:00
Tim Abbott ac01b0ed19 git integration: Linkify our commits to point to GitLab.
(imported from commit e8d3c107842680dec9bc6aa84f9548c0f879785d)
2013-10-08 17:21:57 -04:00
Tim Abbott 2b5d036e34 Use events API in our Nagios monitoring scripts
(imported from commit 9b370e420095f17fbb7e9d1e466d51dd2e145de1)
2013-10-08 17:21:57 -04:00
Steve Howell ba6cc6f713 Close input tag in topic_edit_form.handlebars
(imported from commit be7649c0116bbfd31ef94fa78e573732b23d632a)
2013-10-08 17:21:56 -04:00
Steve Howell 5a429b1115 Close div tag in subscription.handlebars
(imported from commit b35dded965d2d6511c613f8c4314ade37f243d56)
2013-10-08 17:21:56 -04:00
Steve Howell 565a1084fa Close input tag in new_stream_users.handlebars
(imported from commit bbc948ec8818b1a64d5d3a6140a71dd1617c560c)
2013-10-08 17:21:55 -04:00
Steve Howell 07d3ef5fe0 Fix stray </b> in message_info_popover_content.handlebars
(imported from commit 2c9b3c07e6eb6f2aac3c11ea27b483dfbd5cd0e8)
2013-10-08 17:21:54 -04:00
Steve Howell 8abe6d6022 Close input tag in message_edit_form.handlebars
(imported from commit 38918888319975e1129d775bf760a08e376bef43)
2013-10-08 17:21:53 -04:00
Steve Howell e12dfc9a84 Close input tag in invite_subscription.handlebars
(imported from commit 0b03e74ce4c9b94f1f360fc369ae5e1b7030bf9f)
2013-10-08 17:21:52 -04:00
Steve Howell 28dbdeeaca Fix bad tags in bot_avatar_row.handlebars
(imported from commit f4b0f2ad0ea575fba9375c1821e098f1b4f012d5)
2013-10-08 17:21:52 -04:00
Steve Howell 3cb19f07bc Fix bad tags in alert_word_settings_item.handlebars
(imported from commit afd0c447a2add728796d1ffeca57564130f04fb5)
2013-10-08 17:21:51 -04:00
Steve Howell 2ae2840659 Fix bad tags in admin_user_list.handlebars
(imported from commit b301a9e7a815514002e9ff163b812b463b25fd60)
2013-10-08 17:21:51 -04:00
Steve Howell ffaa8c4d76 Fix bad tags in message.handlebars
(imported from commit 507d5ce1666e66f613ccef8932c0a51ce3c94aa8)
2013-10-08 17:21:48 -04:00
Steve Howell dfcc974d5f Add </a> closing tags for exterior topic links
(imported from commit c54615088faf712cc5ccaa982c5091b54ccf634d)
2013-10-08 11:39:03 -04:00
Steve Howell 28aefb7a3a Add whitespace/comments to message.handlebars.
I added comments to the section of the template that generates
recipient bars for stream/topic messages.

(imported from commit a7ea9353dc5db20db3410b9566f5e0d670eff31f)
2013-10-08 11:39:02 -04:00
Jessica McKellar 50613af43c Hint on your settings page that you can change per-stream notifications.
Lots of users don't realize you can do this. This commit is probably
not sufficient but is a start.

(imported from commit 730a43c6966b9bc6db1bdd6fb3995953d35ffe89)
2013-10-08 11:10:57 -04:00
Jessica McKellar dbc0c036c3 Update /apps to get the iOS app from the iTunes Store.
(imported from commit 22468bad537ab116f6568d08b0bae83d72e4cb96)
2013-10-08 11:10:53 -04:00
Jessica McKellar 3b7143d3ec Linkify narrows in missed message emails.
This will hopefully incentivize people to click one and get back into
the app.

We'll also need this for digest emails.

(imported from commit 57191c3fcca3b12df93a81e4692bb7eb8ccc83b2)
2013-10-08 10:46:52 -04:00
Jessica McKellar 836f3894fb Add a comment to UserProfile that pointer is a Message.id.
And NOT a UserMessage.id. I kept having to trace the code and convince
myself of this.

(imported from commit 720a982a888dd525e63c37ddfedd28b71492d32e)
2013-10-08 10:46:52 -04:00
Tim Abbott 0f2fa7e59a puppet: Fixup some humbug => zulip rename issues.
(imported from commit 4d83dc2af380cfbae3a1958f98c671c7e8c58f05)
2013-10-08 08:57:30 -04:00
Tim Abbott f9c6b7f2aa Use the 'test: Zulip monitoring' client string for our Nagios stuff.
(imported from commit 02618a4724e1ab64c05f95f60b83b7593b3fe62b)
2013-10-08 08:57:30 -04:00
Tim Abbott c4d28ad76f install-server: Rename local variables to use zulip names.
(imported from commit c2b9409488be9461a4ae41cb0df208b9e3cb799e)
2013-10-08 08:57:30 -04:00
Tim Abbott f3fd1a2c44 [manual] puppet: Rename humbug user to zulip.
(imported from commit 90e517a4a657d2821b371c833e557c2003c9340c)
2013-10-08 08:57:30 -04:00
Tim Abbott 3d89ee20f7 Rename humbug => zulip in tddium integration.
(imported from commit f48dd9f7ddc8221c90373300eedf87077d9e5874)
2013-10-08 08:57:30 -04:00
Tim Abbott 70c666c3c6 [manual] Rename humbug@humbughq.com to zulip@zulip.com.
This requires renaming the account in Google Apps at the time we
deploy this; we'll probably want to do this during off hours to avoid
any user-visible downtime.

This also updates some related email addresses.

(imported from commit fce7629b359a4f278bbf7815c8d177a8fa0484fe)
2013-10-08 08:57:29 -04:00