Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
31,827 Commits 28 Branches 142 Tags 769 MiB
Commit Graph

125 Commits

Author SHA1 Message Date
David Roe 3f7cb34b00 enterprise => voyager 
(imported from commit 04be792bb480d5e5db1c91d296d1000cf1682571)
 2015-08-21 10:33:35 -07:00
David Roe edf7e732a2 ENTERPRISE => VOYAGER. 
(imported from commit 4f8080b9f506a87ca40bef32e39de5218cba916a)
 2015-08-21 10:33:35 -07:00
Reid Barton 5ea3bf85de Django 1.8 compatibility: module_name -> model_name 
(imported from commit 38ee96c9a8da5b3abfce8ba47f85dd7d59bcb599)
 2015-08-20 23:15:44 -07:00
Reid Barton 599742536b Switch from South to native Django migrations 
This commit loses some indexes, unique constraints etc. that were
manually added by the old migrations. I plan to add them to a new
migration in a subsequent commit.

(imported from commit 4bcbf06080a7ad94788ac368385eac34b54623ce)
 2015-08-20 23:01:26 -07:00
David Roe e61de3e052 Fix invitation e-mail to use http:// in non-deployed case. 
(imported from commit af68962c078036ce0fe4f37feaec6b43766b3059)
 2015-08-18 20:17:48 -07:00
Jason Michalski 0ea54a043e Use settings.EXTERNAL_HOST when sending activation emails 
Activation emails were using django's sites framework which always has
the domain set to zulip.com.

(imported from commit b81eae96e1a75b64dd93970760b869f3271ce88c)
 2014-07-03 12:28:29 -04:00
acrefoot daffe049ad Don't use hardcoded noreply@zulip.com, zulip@zulip.com, or https://zulip.com 
(imported from commit 1132553b63ae23ebcca746f0f65205b97bfee7dc)
 2013-11-15 21:31:37 -05:00
Luke Faraone 00e72cd97d Switch url parameter to full_name from service-specific gafyd_name 
(imported from commit 21541da29d2846cfd912d19b73e239e96606f9e5)
 2013-11-05 16:17:06 -05:00
Jessica McKellar 3f8dfc7b9b Move to a common random token generation function instead of several one-offs. 
(imported from commit 3217de5384088deff68fbffc6bd481c045a76817)
 2013-08-09 14:59:26 -04:00
Zev Benjamin 80702ccaa0 Add metrics variables to the template context via a context processor 
Wrapping render_to_response never actually worked correctly.  On the
login page, mixpanel_token would be missing, but we wouldn't get an
error because it is surrounded by double quotes, which meant that it
was still valid Javascript.

(imported from commit 820ee42fab8f679983e5a3a4309a2feaf690f20f)
 2013-06-18 17:07:36 -04:00
Zev Benjamin ae9be7298d Wrap render_to_response 
(imported from commit d23aa3e5ad4c5243e83df098953ea4b1f7b3c294)
 2013-05-21 17:56:49 -04:00
Luke Faraone c044282af5 [third]: Accept and pass along gafyd_name parameters to confirmation templates. 
This allows us to keep a record of the user's name as returned by Google
Apps authentication.

(imported from commit cbfe383a51b480400b8f0e5f40c725562ffc6a66)
 2013-04-24 12:03:41 -07:00
Luke Faraone 40ad84b363 Introduce script to bulk-create activation URIs. 
(imported from commit 12435d8f0d48833f52a699c0d8a0c9ec0750e6af)
 2013-02-28 14:34:18 -05:00
Luke Faraone 8309e0f001 [third] Factor out activation key generation / url creation 
(imported from commit 18358e29e13f025ec640b0b166e168b4fb3cd94c)
 2013-02-28 14:34:18 -05:00
Luke Faraone 3fb1889835 confirmation: Make send_confirmation accept custom templates and context. 
(imported from commit 08f19a48f229029f68832868bc48a2ac160e85e7)
 2013-01-14 10:25:26 -05:00
Luke Faraone 3e7d036fca Include autogenerated initial migrations for South. 
(imported from commit d1eda0d61ebe8a9d471670133589a1cf8058a802)
 2013-01-08 18:14:39 -05:00
Keegan McAllister bc2e7d77eb confirmation: Use timezone-aware datetime object 
django.utils.timezone.now returns an aware datetime object because USE_TZ =
True.

Fixes #80.

(imported from commit c60f491fe00a98626ecced94fc3ea1f71f939a38)
 2012-11-07 18:50:26 -05:00
Keegan McAllister 5ed13e9079 Remove inactive Django admin code 
These can only cause trouble.

(imported from commit 1def3234675c12461e9fc8b71c6b9e1b107edd1d)
 2012-10-29 13:56:09 -04:00
Keegan McAllister 238533500a confirmation: Increase entropy of confirmation_key 
I am pretty sure there's no point to using a hash at all.  But until I hear
back from the author, let's at least make sure we put as much entropy into the
hash as we expect to get out of it.

(imported from commit 51a231adeab014cc1af8cb67e89baf06e0a1f593)
 2012-10-29 12:02:13 -04:00
Keegan McAllister dcdb8ddc05 Remove confirmation/urls.py 
We have our routing for the confirmation view.

(imported from commit 90cc09792e15350a97933f6567d6bb6fa13e94e4)
 2012-10-29 11:04:25 -04:00
Keegan McAllister f55c8a4397 confirmation: Use HTTPS in email link 
(imported from commit 5bf74ba45c7d09495caa7ecfbf3af6bd80311b9e)
 2012-10-29 11:04:25 -04:00
Keegan McAllister a1b72f9d05 Remove confirmation/setup.py 
This is just for install.  The less code we have in our repo, the better.

(imported from commit d1da643d0a68ed73a1d2303e9f24215f7d2a24a7)
 2012-10-29 11:04:25 -04:00
Luke Faraone ece9d64d34 Remove expiry; confirmations should never expire. 
(imported from commit 093d8fa266c0ceeaff8c15257194d23a1ce90b61)
 2012-10-01 10:45:58 -04:00
Luke Faraone 5531f188c7 Include confirmation key in context object. 
This way our templates can reference the confirmation key later.

(imported from commit 4d57e1309386f2236829b6fdf4e4ad43c5b125c8)
 2012-10-01 10:45:58 -04:00
Luke Faraone b801b50c26 Include third-party django-confirmation library. 
Taken from http://code.google.com/p/django-confirmation/.

Code is under the BSD 3-clause license.

(imported from commit cfb5a511097fe14fba7f1bcea62dfa25cfb58622)
 2012-10-01 10:45:57 -04:00