paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 21:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,613 Commits 30 Branches 160 Tags
24e2690ec2f0adcb220e6d2f82c28de3ce87246d
Commit Graph

12613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christie Koehler
24e2690ec2 tools: Improve git scripts. 
Minor fixes that enable the ability to:

- Re-run fetch-rebase-pull-request.
- Specify the name of the remote repo as an optional second parameter.
  The default remains 'upstream'.
 2016-10-11 13:38:38 -07:00
Eklavya Sharma
41587edd2e bugdown: Change parameter name. 
Change the parameter name of some functions from 'md' to 'content',
since the name 'md' seems to be the reason why this parameter was
wrongly annotated.
 2016-10-11 11:31:01 -07:00
Eklavya Sharma
f35d0f1c75 bugdown: Fix type annotations. 
In some functions the first parameter was wrongly annotated as
`markdown.Markdown`. Change that to `text_type`.
 2016-10-11 11:31:01 -07:00
Eklavya Sharma
81617fcdb0 Annotate zerver/tests/test_upload.py. 2016-10-11 11:29:14 -07:00
Eklavya Sharma
f7092b1a90 Annotate zerver/tests/test_email_mirror.py. 2016-10-11 11:28:52 -07:00
Eklavya Sharma
b741c7351d email_mirror: Use correct string types. 2016-10-11 11:27:35 -07:00
Eklavya Sharma
ccce3ec0be zerver/lib/digest.py: Fix a type annotation. 2016-10-11 11:27:35 -07:00
Eklavya Sharma
d92368e0f5 test_email_mirror: Add trivial annotations. 
Add annotations of the form `type: () -> None` to test methods.
 2016-10-11 11:27:35 -07:00
Eklavya Sharma
1dbabfe1ab Annotate zerver/tests/test_bugdown.py. 2016-10-11 11:27:35 -07:00
Eklavya Sharma
8e2f659f3d test_bugdown: Add trivial annotations. 
Add annotations of the form `type: () -> None` to test methods.
 2016-10-11 11:27:35 -07:00
Kouhei Sutou
c2b4fd86e4 settings: Combine split words for translators 2016-10-11 22:40:47 +09:00
Tim Abbott
7639dc87a8 Revert "requirements: Install the Zulip API bindings by default." 
This reverts commit de5b6d9e37.

This change appears to have caused problems provisioning due to a
conflict with the `--install-option` feature used by talon.
 2016-10-10 23:36:01 -07:00
Tim Abbott
de5b6d9e37 requirements: Install the Zulip API bindings by default. 
Fixes: #1957.
 2016-10-10 17:41:46 -07:00
Tomasz Kolek
8fa9ee1473 Add github tests for commits more than limit. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
ad5d5f2c99 Add beanstalk tests for commits more than limit. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
07003ca52d Add gitlab tests for commits more than limit. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
a3e4415614 Add bitbucket2 tests for commits more than limit. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
6fc1193743 Add to gitlab remove branch message handler. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
312905007e Add EMPTY_SHA const to zerver/lib/webhooks/git.py. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
89ef6c73d1 Normalize github and beanstalk remove branch event message. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
56208d7ea1 Add bitbucket2 remove branch message handler. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
b031d6b029 Add bitbucket2 force push event handler. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
b69b5e55ce Add git integration method to build message for remove branch events. 
Add get_remove_branch_event_message method to zerver/lib/webhooks/git.py
for normalizing remove branch message in all git integrations.
 2016-10-10 17:39:05 -07:00
Tomasz Kolek
f084dd05a8 Normalize github and beanstalk force push event message. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
5f7c1519d1 Add git integration method to build message for force push events. 
Add get_force_push_commits_event_message method to zerver/lib/webhooks/git.py
for normalizing force push message in all git integrations.
 2016-10-10 17:39:05 -07:00
Tomasz Kolek
e56e3f4aee Normalize bitbucket2 push event subject. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
741a91d249 Normalize bitbucket push event subject. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
1f0f197479 Normalize github and beanstalk push event subjects. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
32934a02e9 Add template for subject that contains repo name and branch name. 2016-10-10 17:39:05 -07:00
Tomasz Kolek
bc4ce7e781 Normalize gitlab push event message. 
Fixes: #1884.
 2016-10-10 17:39:05 -07:00
Tomasz Kolek
6a727bc476 Normalize bitbucket2 push event. 
Normalize bitbukcet2 push event by creating it by
get_push_commits_event_message common function.
 2016-10-10 17:39:05 -07:00
Tomasz Kolek
06ad0102a2 Remove now-unused build_commit_list_content. 2016-10-10 17:38:41 -07:00
Tomasz Kolek
809bc5f29b Normalize bitbucket push event. 
Normalize bitbukcet push event by creating it by
get_push_commits_event_message common function.
 2016-10-10 17:33:02 -07:00
Tomasz Kolek
1c1a003ba1 Normalize github push event. 
Normalize github push event by creating it by
get_push_commits_event_message common function.
 2016-10-10 17:33:02 -07:00
Tomasz Kolek
8697a1e5a2 Add common git integration method to build message for push events. 
This adds get_push_commits_event_message method to
zerver/lib/webhooks/git.py for normalizing push messages in all git
integrations.
 2016-10-10 17:32:41 -07:00
Tim Abbott
fec6527656 dev-overview: Document cloud server option. 2016-10-10 17:10:39 -07:00
zeddmaxx
1348b9dde3 dev-overview: Improve organization of installation overview page. 
Fixes #1814.

[substantially tweaked by tabbott]
 2016-10-10 17:06:59 -07:00
reyha
34766e38c3 irc-mirror: Update the installation link. 
This updates the link to python-irc to its current URL.
 2016-10-10 16:23:11 -07:00
Ilona Brand
4bf908c2d6 Add emoji map to the compose box. 
- Expand a box full of emojis into the
compose window for users to graphically select emojis.

- Append an emoji to the end of the message when a user
clicks the emoji in the emoji box.

- Trap the escape key to always close the emoji box
before closing anything else if the box is open.

- Fixes: #147.
 2016-10-10 16:12:25 -07:00
Umair Khan
da86429378 Create emoji name to css class mapping. 
`glue` ingores the + sign in the name of the emoji and creates the css
class without it. This causes the emoji pallete to miss '+1'
emoji. This commit creates a translation map from emoji name to css
class that we can use for the emoji popover.
 2016-10-10 16:09:23 -07:00
Umair Khan
e0c10ed1e8 Cache emoji dump output. 
This saves a bunch of time building release tarballs, provisioning,
and upgrading Zulip from git that was spent regenerating the Zulip
emoji sprite sheet.

[commit message tweaked by tabbott]
 2016-10-10 11:15:43 -07:00
Kartik Maji
e7f6f40100 Add test to check add peer event recipients. 2016-10-10 10:54:14 -07:00
K.Kanakhin
e104943e12 storage: Fix build-release-tarball py3 compatibility. 
- Open files in storage.py with 'rb' mode
  which allow to use decode command in PY3.
 2016-10-10 09:54:51 -07:00
Umair Khan
eb7ce73628 Move name_changes_disabled to zerver.models 2016-10-10 09:27:52 -07:00
Umair Khan
4fa427bc74 auth_backends: Add backend tests for subdomains logic. 
Fixes: #1870
 2016-10-10 08:55:39 -07:00
Umair Khan
a32cee4b10 Add test to show error msg for invalid subdomain. 2016-10-10 08:42:34 -07:00
Umair Khan
d0acda4635 Google: Show error on login page for wrong subdomain. 
Takes care of Google OAuth.

Fixes: #1871
 2016-10-10 08:42:34 -07:00
Umair Khan
c23aaa1785 GitHub: Show error on login page for wrong subdomain. 
While logging in through GitHub, if the user tries to login
to the wrong subdomain then show an appropriate message.
 2016-10-10 08:42:34 -07:00
Kouhei Sutou
aeb3d5e234 accounts_accept_terms: Use trans tag for translators. 
It's based on "Backend Translations" policy:
https://zulip.readthedocs.io/en/latest/translating.html#backend-translations
 2016-10-10 08:40:55 -07:00
Bertrand Croq
c705819f2d custom-apps docs: Fix stumulus typo. 2016-10-10 08:38:51 -07:00