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

19155 Commits

Author SHA1 Message Date
Vaida Plankyte d8ab716820 german.md: Use the singular 'they' pronoun. 2017-07-05 09:27:44 -07:00
Vaida Plankyte 0352ad517b streams.py: Use the singular 'they' pronoun. 2017-07-05 09:27:44 -07:00
Vaida Plankyte 5aee5b395a message.py: Use the singular 'they' pronoun. 2017-07-05 09:27:44 -07:00
Vaida Plankyte 18bf15cfed git-guide.md: Use the singular 'they' pronoun. 2017-07-05 09:27:44 -07:00
Vaida Plankyte c88530366e user_settings.py: Use the singular 'they' pronoun. 2017-07-05 09:27:44 -07:00
Vaida Plankyte 43a98b896b custom-apps.md: Use the singular 'they' pronoun. 2017-07-05 09:27:43 -07:00
Vaida Plankyte 8c4ee83980 decorator.py: Use the singular 'they' pronoun. 2017-07-05 09:27:43 -07:00
Vaida Plankyte 5a3d3ae291 narrow.js: Use the singular 'they' pronoun. 2017-07-05 09:27:43 -07:00
Vaida Plankyte d40f6da7f8 models.py: Use the singular 'they' pronoun. 2017-07-05 09:27:43 -07:00
Vaida Plankyte 0d8720fe0c missed_message.txt: Use the singular 'they' pronoun. 2017-07-05 09:27:43 -07:00
Vaida Plankyte b68ba0a13e missed_message.html: Use the singular 'they' pronoun. 2017-07-05 11:34:45 +02:00
Vaida Plankyte c52fc84fd0 bots-guide.md: Use the singular 'they' pronoun. 2017-07-05 11:33:42 +02:00
David Coleman 77dc5df56a uploads: Display year in attachments UI upload timestamp. 
Modified timerender.js absolute_time() to include the
year in the returned time stamp string.

Fixes #5600.
 2017-07-04 16:13:20 -07:00
Vaida Plankyte 9bb0602ad4 docs: Add info on resolving merge conflicts to git-guide.md. 
Fixes #5586.
 2017-07-04 15:48:06 -07:00
James Rowan d88e7308bf emails: Add a FromAddress class to control access to certain settings emails. 
No change in behavior.

Also makes the first step towards converting all uses of
settings.ZULIP_ADMINISTRATOR and settings.NOREPLY_EMAIL_ADDRESS to
FromAddress.*.

Once everything is converted, it will be easier to ensure that future
development doesn't break backwards compatibility with the old style of
settings emails.
 2017-07-04 14:25:01 -07:00
James Rowan 368bd66d8b emails: Refactor send_email functions to take both a sender name and address. 
This will allow for customized senders for emails, e.g. 'Zulip Digest' for
digest emails and 'Zulip Missed Messages' for missed message emails.

Also:
* Converts the sender name to always be "Zulip", if the from_email used to
  be settings.NOREPLY_EMAIL_ADDRESS or settings.ZULIP_ADMINISTRATOR.

* Changes the default value of settings.NOREPLY_EMAIL_ADDRESS in the
  prod_setting_template to no longer have a display name. The only use of
  that display name was in the email pathway.
 2017-07-04 14:25:01 -07:00
Rishi Gupta a8af0b6d91 email_mirror: Change missed message noreply to not have a display name. 
It's better to see "noreply@..." when replying to a message that you can't
reply to than "Zulip".
 2017-07-04 14:25:01 -07:00
Rishi Gupta dd3dd26f15 prod_settings_template: Update description for FEEDBACK_EMAIL. 2017-07-04 14:25:01 -07:00
Rishi Gupta 364415bba4 password reset flow: Use default noreply email address. 2017-07-04 14:25:01 -07:00
Tim Abbott c2ee259987 settings: Simplify testing code for bool realm settings. 
Now, when we add a new realm setting with the bool type, we don't need
to edit the tests at all.
 2017-07-04 14:23:05 -07:00
Franziska von der Goltz 98847937f4 realm: add mandatory topic setting on org level. 
Lets organizations require users to specify a topic the discussion.

Fixes: #5164.
 2017-07-04 14:09:21 -07:00
James Rowan 1ea9a23f95 emails: Fix two grammar nits. 2017-07-04 13:57:54 -07:00
Cory Lynch b13265d135 util: Remove execute_early. 
This function was removed in favor of loading everything in
ui_init.js. The asynchronous nature of jQuery 3 document-ready
events may cause an undesirable order in which these are executed.
 2017-07-04 13:54:33 -07:00
Cory Lynch effd7ef41f server_events: Move initialization to ui_init.js. 2017-07-04 13:54:33 -07:00
Cory Lynch e33b178054 message_store: Move initialization to ui_init.js. 2017-07-04 13:54:33 -07:00
Cory Lynch 25be3a402d message_fetch: Move initialization to ui_init.js. 
This involves modifying a casper test, because now
upon registration, there is one unread message.
 2017-07-04 13:54:33 -07:00
Tim Abbott b2ada7e706 docs: Expand documentation on Internet access in tests. 2017-07-04 13:17:25 -07:00
Aditya Bansal 5b81cc2bcd tests: Block internet access to test suites by overriding requests. 2017-07-04 13:17:22 -07:00
Aditya Bansal 26c345f059 backend: Block network access to test suites. 
In this commit we basically start to override the request method of
httplib2.Http() to raise an exception whenever it is called i.e.
a trial is made to access the network from test suits.

Fixes: #1472.
 2017-07-04 13:17:20 -07:00
Aditya Bansal caa8a3f7fc Make test_google_oauth2_token_failure() work without internet. 2017-07-04 12:45:27 -07:00
Eeshan Garg 9a992ec4c7 docs: Add documentation guide for integrations and webhooks. 2017-07-03 20:09:34 -04:00
Eeshan Garg 2f054ef4c9 webhook-walkthrough: Mention Zulip's Markdown macros. 2017-07-03 20:09:34 -04:00
Brock Whittaker 7d005919ca portico: Improve detection of URL in product page JS. 
The product page JS detects the page to run small bundle functions
but does not work correctly with language prefixes in the pathname,
such as /es/apps, so this properly detects that.

Fixes #5635.
 2017-07-03 10:22:38 -07:00
Tim Abbott 59d2eae946 signals: Fix browser reporting for new Electron logins. 
Previously, we were checking for "Zulip" entries in User-Agent strings
at the very end of the list, not the beginning.  A Zulip User-Agent
should have priority, since it includes the User-Agent strings for a
lot of other browsers, and also it will always be the most specific
value.
 2017-07-03 10:12:20 -07:00
Harshit Bansal d3d6712fa3 left-sidebar: Update the size of the scrollbar after narrowing to a stream. 2017-07-03 09:53:41 -07:00
neiljp (Neil Pilgrim) 323b201b8a Bots: Adjust Incrementor bot to use StateHandler 2017-07-03 09:50:14 -07:00
vaibhav 3cddc4ac93 settings: Add node test for url input box toggle. 
This contains node test for toggling the url inputbox of
outgoing webhooks service url in the "Add new bot" form.
 2017-07-03 11:09:40 -04:00
vaibhav f003a4c916 settings: Move api_key_button click in casper tests. 
api_key_button element has been moved from "your-bots" settings page
to "account-settings" page. This click statement was left by mistake.
 2017-07-03 11:09:40 -04:00
Cory Lynch 30c7629212 Change code block typeahead to only sometimes close fence. 
Fixes #5556.
Some tests needed to be moved around to make sure the
stubbing wouldn't break future tests.
 2017-07-03 11:05:18 -04:00
Cory Lynch 802ea9abf5 Refactor to delete mousewheel.js. 
This old third party library added support
for a "mousewheel" event to detect scrolling.
However, it is not compatible with jQuery 3
and is obsolete now that there is a standard
"wheel" event that accomplishes the same thing.
 2017-07-03 11:04:20 -04:00
Umair Khan ca14292334 travis: Only generate translatation files once. 
This should save us a second or two in Travis builds.
 2017-07-03 10:10:43 -04:00
Umair Khan 15866b8a1f check-frontend-i18n: Add no-generate option. 
Adds the option to not generate translation files.
 2017-07-03 10:10:43 -04:00
Umair Khan f22b2d27f3 check-capitalization: Add no-generate option. 
Adds the option to not generate translation files.
 2017-07-03 10:10:43 -04:00
Umair Khan f1fded08ab check-frontend-i18n: Generate only English translations. 2017-07-03 10:10:43 -04:00
Umair Khan 50ee14d390 check-capitalization: Generate only English translations. 2017-07-03 10:10:43 -04:00
Umair Khan 90ec20b4e4 Remove English translations.json from source control. 
This commit deletes the file from git repo and adds the
file to gitignore.

Fixes #5640
 2017-07-03 10:10:43 -04:00
Cory Lynch f848ffc03b Patch spectrum.js for jQuery 3 compatibility. 
This includes removing deprecated functions
(namely bind/unbind/delegate) and fix an aspect
of event handling that breaks in the new jQuery.
 2017-07-02 07:59:24 -04:00
Cory Lynch 10fa6b75f9 Patch filedrop for jQuery 3 compatibility. 
This entails removing the use of jQuery.event.props,
which has been removed from jQuery 3.
 2017-07-02 07:59:24 -04:00
sinwar 3d0b5b14be provision: Avoid spending ~1.5s on compilemessages in no-op case. 
This brings the total no-op provision time down to around 7.3s!

Tweaked by tabbott to clean up the code, close file descriptions, and
avoid issues with a somehow corrupted file.

Fixes #5185.
 2017-07-01 11:27:54 -07:00
Harshit Bansal 7387e6fe4b bugdown/__init__.py: Close opened file objects. 2017-07-01 11:14:24 -07:00