Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle corrupted config files #352

Merged
merged 4 commits into from
Dec 18, 2017
Merged

Handle corrupted config files #352

merged 4 commits into from
Dec 18, 2017

Conversation

akashnimare
Copy link
Member

This partially fixes #310.

@zulipbot
Copy link
Member

Hello @akashnimare, it seems like you have referenced an issue in your pull request, but you have not referenced that issue in your commit message(s). When you reference an issue in a commit message, it automatically closes the corresponding issue when the commit is merged.

Please run git commit --amend in your command line client to amend your commit message description with "Fixes #[issue number]”.

An example of a correctly-formatted commit:

commit fabd5e450374c8dde65ec35f02140383940fe146
Author: zulipbot
Date:   Sat Mar 18 13:42:40 2017 -0700

    pull requests: Check PR commits reference when issue is referenced.

    Fixes #51

Thank you for your contributions to Zulip!

@akashnimare akashnimare merged commit 04083bf into master Dec 18, 2017
@vsvipul vsvipul mentioned this pull request Mar 28, 2019
Closed
3 tasks
vsvipul added a commit to vsvipul/zulip-desktop that referenced this pull request May 21, 2019
@vsvipul
system-presence: Add ability to detect system presence.
450cf28 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
@vsvipul vsvipul mentioned this pull request May 21, 2019
Merged
3 tasks
vsvipul added a commit to vsvipul/zulip-desktop that referenced this pull request May 21, 2019
@vsvipul
system-presence: Add ability to detect system presence.
435a029 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
vsvipul added a commit to vsvipul/zulip-desktop that referenced this pull request Jun 12, 2019
@vsvipul
system-presence: Add ability to detect system presence.
7daa38d 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
vsvipul added a commit to vsvipul/zulip-desktop that referenced this pull request Jun 12, 2019
@vsvipul
system-presence: Add ability to detect system presence.
cef9292 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
vsvipul added a commit to vsvipul/zulip-desktop that referenced this pull request Jun 13, 2019
@vsvipul
system-presence: Add ability to detect system presence.
dc165a8 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
vsvipul added a commit to vsvipul/zulip-desktop that referenced this pull request Jun 28, 2019
@vsvipul
system-presence: Add ability to detect system presence.
44090b0 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
vsvipul added a commit to vsvipul/zulip-desktop that referenced this pull request Jun 28, 2019
@vsvipul
system-presence: Add ability to detect system presence.
21117e5 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
vsvipul added a commit to vsvipul/zulip-desktop that referenced this pull request Jun 29, 2019
@vsvipul
system-presence: Add ability to detect system presence.
4c8894a 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
vsvipul added a commit to vsvipul/zulip-desktop that referenced this pull request Jul 4, 2019
@vsvipul
system-presence: Add ability to detect system presence.
cc54770 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
vsvipul added a commit to vsvipul/zulip-desktop that referenced this pull request Jul 12, 2019
@vsvipul
system-presence: Add ability to detect system presence.
348634d 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
vsvipul added a commit to vsvipul/zulip-desktop that referenced this pull request Jul 16, 2019
@vsvipul
system-presence: Add ability to detect system presence.
9a2cc65 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
vsvipul added a commit to vsvipul/zulip-desktop that referenced this pull request Jul 17, 2019
@vsvipul
system-presence: Add ability to detect system presence.
60eea4f 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
vsvipul added a commit to vsvipul/zulip-desktop that referenced this pull request Aug 15, 2019
@vsvipul
system-presence: Add ability to detect system presence.
858042b 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
priyank-p pushed a commit to vsvipul/zulip-desktop that referenced this pull request Aug 17, 2019
@vsvipul @priyank-p
system-presence: Add ability to detect system presence.
594474e 
Created two electron-bridge variables.
idle_on_system tells whether the user is idle or not.
last_active_on_system gives the time the user was last
active. Both variables will be used by the webapp to set
user status.

Fixes zulip#352.
priyank-p pushed a commit that referenced this pull request Aug 20, 2019
@vsvipul @priyank-p
system-presence: Pass system active status to webapp.
1f79a97 
We check user status every 15 seconds and update the status accordingly
to every organization connected. The webapp then uses this system presence data
we send to set the user status based on system activity.

Fixes #352.
priyank-p pushed a commit to priyank-p/zulip-electron that referenced this pull request Jan 3, 2020
@vsvipul @priyank-p
system-presence: Pass system active status to webapp.
0fcd15a 
We check user status every 15 seconds and update the status accordingly
to every organization connected. The webapp then uses this system presence data
we send to set the user status based on system activity.

Fixes zulip#352.
@andersk andersk deleted the cPhost-handle-domainjson branch March 9, 2022 05:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Handle corrupted domain.json files gracefully
3 participants
@akashnimare @zulipbot @priyank-p