ae77b98155
DRY up East Coast time formatting.
...
(imported from commit b5b5787816c2dc641bbe4cfb351f4ff765e44969)
2013-11-18 12:36:24 -05:00
dd53b92efc
Add row_class support to /activity tables.
...
(imported from commit 69dcbeccc3b048053b2dcca82c628b0cfccddfbb)
2013-11-18 12:36:24 -05:00
818ef42d05
Show zulip-desktop-sso package for local server installs
...
(imported from commit d0a05bfb2e7a15c02c0e61d6b95ef841a44340b3)
2013-11-18 12:04:43 -05:00
b78fa0857f
Allow overriding the default avatar image
...
(imported from commit 66d413682a822e0019f28033f19908bdd9fa0156)
2013-11-18 11:48:53 -05:00
3a4b576135
Add a directory for enterprise admins to add static files.
...
For things like custom default avatars that shouldn't be overwritten
on update.
(imported from commit 2487d2532a5255b91bff956fdfb0d885cb786701)
2013-11-18 11:48:53 -05:00
a63f4284f0
Allow enterprise deployments to disable the use of Gravatar.
...
(imported from commit 49c14cc7629f2ffe6cedaab5d42ad5bf7f6569a4)
2013-11-18 11:48:53 -05:00
9cba43d49c
GitHub: Always report the topic as 'GitHub' for customer14.invalid.
...
(imported from commit d9d35f4dcabf6246b1c9bc623a01bc68e1142b35)
2013-11-18 11:44:25 -05:00
5c6a85f99a
socket: Change path for 'not yet authenticated' error messages
...
(imported from commit 826d3a0ea9084644810a00a14f2f19936e21118c)
2013-11-18 11:42:57 -05:00
319852c60e
socket: Fix keyword argument name for error logging
...
(imported from commit e61eace1aa48fe17d5d2338f7990e32d3404d390)
2013-11-18 11:42:57 -05:00
c66cea8ffc
Remove margin that was above Home link.
...
(imported from commit edcbee9a8bdf5c387641199b09880e4111fc9f0a)
2013-11-18 10:44:04 -05:00
be48e6ab15
Update paths to rss-bot.
...
(imported from commit ab6ea5e881593c8533680323bf525faacc2ddfec)
2013-11-18 08:11:06 -05:00
6971a0f4cc
Fix rss-bot parsing of feeds that don't specify a post ID.
...
(imported from commit 67fdb8b92b39fc14c81b87b7fa8089964c07be8b)
2013-11-18 08:11:06 -05:00
35dd1153ea
Don't use a spinner in the "Create bot" form.
...
Just disabling the button with a status message is probably
sufficient.
(imported from commit dd46e5ac3d2224d84dc32d057469c434007001fa)
2013-11-16 13:03:56 -06:00
dd6f1c981f
Properly align "create bot" button on settings form.
...
Also move the "Adding bot..." spinner a little.
(imported from commit 65aa869e71a33a23f77d8bb054bbd0fe8e6a7de2)
2013-11-16 12:53:39 -06:00
5327e41156
Reindent settings page bot form.
...
There are no changes here, just whitespace changes.
(imported from commit 2681e22ac6a3d256ffbed0a747d1eda57e7fd149)
2013-11-16 12:43:14 -06:00
6b0584742f
Remove stray <hr> in password reset form.
...
(imported from commit 3d233bfaba94514411ace4f638fb34e2b35aae30)
2013-11-16 12:39:26 -06:00
f3fa78d30c
Rename do_[rd]activate to do_[rd]activate_user.
...
For similarity with do_activate_user.
(imported from commit 2874af84dbe1ce666de10e0d8ffe2daa8bad9731)
2013-11-16 11:35:26 -05:00
6497f330ea
Fix missing table headers on admin page.
...
(imported from commit e5c97838e1b5b11c90384d8c49aa2087fd8fc219)
2013-11-16 11:35:26 -05:00
9e8346f6d7
Display owners for bots on the admin page.
...
(imported from commit d1a80ab8f784ab7e7249cc020b1980bd45434abd)
2013-11-16 11:35:26 -05:00
b55e406f93
Display deactivated users at the bottom of the admin users page.
...
(imported from commit 1a5d5d64fffc9ed7633d468b975dd56c28f85ccf)
2013-11-16 11:35:26 -05:00
a78ec1d0d3
get_members_backend: Report a bit more data on users.
...
(imported from commit af1c2a30abed4aa2796f0babe311f993965a008b)
2013-11-16 11:35:26 -05:00
c1ddc0908f
Admin: Put bots in a separate table.
...
(imported from commit 21330e28b486e10aff6af5f48280ea675cbd5697)
2013-11-16 11:35:26 -05:00
37bff5974c
Add reactivate button after deactivating a user.
...
(imported from commit e2ae5692d0ba5237cf5a42c29ed44d9782128110)
2013-11-16 11:35:25 -05:00
f5093ddc50
Clean up admin_user_list.handlebars.
...
The inactive flag wasn't really supported, and the
activation_toggle_button class was misleading, since
we don't yet toggle in both directions.
(imported from commit 0c8511021dd580c86df4e80092a6dd49e32773f9)
2013-11-16 11:35:25 -05:00
1144e0b3f9
Update active_user_dicts_in_realm cache when touching is_active flag.
...
(imported from commit c9407e2c18dcfcc7a4b1ec79c471f825dff04b1e)
2013-11-16 11:35:25 -05:00
edeb3263c1
Add bots to admin page (and sort humans/bots by name).
...
(imported from commit 8a13702b427155b5f4f5102d79ef434e98035600)
2013-11-16 11:35:25 -05:00
aa87335c7f
Remove dead code in admin.js.
...
We had people_list-related code left over from before we
started using realm_people_dict.
(imported from commit f77c441269f07db2a8998c2184de81f9d0c053d6)
2013-11-16 11:35:25 -05:00
0b16dfc999
Add /json/users/<email>/reactivate endpoint.
...
(imported from commit 7afa29f7718430ea2df7c489ab2af4d93d4ce497)
2013-11-16 11:35:25 -05:00
bdfd3ed9c2
Add do_reactivate() action.
...
(imported from commit fc73d0fdd3a6125b3b31a75c3b108ceb266e528b)
2013-11-16 11:35:25 -05:00
5d14105d1f
/hello is sacred, even on Zulip Enterprise
...
I broke Zulip Enterprise because I tried to make the /hello link in our day1 email
point to the local server (EXTERNAL_HOST).
(imported from commit 70262b34474ae292ecf9cfe59bebc3c7de904926)
2013-11-15 22:34:24 -05:00
bafb6f8dc3
fixup day1/day2 email templates
...
(imported from commit 30846fc298d04ac763025e82a60731d158840462)
2013-11-15 21:51:37 -05:00
1a904185f2
fix path for do_confirm redirect
...
(imported from commit d61d8f155fc06fbadc68155f32f510e212adf6c0)
2013-11-15 21:31:37 -05:00
9616ea7afd
remove enqueue_followup_emails management command
...
(imported from commit 20ce0b698cf795a6e1c7ff5ba7b546901e1fd8a4)
2013-11-15 21:31:37 -05:00
e77d534e78
remove ALLOW_ARBITRARY_SENDERS_LOCAL_EMAIL
...
(imported from commit 7a374959516d8505685466293f146d95094a7ea7)
2013-11-15 21:31:37 -05:00
daffe049ad
Don't use hardcoded noreply@zulip.com, zulip@zulip.com, or https://zulip.com
...
(imported from commit 1132553b63ae23ebcca746f0f65205b97bfee7dc)
2013-11-15 21:31:37 -05:00
ccb7446d5c
move Enterprise Email options into better places
...
(imported from commit f205c29b224f31474e2983c7f2bdb1ee5e2c754b)
2013-11-15 21:31:37 -05:00
4116e06c88
Disable signups for realms that exist as part of enterprise deployments.
...
(imported from commit 4200b44c7153d1dba674982916ef0470c75bdf6d)
2013-11-15 19:36:17 -05:00
d0622e796c
Simplify the UI by removing the user's own name and avatar
...
(imported from commit 60d6ff1d677e3efe31e68df2c4387ddd2bd8084d)
2013-11-15 18:48:51 -05:00
a9a4b018d0
Simplify the UI by removing the word narrow from the search bar
...
(imported from commit 46890e4bfded5ce67adc3f2cd0c68820a052c6d0)
2013-11-15 18:41:02 -05:00
259dca9508
puppet: Merge the ports.conf into zulip-sso.example.
...
This makes us not blow away a customer's ports.conf configuration on
upgrade if they needed to change it while setting up their SSO.
Also we change the NameVirtualHost line to better match the
VirtualHost line.
(imported from commit fd52e00c35afa8982e0377859ad794085ec2af80)
2013-11-15 18:13:09 -05:00
f941644099
Don't cache templates in development.
...
(imported from commit 986df6aecb7e638eb0e017654553e812ac6e0ed2)
2013-11-15 18:13:09 -05:00
30e4de6767
Freshdesk: fix erroring on unknown statuses by hardcoding FlightCar's.
...
(imported from commit 0a4b8ccaa883048fdc7a7d7712cc528194775d89)
2013-11-15 17:43:55 -05:00
a363b7185d
restart-server: Use 'all' instead of specifying the supervisor jobs to operate on explicitly
...
This shaves about 1.5 seconds off our restart time on ls-dev (9s ->
7.5s). Still too slow, but it's a little bit better.
(imported from commit acef4c0027b77053497ef6e9f7aa4b61703205c3)
2013-11-15 15:23:02 -05:00
337c22f9e1
Fix redirects landing newly registered users at :8888/accounts/do_confirm.
...
This is similar to the related issue we had with the remote_user_sso
codepath.
(imported from commit 5c2c99be9699a1bce88c4a7de15dae4348fc7967)
2013-11-15 15:04:13 -05:00
1b009c47fc
Clean up our nginx configuraiton to make better use of app.d.
...
Now app.d is something that any app frontend will read, and we just
have secondary manifests add additional files to the app.d directory
for custom stuff.
This fixes the issue that we were incorrectly including the
lb0-related app configuration in the enterprise version.
(imported from commit dec8dcdf2506b82e51186ff936c26dc1cd6cf61b)
2013-11-15 15:04:13 -05:00
2e5eec5bd3
install: Remove apache restart from install process.
...
We don't use apache in the main app -- only for the SSO situation --
this code was just copied from our own install script. And it caused
problems at CUSTOMER13 because they installed Apache in preparation for
the SSO integration, but restarting it failed.
(imported from commit 3f2961574134847c836e8b69736f60d9f8790201)
2013-11-15 15:04:13 -05:00
6826ef4e9a
puppet: Switch from nginx to nginx-full.
...
(imported from commit 38dd5966d75946842b39e4e619d82ebbb0fb041c)
2013-11-15 15:04:13 -05:00
593485e753
Expose hooks for file upload UI control for desktop app
...
(imported from commit c196363a411e0a9c499d9bb694ab539f2ab0e365)
2013-11-15 14:42:31 -05:00
220678ae40
Support emojis/bolding/etc. in single-line /me messages.
...
(imported from commit c62ae8cf26117e30a029e025021cc4a3a67f4a83)
2013-11-15 14:34:38 -05:00
fe0dcd4313
Disable camo on enterprise.
...
CUSTOMER13 doesn't want it, and there's currently no nginx config
or configurable Camo URI, so it wouldn't work if image preview
were enabled.
(imported from commit 615d4a32acbc4d4d590f88cf4e7d45d8f49db1d3)
2013-11-15 14:27:16 -05:00
Steve Howell
Leo Franchi
Kevin Mehall
Jessica McKellar
Zev Benjamin
Tim Abbott
Waseem Daher
acrefoot
Jeff Arnold