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

23383 Commits

Author SHA1 Message Date
Rishi Gupta 27a8ef86e4 actions: Add realm deactivation and reactivation to RealmAuditLog. 2017-12-19 17:46:36 -08:00
Rishi Gupta cce8d0d721 invite: Update text of success message. 
We should move to a design that doesn't require so many success messages,
since each one carries translation risk (e.g. what if the translation is too
long/overflows, or is not a clear translation, etc.). But doing a quick fix
until then.
 2017-12-19 17:46:36 -08:00
Rishi Gupta 4261307e27 emails: Clear ScheduledEmail emails on realm deactivation. 
This only affects the invitation reminder emails; clear_scheduled_emails was
already clearing the other two types.
 2017-12-19 17:46:36 -08:00
Rishi Gupta 869b4d41ef models: Add ScheduledEmail.realm. 
The two extra queries in the test are due to the assert in
send_future_email.
 2017-12-19 17:46:36 -08:00
Rishi Gupta cc08becb2c portico: Update FAQ on /plans. 2017-12-19 15:36:13 -08:00
Rishi Gupta 87e164043f portico: Rename plans at /plans. 2017-12-19 15:36:13 -08:00
ViRu-ThE-ViRuS c8aadaa408 integrations: Add webhook payloads for Intercom. 2017-12-19 16:50:06 -05:00
Greg Price eb650306eb circleci: Disable gitlint for now. 
We get the following error (edited slightly):

  Dec 19 06:13:27 commit_messages| An error occurred while executing
    '/usr/bin/git rev-list --max-count=-1 upstream/master..HEAD':
  fatal: ambiguous argument 'upstream/master..HEAD':
    unknown revision or path not in the working tree.
  Use '--' to separate paths from revisions, like this:
  'git <command> [<revision>...] -- [<file>...]'

We'll need to adjust the remotes to make `upstream` mean what we expect.
 2017-12-18 22:21:49 -08:00
Greg Price e5c6c446b5 travis + circleci: Start postgresql during provision. 
Otherwise, in CircleCI it isn't running when we need it later.
Travis must special-case starting it automatically.
 2017-12-18 22:05:27 -08:00
Greg Price c83c118c6c circleci: Crudely clone a bit of `is_travis` logic. 
This isn't really the right way to do this -- commit
  dcd80e665 "travis/setup-backend: Remove the '--travis' flag"
took us in the wrong direction by introducing more magic, deeper in
the stack.

But it's the same way we do it for Travis.  For now, just copy that.

[Thanks to hackerkid for cleaning up my original crude hack.]
 2017-12-18 22:04:39 -08:00
Greg Price e8bf7d23bf provision: Remove transitional Python 2->3 logic in setup_venvs. 
At this point if we were accidentally using `/srv/zulip-venv` for
anything, we'd have run into it by now.  So just drop the bit of
historical logic that we had to ensure that.
 2017-12-18 21:59:51 -08:00
Greg Price 3ba0d5659f travis: Don't create nagios state. 
As the comment says, we don't seem to use this.  And the Travis builds
work fine without it.
 2017-12-18 21:43:07 -08:00
Greg Price 9ce080ebb1 circleci: Remove Circle-created gitconfig file. 
[Investigation by hackerkid.]
 2017-12-18 21:42:00 -08:00
Greg Price e34852acf6 package.json: Move difflib to devDependencies. 
We introduced this a couple of commits ago (in #7782) for use in the
tests only.  Putting it here avoids pulling in a new dependency in
production which we don't use there.
 2017-12-18 19:09:03 -08:00
Eeshan Garg 8936d03f3a webhooks/gitlab: Support Merge Request Hook approved event type. 
Such payloads are generated when a GitLab repository has merge
request approvals enabled and a project member approves a merge
request. Approving is not the same as merging.
 2017-12-18 19:12:54 -05:00
Andy Perez 44e6d9b54b testing: Add nice diffs to markdown python tests. 2017-12-18 19:03:38 -05:00
Andy Perez fc2298ec54 node tests: Add nice diffs to js markdown tests. 
Fix #3915
 2017-12-18 19:03:38 -05:00
Andy Perez 695affd44e node tests: Compare markdown using semantic equivalence. 
Fix #4367
 2017-12-18 19:03:38 -05:00
Greg Price 776af2e248 push notifs: Simplify content-truncation code slightly. 
This should be a pure refactor.
 2017-12-18 15:32:56 -08:00
Greg Price 014900c2e5 push notifs: Include same stream and sender info on GCM as on APNs. 
This takes the information added to APNs payloads by #7080, and adds
to our GCM payloads the parts that it didn't already have.
 2017-12-18 15:32:56 -08:00
Greg Price e077d6fc74 push notifs: Factor out common payload fields for APNs and GCM. 
This should be a pure refactor, producing exactly the same payloads.
 2017-12-18 15:32:56 -08:00
Eeshan Garg 21008a49b9 webhooks/gci: Support approve-pending-pc event type. 
This event is generated when a mentor approves a task but
GCI is still waiting on a student's parental consent.
 2017-12-18 10:00:20 -08:00
Callum Fraser a61a7f3965 mypy: Use Python 3 type syntax in zerver/webhooks/pingdom/view.py. 2017-12-18 11:32:52 -05:00
Callum Fraser 4508264f25 mypy: Use Python 3 type syntax in zerver/webhooks/opsgenie/view.py. 2017-12-18 11:32:52 -05:00
Callum Fraser 52f0c4472e mypy: Use Python 3 type syntax in zerver/webhooks/ifttt/view.py. 2017-12-18 11:32:52 -05:00
Callum Fraser 23b29212a3 mypy: Use Python 3 type syntax in zerver/webhooks/greenhouse/view.py. 2017-12-18 11:32:52 -05:00
Callum Fraser 403ea486e4 mypy: Use Python 3 type syntax in zerver/webhooks/gogs/view.py. 2017-12-18 11:32:52 -05:00
Callum Fraser 33e1879295 mypy: Use Python 3 type syntax in zerver/webhooks/beanstalk/view.py. 2017-12-18 11:32:52 -05:00
Callum Fraser c55685063f mypy: Use Python 3 type syntax in zerver/webhooks/appfollow/view.py. 2017-12-18 11:32:52 -05:00
Callum Fraser b0c5eb5482 mypy: Use Python 3 type syntax in zerver/views/typing.py. 2017-12-18 11:32:52 -05:00
Callum Fraser 0438da5c16 mypy: Use Python 3 type syntax in zerver/lib/avatar.py. 2017-12-18 11:32:52 -05:00
Utkarsh Patil c2441e4455 user settings: Clean settings.css and fix bug 
Clean up settings.css and fix js bug in attachments_ui.js
 2017-12-18 10:12:33 -05:00
Utkarsh Patil c9596e12be user settings: fix uploaded files UI 
Fix UI and date uploaded
 2017-12-18 10:12:33 -05:00
Utkarsh Patil b3d7a87552 user settings: Change file size display format 
Display 1MB for 1000KB and display atleast 2 sig digits from 'KB' onwards
 2017-12-18 10:12:33 -05:00
Utkarsh Patil 25f742839d user settings: change 'Date uploaded' display format 
Display 'Today' or 'Yesterday' and the date for days beyond those
 2017-12-18 10:12:33 -05:00
Utkarsh Patil 0b710e41c9 user settings: fix 'Uploaded files' UI 
Align table header and its corresponding table data
 2017-12-18 10:12:33 -05:00
civilnewsnetwork 0ce8b69fd6 Renamed 'Register' to 'Sign up' including translations 2017-12-18 10:02:15 -05:00
cPhost 3dc315a0a1 node tests: Add 100% coverage for narrow_state.js. 2017-12-18 09:57:43 -05:00
Tommy Ip 16e03b644d linter: Update commit title regex to match uppercase for the first letter. 2017-12-18 09:36:47 -05:00
Tommy Ip 7243a91e47 linter: Re-enable gitlint. 2017-12-18 09:36:47 -05:00
Alena Volkova 3cfb2d57b2 tests: Refactor the method for encoding credentials. 2017-12-18 09:24:09 -05:00
Alena Volkova 39915d9835 tests: Replace all get_auth usages with auth methods and delete it. 2017-12-18 09:24:09 -05:00
Alena Volkova 90aa6c627e tests: Replace api_auth usages with auth methods in zerver/webhooks. 2017-12-18 09:24:09 -05:00
Alena Volkova 26eb23afc7 tests: Replace api_auth usages with auth methods in zerver/tests. 2017-12-18 09:24:09 -05:00
Alena Volkova 4a303d1778 tests: Add auth methods that will replace passing credentials. 2017-12-18 09:24:09 -05:00
cPhost 7f4e57ddff node tests: Cover stream_data.initialize_from_page_params. 2017-12-18 09:19:05 -05:00
neiljp (Neil Pilgrim) 2fc0272a5d Editing (minor): Add .pyi to .editorconfig. 2017-12-18 07:35:58 -05:00
itstakenalr 90c71f3ca6 docs: Update request-remote.md. 
Change (zulip-venv) to (zulip-py3-venv)
 2017-12-16 01:10:26 -08:00
Shreyansh Dwivedi 5b49259722 compose box:Add a reply button. Fixes #5578 2017-12-15 14:23:24 -05:00
Rishi Gupta 5a235bcfc5 portico: Make minor updates to for/mystery-hunt. 2017-12-15 09:39:24 -08:00