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

35 Commits

Author SHA1 Message Date
Jason Michalski 4c90392261 [schema] Add an per-user option to disable notification on new streams 
Added a default_desktop_notifications boolean to userprofile with a UI
in Zulip Labs. This flag is used to default the notification flag on new
subscriptions.

(imported from commit a25223cc5ecf09980cf877991e25034bb3fd4046)
 2014-01-16 20:13:34 -05:00
Waseem Daher 9b58aef815 Reindent settings page. 
When examined with 'git diff -w', this should basically be a no-op.

(imported from commit 99bdaca61eae84772b4d5deb12adc2af73233e97)
 2013-12-16 10:43:49 -05:00
Waseem Daher fa17fb0da1 Place "autoscroll" option in a "Zulip Labs" section. 
(imported from commit 31e8d0b5c1454932398cf732c0c4ad0702e5274b)
 2013-12-16 10:43:49 -05:00
acrefoot 07501cd12c only show 'auto-scroll forever' setting for zulip.com and customer28.invalid 
(imported from commit 329ea6a4f715a093a1ab56777964ca751300ac0c)
 2013-12-13 11:50:11 -05:00
acrefoot 1bd420f12c Show auto-scroll forever setting in /#settings 
(imported from commit fa66cbe52836f230e551f25c47bd755b705387d2)
 2013-12-13 11:50:11 -05:00
Jessica McKellar c46e5fd0f1 Feature flag the digest emails setting to staging. 
(imported from commit 1239ce31281850dccf8f65d0c7156bd2c86ca3a7)
 2013-12-02 18:58:04 -05:00
Jessica McKellar c1058355f6 Add a digest emails checkbox to your settings page. 
(imported from commit cf1dbae6ca30d2489a77e822c34941a986b93bbd)
 2013-12-02 18:58:03 -05:00
Allen Rabinovich 1d4a92ec0e Layout fixes for settings page 
(imported from commit 5bb99ee33b22625ad4101daf08ae36118d190b8f)
 2013-11-22 14:54:24 -08:00
Leo Franchi 9ca8288918 Do not use display: none on file inputs, as some browsers will not let you trigger clicks on them 
(imported from commit f05b18f7ad3f4235d33a1142db7e662f97eff308)
 2013-11-19 12:35:11 -05:00
Waseem Daher 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
Waseem Daher 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
Waseem Daher 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
Kevin Mehall 4a6b7cb20b Disable password change when SSO is the only login option 
(imported from commit fd1a14237e2d6ea574331ed178bfc0db5beb18c6)
 2013-11-12 10:37:33 -05:00
Waseem Daher 66a0119929 settings: Make password reset more discoverable. 
You need your password to log into the mobile apps, and it's kind
of hard to find where to reset it if you don't remember it (but
logged in via SSO)

(imported from commit fd902bcd0c21d7cb308535722e6789fb4a6114cd)
 2013-11-06 13:22:00 -05:00
Steve Howell 7cf66b5bb8 Allow users to upload avatars on the Settings page. 
We were using Gravatar for user avatars, but now users can
upload their avatars directly to Zulip, and we will store
their avatar for them.  This removes the old Gravatar-related
interface and polling code.

This commit does not attempt to update the avatars in
messages that have already been loaded, either for the user
making the change or other users.

(imported from commit 301dc48f96f83de0136c93de57055638c79e0961)
 2013-10-29 10:59:41 -04:00
Steve Howell af6de2053e Give Notifications settings its own alert area. 
(imported from commit 1d17b85f383862d1f37b5750af40aa8d9a1d8bf2)
 2013-10-29 10:59:41 -04:00
Steve Howell 68942a8f3a Properly split up "Your Account" and "Notifications". 
The "Your Account" and "Notifications" boxes on the Settings
page each had their own border and their own "Save changes"
button, but they were within the same form and sending to the
same back end point.

This commit creates a separate form and endpoint for each
of the two boxes.

(imported from commit 04d4d16938f20749a18d2c6887da3ed3cf21ef74)
 2013-10-29 10:59:41 -04:00
Steve Howell 3494ce6ebc Start to clean up settings.html. 
Check that settings.html has at least balanced tags, and
automate the checking of those tags.

(imported from commit 35e9be269caa211803d64f2b54cb0287e13707b3)
 2013-10-29 10:59:41 -04:00
Leo Franchi 05564ec0e2 [schema] Add a config option for enabling/disabling push notifications 
(imported from commit 5649188cd5e0e4edb6e71559ec7d7fc5e92efaf8)
 2013-10-24 14:54:30 -04:00
Allen Rabinovich 3a5276aa4e Settings page changes 
Bug fixes

Small fix to integrations and api links

(imported from commit 5944b175fbe0fdc4fdb5ecb3cab4e333127ca353)
 2013-10-22 23:28:46 -07:00
Jessica McKellar 0dddd80b2b settings: Indicate that bot avatars are optional. 
(imported from commit 6603ca8b73286587d9cac0f44097129a2c341d1f)
 2013-10-14 13:15:11 -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
Steve Howell 498523b278 Remove stray hr tag 
(imported from commit 2a7f8a8a960d4651ad386dad7242c92f074a566b)
 2013-10-05 18:17:37 -04:00
Steve Howell 0bd06311f0 Move alerts to the bottom of the settings page. 
(imported from commit 310f8f29f6ca46ebc2ddb9c30098442a6607255a)
 2013-10-05 15:50:04 -04:00
Jessica McKellar 0d55be1e65 Add links to /integrations and /api from the bots section of your settings page. 
This is one effort to make them more discoverable.

(imported from commit e07e49e8dbcfcf085550f9732ba48392819cd546)
 2013-09-18 13:02:55 -04:00
Leo Franchi 663fd4653f Feature-flag alert words to staging + reddit 
(imported from commit 1fe9c596b26ce6676514719e4ed2e185108685cb)
 2013-09-05 10:21:39 -04:00
Leo Franchi 802ea78fb0 Add a settings option to configure per-user alert words 
(imported from commit b24d352fffdde13f2cf0467b31c706ebf0534d6a)
 2013-09-05 10:18:41 -04:00
Leo Franchi c62c6359af Slightly shrink size of headers on settings page 
(imported from commit d3471c641fb58dba18db6c1a8363bb268f5e8c74)
 2013-09-05 10:18:40 -04:00
Scott Feeney e1b82b03e5 Fix unescaped & in markup 
(imported from commit b0d9f9ce825b04a444a947b17d98b15c63aa6c8e)
 2013-08-27 15:32:20 -04:00
Allen Rabinovich 0b78fab636 Switch to fixed sidebar layout and remove bootstrap layout hooks. 
(imported from commit 060340a2febb7b8df6477a3419e7588a8503e377)
 2013-08-15 11:05:11 -04:00
Steve Howell 626a737973 [important fix] Restore buddy list. 
(There was an extra </div> tag.)

(imported from commit 500114eea1c93264ea590e6c7a9c0b1bacfb9710)
 2013-08-08 13:19:01 -04:00
Steve Howell 6f49f13b03 Use 2-space indents consistently in settings.html. 
(imported from commit eb8bb4b5078db29b65ba5c40989651151275dea3)
 2013-08-08 13:03:10 -04:00
Steve Howell 722c1b1a43 Allow user to change their API key. 
(imported from commit b7c50779d0209c6e6600b59c8760a81273fe2454)
 2013-08-08 13:03:09 -04:00
Scott Feeney 3b8ec3d185 Add a forgot-password link to the API key prompt 
(imported from commit a5da4f6a228398b8296e147f327ee8daaced1f1a)
 2013-08-07 17:49:27 -04:00
Tim Abbott e111a2f9a5 [manual] Rename Django app from zephyr to zerver. 
This needs to be deployed to both staging and prod at the same
off-peak time (and the schema migration run).

At the time it is deployed, we need to make a few changes directly in
the database:

(1) UPDATE django_content_type set app_label='zerver' where app_label='zephyr';
(2) UPDATE south_migrationhistory set app_name='zerver' where app_name='zephyr';

(imported from commit eb3fd719571740189514ef0b884738cb30df1320)
 2013-08-06 07:39:36 -04:00