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

9915 Commits

Author SHA1 Message Date
Clara Dantas 080014abcc settings_users: Fix bot_list_widget not defined. 
Fix error thrown when creating a bot if the bot_list_widget
is not defined.
 2020-05-30 12:23:49 -07:00
sahil839 9fa60672e6 users: Modify update user API endpoint to accept role as parameter. 
This commit changes the update user API endpoint to accept role
as parameter instead of the bool parameters is_guest and is_admin.

User role dropdown in user info modal is also modified to use
"dropdown_options_widget".

Modified by tabbott to document the API change.
 2020-05-29 14:29:17 -07:00
Steve Howell 74c61984df Revert "buddy list: Adjust sizing calc for narrow mode." 
This reverts commit 9f5725d265.

I was trying to fix how we size the buddy list in
narrow mode, which was off by 10px, but my fix worsened
things for regular mode.

Also, somebody reported a traceback related to my fix.
I didn't fully research the traceback,
but I suspect it was related to some media-query settings
for small screens or due to a put-buddy-list-in-left-pane
setting.  (Basically, `$('#right-sidebar').position()` may
be undefined in some cases, and I wasn't handling that.)

After reverting this, we still have the original
off-by-10px bug that I was trying to fix, but I will
attempt to do that more cleanly in a separate commit.

This should make it so that in normal situations where
the buddy list is in the right sidebar, we will be
able to see the "Invite more users" link again.

I am still a little puzzled how I didn't catch this in
testing, but it was toward the end of a long PR, so
it could easily just be simple human error.

Fortunally, this regression was only on master for a
couple days, and users could still invite users via
the gear menu.
 2020-05-29 15:36:42 -04:00
Mateusz Mandera 88d501515e presence: Fix "Last active:" in buddy list when last presence is idle. 
Restored old behavior accidentally removed in
1ae07b93d8 (diff-e353fab8bea58b8746ec68c83aa39b36L48)

The server only remembers the most recent presence status update per
device. Meaning that, for instance, if the user only uses one client and
that client's last status update was IDLE, then the server only knows
that, doesn't know anything about the user's last ACTIVE time. Thus the
"active_timestamp" the server will serve about this user to the webapp
will be "undefined".
The old behavior was that for the sake of the "Last active: x ago"
status in buddy list popover, the latest status timestamp was used,
whether IDLE or ACTIVE.
The change linked about changed that to only pay attention to
ACTIVE. Thus, if the server doesn't remember any ACTIVE statuses, webapp
would show "Last active: More than 2 weeks ago", which was incorrect.

We restore the old behavior and further improvements can be made on top
of this.
 2020-05-29 13:26:34 -04:00
Siddharth Varshney 2666c1a605 css: Use SCSS nesting for `.help` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney caa3b21089 css: Reorder `.help .markdown` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney af505bc647 css: Use SCSS nesting for `.help .sidebar` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 0fa1e5b5f6 css: Use SCSS nesting for `.help .sidebar a` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney c70e53952c css: Use SCSS nesting for `.help .sidebar li` for portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 7040cc6a8a css: Merge `.help .sidebar.slide ul` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 5039b9ede4 css: Use SCSS nesting for `.help .sidebar.slide h2`. 2020-05-28 17:50:12 -07:00
Siddharth Varshney e609561ed4 css: Use SCSS nesting for `.help .sidebar h1`. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 42956cde19 css: Use SCSS nesting for `.help .sidebar h1.home-link`. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 74244a6d5b css: Use SCSS nesting for `.error_page .errorbox`. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 34a9147911 css: Use SCSS nesting for `center-block`. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 5f9d54a028 css: Use SCSS nesting for `.central-block .control-group`. 2020-05-28 17:50:12 -07:00
Siddharth Varshney c6d52afcff css: Use SCSS nesting for `.input-group` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney b1a6f6598b css: Use SCSS nesting for `.input-group.grid` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 4273577457 css: Use SCSS nesting for `.input-group label` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 67c41c88be css: Remove duplicate styles for `.input-group label`. 2020-05-28 17:50:12 -07:00
Siddharth Varshney b8c04c7f5e css: Reorder `.input-group` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney e8d7a590ce css: Use SCSS nesting for `.password-reset` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 10fbdab26c css: Merge `.password-reset` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney af2f9dcf6b css: Use SCSS nesting for `.password-reset .input-group` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 3d39a9d74e css: Reorder `.password-reset` related styles. 2020-05-28 17:50:12 -07:00
Siddharth Varshney f935afeaa6 css: Use SCSS nesting for `.top-links` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney cc4a4a7846 css: Use SCSS nesting for `.top-links a` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 6719835a89 css: Use SCSS nesting for `.footer-navigation` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 68b94bb434 css: Use SCSS nesting for `.main-headline-text` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney f6e70cefdf css: Use SCSS nesting for `.login-form` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 48873669e8 css: Use SCSS nesting for `.login-form, .register-form` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney cdbdffe92d css: Reorder `.login-form` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 51f5475ac8 css: Use SCSS nesting for `.login-page` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 22950a9287 css: Use SCSS nesting for `.history .sponsors` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 3f6ce5ffb1 css: Use SCSS nesting for `.contributors` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 9e4e608460 css: Use SCSS nesting for `.contributors .person` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney b524b09a37 css: Use SCSS nesting for `.team` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney a5b5294c82 css: Use SCSS nesting for `.team input` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 78d8006de5 css: Use SCSS nesting for `.team label` in protico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney f787b9054c css: Use SCSS nesting for `.team .bdfl` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney bfa18da1bf css: Use SCSS nesting for `team .bdfl .profile-picture` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 17197f7537 css: Use SCSS nesting for `.team .profile` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 0bc4760e21 css: Use SCSS nesting for `.portico-header` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney d1da18cd28 css: Use SCSS nesting for `.portico-header .dropdown` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 4bbb468a36 css: Use SCSS nesting for `portico-header .dropdown-pill` in porticos.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 0ccb3a3d02 css: Use SCSS nesting for `.portico-header .dropdown ul` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 6f1def6a29 css: Use SCSS nesting for `.portico-header .dropdown ul li` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney f04bfbed89 css: Use SCSS nesting for `.header-main` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 8670372543 css: Use SCSS nesting for `.header-main .logo` in portico.scss. 2020-05-28 17:50:12 -07:00
Siddharth Varshney 7c23da6abc css: Use SCSS nesting for `.footer` in portico.scss. 2020-05-28 17:50:12 -07:00