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

7456 Commits

Author SHA1 Message Date
Waseem Daher 6b0584742f Remove stray <hr> in password reset form. 
(imported from commit 3d233bfaba94514411ace4f638fb34e2b35aae30)
 2013-11-16 12:39:26 -06:00
Tim Abbott 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
Tim Abbott 6497f330ea Fix missing table headers on admin page. 
(imported from commit e5c97838e1b5b11c90384d8c49aa2087fd8fc219)
 2013-11-16 11:35:26 -05:00
Tim Abbott 9e8346f6d7 Display owners for bots on the admin page. 
(imported from commit d1a80ab8f784ab7e7249cc020b1980bd45434abd)
 2013-11-16 11:35:26 -05:00
Tim Abbott b55e406f93 Display deactivated users at the bottom of the admin users page. 
(imported from commit 1a5d5d64fffc9ed7633d468b975dd56c28f85ccf)
 2013-11-16 11:35:26 -05:00
Tim Abbott a78ec1d0d3 get_members_backend: Report a bit more data on users. 
(imported from commit af1c2a30abed4aa2796f0babe311f993965a008b)
 2013-11-16 11:35:26 -05:00
Tim Abbott c1ddc0908f Admin: Put bots in a separate table. 
(imported from commit 21330e28b486e10aff6af5f48280ea675cbd5697)
 2013-11-16 11:35:26 -05:00
Tim Abbott 37bff5974c Add reactivate button after deactivating a user. 
(imported from commit e2ae5692d0ba5237cf5a42c29ed44d9782128110)
 2013-11-16 11:35:25 -05:00
Steve Howell 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
Steve Howell 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
Steve Howell edeb3263c1 Add bots to admin page (and sort humans/bots by name). 
(imported from commit 8a13702b427155b5f4f5102d79ef434e98035600)
 2013-11-16 11:35:25 -05:00
Steve Howell 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
Steve Howell 0b16dfc999 Add /json/users/<email>/reactivate endpoint. 
(imported from commit 7afa29f7718430ea2df7c489ab2af4d93d4ce497)
 2013-11-16 11:35:25 -05:00
Steve Howell bdfd3ed9c2 Add do_reactivate() action. 
(imported from commit fc73d0fdd3a6125b3b31a75c3b108ceb266e528b)
 2013-11-16 11:35:25 -05:00
acrefoot 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
acrefoot bafb6f8dc3 fixup day1/day2 email templates 
(imported from commit 30846fc298d04ac763025e82a60731d158840462)
 2013-11-15 21:51:37 -05:00
acrefoot 1a904185f2 fix path for do_confirm redirect 
(imported from commit d61d8f155fc06fbadc68155f32f510e212adf6c0)
 2013-11-15 21:31:37 -05:00
acrefoot 9616ea7afd remove enqueue_followup_emails management command 
(imported from commit 20ce0b698cf795a6e1c7ff5ba7b546901e1fd8a4)
 2013-11-15 21:31:37 -05:00
acrefoot e77d534e78 remove ALLOW_ARBITRARY_SENDERS_LOCAL_EMAIL 
(imported from commit 7a374959516d8505685466293f146d95094a7ea7)
 2013-11-15 21:31:37 -05:00
acrefoot 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
acrefoot ccb7446d5c move Enterprise Email options into better places 
(imported from commit f205c29b224f31474e2983c7f2bdb1ee5e2c754b)
 2013-11-15 21:31:37 -05:00
Tim Abbott 4116e06c88 Disable signups for realms that exist as part of enterprise deployments. 
(imported from commit 4200b44c7153d1dba674982916ef0470c75bdf6d)
 2013-11-15 19:36:17 -05:00
Jeff Arnold 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
Jeff Arnold 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
Tim Abbott 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
Tim Abbott f941644099 Don't cache templates in development. 
(imported from commit 986df6aecb7e638eb0e017654553e812ac6e0ed2)
 2013-11-15 18:13:09 -05:00
Jessica McKellar 30e4de6767 Freshdesk: fix erroring on unknown statuses by hardcoding FlightCar's. 
(imported from commit 0a4b8ccaa883048fdc7a7d7712cc528194775d89)
 2013-11-15 17:43:55 -05:00
Zev Benjamin 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
Tim Abbott 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
Tim Abbott 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
Tim Abbott 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
Tim Abbott 6826ef4e9a puppet: Switch from nginx to nginx-full. 
(imported from commit 38dd5966d75946842b39e4e619d82ebbb0fb041c)
 2013-11-15 15:04:13 -05:00
Leo Franchi 593485e753 Expose hooks for file upload UI control for desktop app 
(imported from commit c196363a411e0a9c499d9bb694ab539f2ab0e365)
 2013-11-15 14:42:31 -05:00
Steve Howell 220678ae40 Support emojis/bolding/etc. in single-line /me messages. 
(imported from commit c62ae8cf26117e30a029e025021cc4a3a67f4a83)
 2013-11-15 14:34:38 -05:00
Kevin Mehall 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
Jessica McKellar b0209fec05 Don't puke on non-ASCII characters when shelling out to html2text. 
(imported from commit a407c9fb2a090075d5e26b5db00388f4f81de1f5)
 2013-11-15 12:28:30 -05:00
Jessica McKellar 545e2539f8 Use non-ASCII characters in Freshdesk tests, to catch encoding bugs. 
(imported from commit 0cc3ebf3548b28c018d75d51e7e66de5dbb59a0b)
 2013-11-15 12:28:30 -05:00
Zev Benjamin b0d1d774e3 enterprise: Don't include templates/zilencer in our tarballs 
(imported from commit 945a2bd73f1968f06307539bae1c91f977fa0353)
 2013-11-15 11:53:49 -05:00
Zev Benjamin 974159ec94 Move apache2 restart for SSO sites to restart-server 
(imported from commit f999e2b0591a11442c1d3fdba2393ecf6e78bad3)
 2013-11-15 11:34:48 -05:00
Leo Franchi 7f2936a985 Allow enterprise customers to disable name changes 
(imported from commit 1f2039f3e88a4ec0cc48dba75f714563c1de4af8)
 2013-11-15 11:26:10 -05:00
Kevin Mehall b12649e548 Fix browser error markdown formatting 
(imported from commit ce793676d6118d86a8aee4f3aae1bc728b0cd8fd)
 2013-11-15 11:22:58 -05:00
Kevin Mehall 53c76aa657 Move enterprise-registration to zilencer/ from zerver/ 
(imported from commit d8a58913040376dbdbc9dcee13ab8a7910733da7)
 2013-11-15 11:21:52 -05:00
Tim Abbott fce97df972 api: Fix our handling of the --site option. 
Tested that the following all do the same thing after this patch:

--site=https://ls-dev.zulip.net
--site=https://ls-dev.zulip.net/
--site=https://ls-dev.zulip.net/api
--site=https://ls-dev.zulip.net/api/

(imported from commit 785c005e4b4be3621d7d330a0173023ab2c77a4d)
 2013-11-15 11:10:25 -05:00
Tim Abbott 52ca432745 remote_user_sso: Redirect to EXTERNAL_HOST, rather than a relative /. 
This fixes a problem where the desktop app would attempt to load
https://zulip.akam.ai:8888/ after authenticating the user, which fails
with CSS issues.

We should probably, separately, change our Django-under-apache to only
serve the one URL that it needs and redirect the rest back to
Django-under-nginx.

(imported from commit 3e3251863618269790f61b371e88af57b6cfb272)
 2013-11-15 11:10:19 -05:00
Zev Benjamin 878916d301 blueslip: Fix formating of log date strings 
We weren't padding the parts of the time or date.

(imported from commit 6ce68670f603b58592904ddc1f4be820dda135c3)
 2013-11-15 11:00:56 -05:00
Steve Howell 53e3435a77 [customer] Enable single message narrowing for CUSTOMER10. 
(imported from commit 2734315a3b7bd0a872048406b886d197c3c3cad6)
 2013-11-15 10:46:15 -05:00
Steve Howell 788943887a Resize GROUP PMs more aggressively. 
(imported from commit fbef79f2bb544648fcf4ea26e25354a7ed6912df)
 2013-11-14 20:33:50 -05:00
Steve Howell ee28e5e2f6 Relax 80-char limit on status messages (/me). 
(imported from commit e9de2cb6c394f5b764e988e279f0fb3cfd38c6e8)
 2013-11-14 13:51:07 -08:00
Steve Howell 2074573fe2 Make sure GROUP PMs show up without needing a resize. 
(imported from commit 6c6d79fdd5dfe15e508c430baef5043d9d1d2c93)
 2013-11-14 16:30:57 -05:00
Steve Howell 6e19f8b86f Split humans/bots in History tab for realm reports. 
(imported from commit 02e398590f4f844ce30e76703006262296301b97)
 2013-11-14 15:46:10 -05:00