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

24256 Commits

Author SHA1 Message Date
Greg Price c4285ef4a7 gitignore: Ignore a Transifex secrets file. 
This makes it easier to keep one's .transifexrc in the Zulip working
tree, instead of (or shadowing one in) one's homedir.
 2018-02-15 13:38:09 -08:00
Robert Hönig ebf79427ca translation: Add script to tag strings in Transifex. 
For now, tags are only used for backend translations with django.
 2018-02-15 13:38:09 -08:00
Robert Hönig b9c6cd19f7 translation: Mark error strings in django.po files. 
In `django.po`, strings are marked with comments specifying the
type of string.
 2018-02-15 11:12:42 -08:00
Greg Price 8d98ce1648 errors: Note upstream fix for that Django DisallowedHost bug. 2018-02-15 10:37:29 -08:00
Umair Khan e68b45d089 lxc: Fix lxc-config file from vagrant-lxc for LXC 2.1.0. 
Fixed by greg to act only on version 2.1.0, not later; and
rewrote comment.

Fixes #7838.
 2018-02-14 14:06:37 -08:00
Greg Price 6424b3c7b9 github: Add a short template for pull requests. 
Hopefully this will help communicate our expectations right up front
for new contributors, with a minimum of boilerplate or busywork.
 2018-02-14 13:38:38 -08:00
Vishnu Ks 2102d962a5 version: Bump version to facilitate dependency upgrade. 2018-02-14 09:44:26 -08:00
Vishnu Ks a1db814e4e requirements: Upgrade python-digital-ocean to 1.13.2. 2018-02-14 09:44:26 -08:00
Vishnu Ks caaa7d1b82 requirements: Upgrade ndg-httpsclient to 0.4.4. 2018-02-14 09:44:26 -08:00
Vishnu Ks 18436c100a requirements: Upgrade google-api-python-client to 1.6.5. 2018-02-14 09:44:25 -08:00
Vishnu Ks f93f1972e9 requirements: Upgrade certifi to 2018.1.18. 2018-02-14 09:41:49 -08:00
Vishnu Ks 026d835d3a requirements: Upgrade twilio to two. 2018-02-14 09:41:49 -08:00
Vishnu Ks 88e73c9677 requirements: Upgrade transifex-client to 0.12.5. 2018-02-14 09:41:49 -08:00
Vishnu Ks adac6c0cf2 requirements: Upgrade tornado to 4.5.3. 2018-02-14 09:41:49 -08:00
Vishnu Ks 9effe27eab requirements: Upgrade typing to 3.6.4. 2018-02-14 09:41:49 -08:00
Vishnu Ks 3f3f876187 requirements: Upgrade stripe to 1.77.2. 2018-02-14 09:41:49 -08:00
Vishnu Ks 416338c9b6 requirements: Upgrade Sphinx to 1.7.0. 2018-02-14 09:41:49 -08:00
Vishnu Ks 351f780ab2 requirements: Upgrade Scrapy to 1.5.0. 2018-02-14 09:41:49 -08:00
Vishnu Ks 48f93a7460 requirements: Upgrade pytz to 2018.3. 2018-02-14 09:41:49 -08:00
Vishnu Ks 0aa6f00cf2 requirements: Upgrade pyasn1 to pyasn1-modules. 2018-02-14 09:41:49 -08:00
Vishnu Ks f1098a77f2 requirements: Upgrade polib to 1.1.0. 2018-02-14 09:41:49 -08:00
Vishnu Ks ab7695879a requirements: Upgrade pip-tools to 1.11.0. 2018-02-14 09:41:49 -08:00
Vishnu Ks 2b081f882a requirements: Upgrade Pillow to 5.0.0. 2018-02-14 09:41:49 -08:00
Vishnu Ks 0e2058ae48 requirements: Upgrade pika to 0.11.2. 2018-02-14 09:41:49 -08:00
Vishnu Ks 31abe1a6f8 requirements: Upgrade moto to 1.2.0. 2018-02-14 09:41:49 -08:00
Vishnu Ks 3780b8ce04 requirements: Upgrade Markdown to 2.6.11. 2018-02-14 09:41:49 -08:00
Vishnu Ks 6ca3f72e6e requirements: Upgrade lxml to 4.1.1. 2018-02-14 09:41:49 -08:00
Vishnu Ks 617549fec5 requirements: Upgrade Jinja2 to 2.10. 2018-02-14 09:41:49 -08:00
Vishnu Ks 151702d7c1 requirements: Upgrade isort to 4.3.4. 2018-02-14 09:41:49 -08:00
Vishnu Ks 51577b788a requirements: Upgrade html2text to 2018.1.9. 2018-02-14 09:41:49 -08:00
Vishnu Ks 66e34be480 requirements: Upgrade gitlint to 0.9.0. 2018-02-14 09:41:49 -08:00
Vishnu Ks 449c1d5064 requirements: Upgrade django-two-factor-auth to 1.7.0. 2018-02-14 09:41:49 -08:00
Vishnu Ks 2b0099f696 requirements: Upgrade django-pipeline to 1.6.14. 2018-02-14 09:41:49 -08:00
Vishnu Ks 7a8b174a01 requirements: Upgrade cryptography to 2.1.4. 2018-02-14 09:41:49 -08:00
Vishnu Ks 1b8ca55dd2 requirements: Upgrade cffi to 1.11.4. 2018-02-14 09:41:49 -08:00
Vishnu Ks d8eb4a115c requirements: Upgrade Babel to 2.5.3. 2018-02-14 09:41:49 -08:00
Vishnu Ks 9b93e8cba8 requirements: Upgrade argon2-cffi to 18.1.0. 2018-02-14 09:41:49 -08:00
Shubham Dhama 995138d730 settings: Allow uploading same image as avatar after deleting. 
Previous hack wasn't working but changing the value of
file input element to empty works.
For more info https://stackoverflow.com/questions/20549241.

Fixes: #8377.
 2018-02-14 09:37:16 -08:00
Tim Abbott 118dfb9690 hotkey: Document message_view_only with a comment. 
fixes #8323.
 2018-02-14 09:34:32 -08:00
Tim Abbott dcda633b3a help: Fix scroll position when reloading browser window with hash. 
This uses the same technique as the last commit, just with the final
case for how we navigate to/from these pages.
 2018-02-14 09:26:42 -08:00
Aman Jain d48664fc5f help: Fix links with query selector from left sidebar. 
This resolves the issue of scrolling to correct position when loaded
from left sidebar to a link with query selector.

Fixes #6714.
 2018-02-14 09:25:26 -08:00
Patrick Naughton ced9cba5ff hotspots: Fix resizing of ``Got It!`` box. 
This dynamically resizes the box to fit the variable text size present
with different languages.

At the same time, it adds padding to the English version to make it
look similar to previous versions.

Fixes #8275.
 2018-02-14 09:23:16 -08:00
Rishi Gupta 08efd7828a integrations: Update text for bitbucket2 doc. 
With minor fixes by eeshangarg.

Eeshan: I added a screenshot because I thought it would be helpful.
 2018-02-13 22:28:48 -03:30
Rishi Gupta 7697adfcdc integrations: Update text for appfollow doc. 
With minor fixes by eeshangarg.
 2018-02-13 22:19:05 -03:30
Rishi Gupta 80a0976afe integrations: Update text for basecamp doc. 
With minor fixes by eeshangarg.

Eeshan: I updated the screenshot. The old one was blurry, the
whole process is largely the same.
 2018-02-13 22:15:10 -03:30
Rishi Gupta de3d478a80 integrations: Update text for airbrake doc. 
With minor fixes by eeshangarg!

Eeshan: I decided to remove the screenshot. It looks very old and
was blurry and the instructions were very screenshot-agnostic
anyway!

I couldn't update the screenshot because Airbrake doesn't even let
you use the free trial till you give them your credit card info,
which I didn't want to do!
 2018-02-13 21:56:31 -03:30
Rishi Gupta 9449556eff integrations: Add missing instruction to create-a-bot docs macros. 2018-02-13 21:47:39 -03:30
Tim Abbott be3d43bb46 lint: Add linter rule banning $.get and friends. 
These are not allowed in our style guide.
 2018-02-13 16:47:59 -08:00
Robert Hönig a19a69bfe3 embedded bots: Log warning when bot quit()s. 
External bots may call bot_handler.quit() when
they wish to terminate, e.g. due to a misconfiguration.
Currently, embedded bots ignore calls to quit(), even
though they signal a problem. This commit does the first
step in handling quit() calls by logging a warning.
 2018-02-13 14:56:37 -08:00
Tim Abbott 6638c12aef upload: Extract feature_check helper function. 2018-02-13 14:37:26 -08:00