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

54 Commits

Author SHA1 Message Date
Keegan McAllister 70482d032d Put the 'import *' back into test-settings.py 
This broke the test suite, which expects all settings to exist in this file.  Whoops.

This reverts commit e4108333c53afb0caf55348837b739cb7e5510dd.

(imported from commit e6b58004059e834d4e30ea9c63463eb84179cc1e)
 2012-10-04 16:49:26 -04:00
Keegan McAllister b9153b4f80 Remove an 'import *' 
(imported from commit e4108333c53afb0caf55348837b739cb7e5510dd)
 2012-10-04 15:43:41 -04:00
Tim Abbott e59d7cae48 Rename the Zephyr log to the Message log. 
(imported from commit 7dedfb76b6b78ea90a2bfd20788e251c9c29ef47)
 2012-10-03 18:14:15 -04:00
Tim Abbott 83ceba0a2d Remove old /api/get_updates view. 
(imported from commit 5a33a61bfb4b3aa40e28c356f5b4048db775b901)
 2012-10-03 16:58:31 -04:00
Tim Abbott 9223f7932c Convert zephyr_mirror humbug sending to use the API. 
(imported from commit 948a12a1dca903c47b7427248688f2079c7eecdb)
 2012-10-03 16:50:29 -04:00
Tim Abbott 7acfb5c71c Rename /zephyr/ to /send_message/. 
(imported from commit 41c2ff67cfc514e53aff8648c36f545526e324ed)
 2012-10-03 12:30:37 -04:00
Tim Abbott 828e0d4afb Rename forge_zephyr to forge_message. 
(imported from commit aa2dc6e24a9c1bd6be09bfa26241663ae143cef9)
 2012-10-03 12:27:34 -04:00
Tim Abbott 5a5b5de650 Rename /api/v1/get_updates to /api/v1/get_messages. 
(imported from commit f856637158cf9fda64ba333b532a5941de8fcbab)
 2012-10-02 16:29:34 -04:00
Tim Abbott 18a3888373 [schema] Add an API for sending/receiving messages. 
(imported from commit 209d525dc5892fc4c392a8ced1588c838cbb17c4)
 2012-10-02 15:49:25 -04:00
Tim Abbott 339489a81e Add missing test-settings.py. 
(imported from commit 85aeb41471dfe63cd6d6093b3388f949e30d72a3)
 2012-10-02 11:58:31 -04:00
Waseem Daher 2873e45b3f Tweak signup email text slightly. 
(imported from commit 4f8427a731376d7e9d5eb387673324bb25141743)
 2012-10-01 18:05:01 -04:00
Luke Faraone 036d25b6bd Configure email through Gmail 
(imported from commit 45fdfa4310f94c9e04dc1710dcb291003c1cc0f5)
 2012-10-01 15:03:59 -04:00
Luke Faraone aca5cef3eb Redirect to login when attempting to resignup with a used email address. 
(imported from commit d58a5dda9a0af409a6ee57cfcd30be45020352d2)
 2012-10-01 10:45:58 -04:00
Luke Faraone 50dfbf7a1b Implement confirmation for new user signups. 
We add a few templates for django-confirmation. We define a
"PreregistrationForm" which is validated by accounts_home, which then
generates a confirmation object and emails the user. This required creating
a new table for a PreregistrationUser with an email and status (confirmed)
field.

The register function now no longer accepts a "email" field in the form
and deals only with confirmation IDs to determine the email used to sign
up a user.

(imported from commit 4fcde04530aa7ad4de84579668daee7290b424ac)
 2012-10-01 10:45:58 -04:00
Luke Faraone 1467901f1a Include a favicon for the Humbug app. 
(imported from commit 3481d7f3c06ec0c656e15d147f46faf9cd99837a)
 2012-09-29 21:31:57 -04:00
Tim Abbott ccee128d61 New prototype zephyr mirroring system with bidirectional support. 
(imported from commit cfb95ae8d0a241e7c068106e561dc18e16461596)
 2012-09-27 17:33:21 -04:00
Keegan McAllister 20240d869c Rename get_updates_longpoll to get_updates 
(imported from commit 15635904584b324bdfa1414caea12c3bc4ce54c8)
 2012-09-27 15:46:36 -04:00
Tim Abbott 699e05383f Log messages and restore them with populate_db. 
(imported from commit 959f038a736e48d32819bc04bd054632a2e911c6)
 2012-09-27 15:01:30 -04:00
Waseem Daher f1aa17cf1d Change some URLs associated with subscriptions. 
Put all the 'API'-ish URLs in the /json/ namespace so that
/subscriptions and /subscriptions/add, etc. can be real
user-facing URLs if we want them to be.

(imported from commit 1455a32d27e44547ab1874b6289243cb40c85dde)
 2012-09-21 17:36:29 -04:00
Waseem Daher 5a164f19c2 Clean up subscription functions. 
Now that 'manage_subscriptions' only removes subscriptions,
let's name it that. Also, since both functions now only
act on one subscription at a time, use them in the singular.

(imported from commit 52cfc7b36eb1533da7aec1bc3a6e460151a56da8)
 2012-09-21 16:30:29 -04:00
Tim Abbott ed46a453ba Add (mostly unstyled) settings page. 
(imported from commit 492c5f498c2fec452e6c724555bc4a5a2c4c151a)
 2012-09-21 14:47:26 -04:00
Keegan McAllister 3cbc56a866 Rename MD5_SALT to HASH_SALT 
(imported from commit 3112cd805614c3057a9eb8f1b251381f48ab3173)
 2012-09-21 13:44:09 -04:00
Tim Abbott 135c82717d Authenticate by email. 
Approach from http://www.micahcarrick.com/django-email-authentication.html.

(imported from commit 796b8e08d8e1f9769cd3cf8ee61d3724ac3847b7)
 2012-09-21 10:34:48 -04:00
Keegan McAllister af5282abd4 Add client-side debugging tools 
(imported from commit faa87e85f366e91fe33e0f24e00ae1197403605d)
 2012-09-19 16:25:23 -04:00
Luke Faraone eb1740e1e7 Use emails in the gravatar seed, don't display a static gravatar for the current user. 
(imported from commit 64d1fd4f1cd33796bc907fef9778e088d80b8c5a)
 2012-09-19 13:39:34 -04:00
Keegan McAllister 3b9fcb6404 Configure Django for in-memory caching 
(imported from commit ad9e5b1712eef77631ea4d8de5a018cdb04742d8)
 2012-09-19 12:58:38 -04:00
Keegan McAllister 57ede6bd29 Configure Django for INFO logging even with DEBUG = False 
(imported from commit e7d61d10ebb548c0d902c7e2ae947129884e8145)
 2012-09-18 17:00:04 -04:00
Keegan McAllister cf8cc277ff Restore DEBUG = False on deployed app 
This reverts commit c3f0a8f7a388596113613c9ab18bdbccbf415226.

(imported from commit 24147588b3c31831116c364adeaea50caa8af198)
 2012-09-18 13:45:52 -04:00
Keegan McAllister af941e7779 settings.py: Disable error email to admins 
Sending email was hanging Tornado's event loop.

(imported from commit ab0ec21fa886e68a6acb21b6ee8e036265ce6f08)
 2012-09-18 13:44:25 -04:00
Jessica McKellar 2126e38ae2 Get and display new subscriptions with an AJAX request. 
(imported from commit c9efa7596898ac4b74ec9184ae773566eda65ec3)
 2012-09-18 12:32:52 -04:00
Keegan McAllister 2e3e44b5bb App hangs with DEBUG = False (??) 
Will debug this problem tomorrow.

(imported from commit c3f0a8f7a388596113613c9ab18bdbccbf415226)
 2012-09-17 19:17:53 -04:00
Keegan McAllister a8a8be2d8d Distinguish deploy server by hostname 
(imported from commit 685001e49f8add7540ae807acb8d3a604a969d4f)
 2012-09-17 18:15:42 -04:00
Tim Abbott 1822a997ed Use MySQL by default if available. 
(imported from commit d899c8ef922a07e7387688e5770cdfb4d2c472a6)
 2012-09-17 13:20:18 -04:00
Jessica McKellar 6ccbab9bf5 Conditionally configure MySQL as a database backend. 
Even though SQLite is the default, Django tries to import MySQLdb,
which on OS X is challenging to install.

(imported from commit 0947c86e5e9a1fbf2ff8d74b78f297ff939ff712)
 2012-09-14 16:34:23 -04:00
Tim Abbott 2793ec15fd Use longer timeouts for sqlite lock contention. 
(imported from commit 34fcc295b032d93ec58435ad18baa790ee8d0cfe)
 2012-09-14 13:32:26 -04:00
Tim Abbott 634dd59833 settings: Add mysql definitions. 
(imported from commit 4419c072e99da3e13f07efe58cadcc76822e99e5)
 2012-09-14 13:32:25 -04:00
Keegan McAllister d6d4bcd192 Use Eastern Time as the server default timezone 
This isn't actually important for our current timestamp handling.

(imported from commit d16f3d9004c5f3cdb8a9bcb26d2e17a10c197f50)
 2012-09-12 17:00:18 -04:00
Keegan McAllister 80c6d09197 Remove unused imports 
(imported from commit 9f5c226708e44935e8d32c18ea7dd1ad2615d8d5)
 2012-09-07 13:57:32 -04:00
Tim Abbott 1775ffe80a Improve forge_zephyr code. 
(imported from commit c95c4392b09c932d8de11d30b730ab5d7bcb9e83)
 2012-09-06 16:00:39 -04:00
Tim Abbott d9f348a348 Add zephyr_backend RPC call. 
(imported from commit e815580e201772e81e94b820174e2410e3069960)
 2012-09-06 15:52:48 -04:00
Keegan McAllister 474f08198b Send zephyr template inline with index.html using django-jstemplate 
(imported from commit 58cc8a50d463548aa283658dbe0aae366ecab39f)
 2012-09-06 15:48:15 -04:00
Tim Abbott 742d8a40a0 Set the homepage as LOGIN_REDIRECT_URL 
(imported from commit a65eec79d7c64e02969699a7288313227f85b99f)
 2012-09-06 15:35:01 -04:00
Luke Faraone f6b481546f Offer to subscribe / create classes if user zwrites to a non-subbed class 
Here we check if a class exists. If not, we prompt the user to create, sub,
and send his message to the class. If the class exists but we're not subbed
we prompt the user to sub.

This commit also added a decorator to views.py and refactored out some
redundant code.

(imported from commit 7234ef6c080f2a6de6ff0922635dddd90032f7fe)
 2012-09-06 14:33:55 -04:00
Tim Abbott 84ece4b3fe Combine the zephyr() and personal_zephyr() functions. 
(imported from commit a39b70f019901d0dd6994d4c440002111e4c29e1)
 2012-09-04 19:14:46 -04:00
Keegan McAllister ac2553cdff Replace get_state with a variable embedded into index.html 
(imported from commit 3ef4a0163107248618a25e242ab30fdff5da17e0)
 2012-09-04 13:01:00 -04:00
Jessica McKellar e51ab0cdfa Get pointer state from the server on page load, and scroll to that zephyr. 
(imported from commit a1387d89378494a55f084f56ed9eb33c4f719dcb)
 2012-09-04 11:36:36 -04:00
Jessica McKellar 99925f4aaf Add the ability to add new subscriptions. 
(imported from commit 0a7fdc17087240b13631627a053c580c2e4b5319)
 2012-08-30 17:17:59 -04:00
Jessica McKellar 7e56e7a0f4 Add a navigation link for managing subscriptions (for starters, just unsubbing). 
(imported from commit 23274a8790bf1f017e9c33db52bf746e291f23ba)
 2012-08-30 17:17:47 -04:00
Tim Abbott 9afd63692f Implement long polling using Tornado. 
(imported from commit 4385304b27d7fe55a57a23133cd214fe8fc33482)
 2012-08-30 14:29:34 -04:00
Keegan McAllister d8e29c3ffe Serve static files 
(imported from commit 143e6273d660ccc54fd1d5170e9d180e82fed5f0)
 2012-08-28 18:36:55 -04:00